* [PR PATCH] wine: Use MinGW to build WinPE DLLs
@ 2021-01-05 4:38 aeadio
2021-01-05 4:44 ` [PR REVIEW] " ericonr
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: aeadio @ 2021-01-05 4:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 901 bytes --]
There is a new pull request by aeadio against master on the void-packages repository
https://github.com/aeadio/void-packages wine-mingw
https://github.com/void-linux/void-packages/pull/27678
wine: Use MinGW to build WinPE DLLs
As of 5.x, Wine can now build DLLs in native WinPE format if the MinGW cross compiler is present. This is needed for some newer games to pass DRM/anti-cheat checks that validate the integrity of loaded system libraries.
See:
https://www.winehq.org/announce/5.0
https://bugs.winehq.org/show_bug.cgi?id=45349
I've split this out into a build option that's enabled by default.
This was built and tested on an x86_64 host, with 32-bit Wine tested as well. Games which would not launch on Void's Wine build are now functioning with this change (namely, World of Warcraft).
A patch file from https://github.com/void-linux/void-packages/pull/27678.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wine-mingw-27678.patch --]
[-- Type: text/x-diff, Size: 1315 bytes --]
From 984065a35893749fbeff41cf0b61961153f9829f Mon Sep 17 00:00:00 2001
From: Anthony Eadicicco <a@aead.io>
Date: Mon, 4 Jan 2021 23:28:45 -0500
Subject: [PATCH] wine: Use MinGW to build WinPE DLLs
---
srcpkgs/wine/template | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 0e6629f4c3e..83b1be78b55 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
# Template file for 'wine'
pkgname=wine
version=6.0rc5
-revision=1
+revision=2
wrksrc=wine-${version/r/-r}
build_style=gnu-configure
configure_args="--bindir=/usr/libexec/wine"
@@ -12,6 +12,10 @@ homepage="http://www.winehq.org/"
distfiles="https://dl.winehq.org/wine/source/${version%r*}/wine-${version/r/-r}.tar.xz"
checksum=f1f10a0aef4dcc9cf4ec67f0828fc1f7f364e2e8e7c2f027c253c8e2004bf451
+build_options="mingw"
+build_options_default="mingw"
+desc_option_mingw="Use the MinGW cross compiler to build WinPE DLLs"
+
lib32mode=full
archs="i686* x86_64*"
@@ -52,6 +56,10 @@ if [ "$XBPS_LIBC" = "glibc" ]; then
hostmakedepends+=" prelink"
fi
+if [ "${build_option_mingw}" ]; then
+ hostmakedepends+=" cross-${XBPS_TARGET_MACHINE}-w64-mingw32"
+fi
+
_wine_libexec="/usr/libexec/wine"
nopie_files="${_wine_libexec}/wine${_wine_suffix}"
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR REVIEW] wine: Use MinGW to build WinPE DLLs
2021-01-05 4:38 [PR PATCH] wine: Use MinGW to build WinPE DLLs aeadio
@ 2021-01-05 4:44 ` ericonr
2021-01-05 4:50 ` ericonr
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2021-01-05 4:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 316 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27678#discussion_r551713837
Comment:
Just add an entry to the hostmakedepends definition using `vopt_if`, it's cleaner.
Also, you need to strip `-musl` from the target machine, otherwise the build fails.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: wine: Use MinGW to build WinPE DLLs
2021-01-05 4:38 [PR PATCH] wine: Use MinGW to build WinPE DLLs aeadio
2021-01-05 4:44 ` [PR REVIEW] " ericonr
@ 2021-01-05 4:50 ` ericonr
2021-01-05 4:54 ` [PR PATCH] [Updated] " aeadio
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2021-01-05 4:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 176 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27678#issuecomment-754393905
Comment:
That said, this is a cool change :)
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] wine: Use MinGW to build WinPE DLLs
2021-01-05 4:38 [PR PATCH] wine: Use MinGW to build WinPE DLLs aeadio
2021-01-05 4:44 ` [PR REVIEW] " ericonr
2021-01-05 4:50 ` ericonr
@ 2021-01-05 4:54 ` aeadio
2021-01-06 3:42 ` ericonr
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: aeadio @ 2021-01-05 4:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 906 bytes --]
There is an updated pull request by aeadio against master on the void-packages repository
https://github.com/aeadio/void-packages wine-mingw
https://github.com/void-linux/void-packages/pull/27678
wine: Use MinGW to build WinPE DLLs
As of 5.x, Wine can now build DLLs in native WinPE format if the MinGW cross compiler is present. This is needed for some newer games to pass DRM/anti-cheat checks that validate the integrity of loaded system libraries.
See:
https://www.winehq.org/announce/5.0
https://bugs.winehq.org/show_bug.cgi?id=45349
I've split this out into a build option that's enabled by default.
This was built and tested on an x86_64 host, with 32-bit Wine tested as well. Games which would not launch on Void's Wine build are now functioning with this change (namely, World of Warcraft).
A patch file from https://github.com/void-linux/void-packages/pull/27678.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wine-mingw-27678.patch --]
[-- Type: text/x-diff, Size: 1465 bytes --]
From aff1d8705038997051af6d560794b52c3f1264df Mon Sep 17 00:00:00 2001
From: Anthony Eadicicco <a@aead.io>
Date: Mon, 4 Jan 2021 23:28:45 -0500
Subject: [PATCH] wine: Use MinGW to build WinPE DLLs
---
srcpkgs/wine/template | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 0e6629f4c3e..fd03474eba9 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
# Template file for 'wine'
pkgname=wine
version=6.0rc5
-revision=1
+revision=2
wrksrc=wine-${version/r/-r}
build_style=gnu-configure
configure_args="--bindir=/usr/libexec/wine"
@@ -12,6 +12,10 @@ homepage="http://www.winehq.org/"
distfiles="https://dl.winehq.org/wine/source/${version%r*}/wine-${version/r/-r}.tar.xz"
checksum=f1f10a0aef4dcc9cf4ec67f0828fc1f7f364e2e8e7c2f027c253c8e2004bf451
+build_options="mingw"
+build_options_default="mingw"
+desc_option_mingw="Use the MinGW cross compiler to build WinPE DLLs"
+
lib32mode=full
archs="i686* x86_64*"
@@ -23,7 +27,8 @@ if [ "$XBPS_TARGET_MACHINE" = i686-musl ]; then
_nopie=yes
fi
-hostmakedepends="pkg-config flex gettext"
+hostmakedepends="pkg-config flex gettext
+ $(vopt_if mingw "cross-${XBPS_TARGET_MACHINE%-musl}-w64-mingw32")"
makedepends="gettext-devel lcms2-devel zlib-devel ncurses-devel
glu-devel libSM-devel libXext-devel libX11-devel libXpm-devel
libXinerama-devel libXcomposite-devel libXmu-devel libXxf86vm-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: wine: Use MinGW to build WinPE DLLs
2021-01-05 4:38 [PR PATCH] wine: Use MinGW to build WinPE DLLs aeadio
` (2 preceding siblings ...)
2021-01-05 4:54 ` [PR PATCH] [Updated] " aeadio
@ 2021-01-06 3:42 ` ericonr
2021-01-09 8:06 ` [PR PATCH] [Closed]: " Hoshpak
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2021-01-06 3:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 234 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27678#issuecomment-755058162
Comment:
I need time to launch something before merging this.
Maybe @Hoshpak can do it before I do?
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Closed]: wine: Use MinGW to build WinPE DLLs
2021-01-05 4:38 [PR PATCH] wine: Use MinGW to build WinPE DLLs aeadio
` (3 preceding siblings ...)
2021-01-06 3:42 ` ericonr
@ 2021-01-09 8:06 ` Hoshpak
2021-01-09 18:55 ` aeadio
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Hoshpak @ 2021-01-09 8:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 749 bytes --]
There's a closed pull request on the void-packages repository
wine: Use MinGW to build WinPE DLLs
https://github.com/void-linux/void-packages/pull/27678
Description:
As of 5.x, Wine can now build DLLs in native WinPE format if the MinGW cross compiler is present. This is needed for some newer games to pass DRM/anti-cheat checks that validate the integrity of loaded system libraries.
See:
https://www.winehq.org/announce/5.0
https://bugs.winehq.org/show_bug.cgi?id=45349
I've split this out into a build option that's enabled by default.
This was built and tested on an x86_64 host, with 32-bit Wine tested as well. Games which would not launch on Void's Wine build are now functioning with this change (namely, World of Warcraft).
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: wine: Use MinGW to build WinPE DLLs
2021-01-05 4:38 [PR PATCH] wine: Use MinGW to build WinPE DLLs aeadio
` (4 preceding siblings ...)
2021-01-09 8:06 ` [PR PATCH] [Closed]: " Hoshpak
@ 2021-01-09 18:55 ` aeadio
2021-01-09 19:24 ` Hoshpak
2021-01-09 19:31 ` aeadio
7 siblings, 0 replies; 9+ messages in thread
From: aeadio @ 2021-01-09 18:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 240 bytes --]
New comment by aeadio on void-packages repository
https://github.com/void-linux/void-packages/pull/27678#issuecomment-757351303
Comment:
@Hoshpak Are you uninterested in these changes, or should I reopen with a rebase for the rc6 update?
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: wine: Use MinGW to build WinPE DLLs
2021-01-05 4:38 [PR PATCH] wine: Use MinGW to build WinPE DLLs aeadio
` (5 preceding siblings ...)
2021-01-09 18:55 ` aeadio
@ 2021-01-09 19:24 ` Hoshpak
2021-01-09 19:31 ` aeadio
7 siblings, 0 replies; 9+ messages in thread
From: Hoshpak @ 2021-01-09 19:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 546 bytes --]
New comment by Hoshpak on void-packages repository
https://github.com/void-linux/void-packages/pull/27678#issuecomment-757354733
Comment:
Am Samstag, den 09.01.2021, 10:56 -0800 schrieb Anthony Eadicicco:
> @Hoshpak Are you uninterested in these changes, or should I reopen
> with a rebase for the rc6 update?
>
I merged the changes manually right before the update so they are
already included in the currently published rc6 package. If you look at
the master branch, your changes are in commit
2252aac189ccb78253a78e03c682d13097e638e7 .
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: wine: Use MinGW to build WinPE DLLs
2021-01-05 4:38 [PR PATCH] wine: Use MinGW to build WinPE DLLs aeadio
` (6 preceding siblings ...)
2021-01-09 19:24 ` Hoshpak
@ 2021-01-09 19:31 ` aeadio
7 siblings, 0 replies; 9+ messages in thread
From: aeadio @ 2021-01-09 19:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 506 bytes --]
New comment by aeadio on void-packages repository
https://github.com/void-linux/void-packages/pull/27678#issuecomment-757355582
Comment:
> I merged the changes manually right before the update so they are already included in the currently published rc6 package. If you look at the master branch, your changes are in commit [2252aac](https://github.com/void-linux/void-packages/commit/2252aac189ccb78253a78e03c682d13097e638e7) .
Ah, sorry for the unnecessary ping. My precaffeinated eyes missed that.
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2021-01-09 19:31 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-05 4:38 [PR PATCH] wine: Use MinGW to build WinPE DLLs aeadio
2021-01-05 4:44 ` [PR REVIEW] " ericonr
2021-01-05 4:50 ` ericonr
2021-01-05 4:54 ` [PR PATCH] [Updated] " aeadio
2021-01-06 3:42 ` ericonr
2021-01-09 8:06 ` [PR PATCH] [Closed]: " Hoshpak
2021-01-09 18:55 ` aeadio
2021-01-09 19:24 ` Hoshpak
2021-01-09 19:31 ` aeadio
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).