[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-vanilla/, app-emulation/wine-vanilla/files/
commit: ddfba238cc0b1ab4056f6d0412790667b57a4aa9
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Mar 9 03:36:30 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Mar 9 03:55:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddfba238
app-emulation/wine-vanilla: fix build with USE="opengl wayland"
Unsure if the new wayland opengl support actually works (runtime
untested), but it at least builds now. Very new/experimental anyway.
Sorry for missing this during the bump, should've tried USE=wayland.
Signed-off-by: Ionen Wolkens gentoo.org>
.../files/wine-vanilla-9.4-wayland-egl.patch | 16
app-emulation/wine-vanilla/wine-vanilla-9.4.ebuild | 1 +
2 files changed, 17 insertions(+)
diff --git
a/app-emulation/wine-vanilla/files/wine-vanilla-9.4-wayland-egl.patch
b/app-emulation/wine-vanilla/files/wine-vanilla-9.4-wayland-egl.patch
new file mode 100644
index ..0c6f8084f480
--- /dev/null
+++ b/app-emulation/wine-vanilla/files/wine-vanilla-9.4-wayland-egl.patch
@@ -0,0 +1,16 @@
+Unsure how this check is supposed to work, HAVE_LIBWAYLAND_EGL is never set
+as a variable but rather output as a "#define" line. Assume been last minute
+upstream oversight.
+
+We check the requirements from the ebuild itself, so let's just drop the check
+as a quick fix for now. Assume that it will be fixed in wine-9.5.
+--- a/configure.ac
b/configure.ac
+@@ -1392,7 +1392,2 @@
+ [WAYLAND_EGL_LIBS=""],[$WAYLAND_EGL_LIBS])])])
+-if test "x$with_wayland" != "x"
+-then
+-WINE_NOTICE_WITH(opengl, [test -z "$ac_cv_lib_soname_EGL" -o -z
"$HAVE_LIBWAYLAND_EGL"],
+-[EGL ${notice_platform}development files not found, the
Wayland driver won't support OpenGL])
+-fi
+ fi
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.4.ebuild
b/app-emulation/wine-vanilla/wine-vanilla-9.4.ebuild
index 593d2fed1eee..358e42dfad4e 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.4.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.4.ebuild
@@ -161,6 +161,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.0-noexecstack.patch
"${FILESDIR}"/${PN}-7.20-unwind.patch
"${FILESDIR}"/${PN}-8.13-rpath.patch
+ "${FILESDIR}"/${P}-wayland-egl.patch
)
pkg_pretend() {
[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-vanilla/, app-emulation/wine-vanilla/files/
commit: a920cbea8b1106aba4bce78f21d51dd6c1ec9958
Author: Violet Purcell inventati org>
AuthorDate: Thu Aug 10 20:33:59 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Aug 10 21:14:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a920cbea
app-emulation/wine-vanilla: Fix rpath bug on musl
Signed-off-by: Violet Purcell inventati.org>
Signed-off-by: Ionen Wolkens gentoo.org>
.../wine-vanilla/files/wine-vanilla-8.13-rpath.patch | 15 +++
app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild | 1 +
app-emulation/wine-vanilla/wine-vanilla-.ebuild | 1 +
3 files changed, 17 insertions(+)
diff --git a/app-emulation/wine-vanilla/files/wine-vanilla-8.13-rpath.patch
b/app-emulation/wine-vanilla/files/wine-vanilla-8.13-rpath.patch
new file mode 100644
index ..5f0d63b0ec33
--- /dev/null
+++ b/app-emulation/wine-vanilla/files/wine-vanilla-8.13-rpath.patch
@@ -0,0 +1,15 @@
+Patch Source:
https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/community/wine/rpath.patch
+Alpine Bug: https://gitlab.alpinelinux.org/alpine/aports/-/issues/13249
+
+--- a/configure.ac
b/configure.ac
+@@ -784,6 +784,9 @@ case $host_os in
+ [WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS
-Wl,-z,max-page-size=0x1000"])
+ ;;
+ esac
++
++# do this at the end because it needs double dollar for makefile
++WINE_TRY_CFLAGS([-Wl,-rpath,\\\$ORIGIN],[UNIXLDFLAGS="$UNIXLDFLAGS
'-Wl,-rpath,\$\$ORIGIN'"])
+ ;;
+ esac
+
diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild
b/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild
index f68c984f64a3..d1607ccc4ad4 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild
@@ -146,6 +146,7 @@ QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC
-Wl,-z,notext
PATCHES=(
"${FILESDIR}"/${PN}-7.0-noexecstack.patch
"${FILESDIR}"/${PN}-7.20-unwind.patch
+ "${FILESDIR}"/${PN}-8.13-rpath.patch
)
pkg_pretend() {
diff --git a/app-emulation/wine-vanilla/wine-vanilla-.ebuild
b/app-emulation/wine-vanilla/wine-vanilla-.ebuild
index f68c984f64a3..d1607ccc4ad4 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-.ebuild
@@ -146,6 +146,7 @@ QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC
-Wl,-z,notext
PATCHES=(
"${FILESDIR}"/${PN}-7.0-noexecstack.patch
"${FILESDIR}"/${PN}-7.20-unwind.patch
+ "${FILESDIR}"/${PN}-8.13-rpath.patch
)
pkg_pretend() {
[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-vanilla/, app-emulation/wine-vanilla/files/
commit: f53d1bd478c460721be936f7691ba5744471edb6 Author: Ionen Wolkens gentoo org> AuthorDate: Fri Sep 9 14:37:37 2022 + Commit: Ionen Wolkens gentoo org> CommitDate: Sat Sep 10 09:47:14 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f53d1bd4 app-emulation/wine-vanilla: use new ebuild for 7.0-r3 Based on wine-proton's rewritten ebuild with added logic to handle additional USE that are being forced in wine-proton but should be optional here. 7.17 to follow in a bump. Main goal is to make this hopefully easier to maintain and cleanup ancient constructs that haven't been relevant in 10+ years. Also fixes a few misc issues. List likely incomplete as haven't kept track of everything while writing wine-proton's ebuild, but for some notable differences compared to older ebuilds: - use upstream's way to handle multilib (--with-wine64) to ensure wow64 combined build is done as it should > like before it still allows 4 types, outline for clarity: amd64, abi_x86_32, abi_x86_64: full wow64, uses --with-wine64 amd64, -abi_x86_32, abi_x86_64: wine -> wine64, no --with-wine64 amd64, abi_x86_32, -abi_x86_64: default 32bit-only build, on 64bit x86, abi_x86_32, -abi_x86_64: default with nothing special - some other differences for ABI handling: > use /usr/lib/ for both rather than lib64 > read CROSSCC_x86/CROSSCC_amd64 on top of wine's CROSSCC > CROSS flags check is done per-ABI rather than once for both > rely on MULTILIB_COMPAT to set REQUIRED_USE - force ld.bfd wrt bug #867097 and bug #744829, the various linker tricks currently make it unrealistic to use anything else and workarounds are insufficient for non-broken runtime even if it builds (note can still build with clang, it's lld/mold that lead to issues) - set QA_TEXTREL wrt bug #746338, seems expected given wine does these with -fno-PIC -Wl,-z,notext (aka don't treat DT_TEXTREL as errors) - fix execstack warnings for stub libraries (likely benign, just noisy) - handle stripping of PE files manually given portage doesn't know the right strip executable to use which resulted in warnings, potential mangling, and ignoring .exe/.dll files - use -- for eselect-wine rather than --all to reduce noise - nonfatal eselect-wine for prerm, this allows removing wine in the event it was already deregistered notably if postinst's eselect-wine failed (which gives an error but doesn't fail installation) - do maintainer-oriented sanity check for matching mono on top of gecko's, check is always done regardless of USE and is only nonfatal for live version - various deps revisions, hopefully more pedantic, for some notes: > split dlopen'ed deps for clarity, these "could" be runtime optfeatures but realistically want wine to work as expected (split makes it easier to handle app-portage/iwdevtools' qa-vdb reports which gives a list of libraries it believes can be removed... and it turns out to be the dlopen list) > yacc -> bison, this explicitly looks for bison > XML-Simple -> XML-LibXML, it's what winemaker actually uses > move extras under X?, per configure.ac they are no-op if X is unset - IUSE newly enabled by default: > gstreamer: crippled without this and is only set by gnome profile > mingw: wine been focusing on PE conversions and most distros offer mingw builds making users hit unexpected issues if disabled (no longer need crossdev for this, so default is more reasonable now) > sdl: input devices like gamepads not being functional can be unexpected and unclear as to why (albeit desktop profile sets this) > vkd3d: matches later versions that have it always enabled as a bundled PE build > vulkan: grown in importance and matches already-default opengl - IUSE newly disabled by default: > perl: winemaker/dump are very rarely needed and may pull a chain of modules for no reason > udisks: unimportant for common usage and handled by desktop profile - IUSE added (disabled by default): > debug: to skip stripping of PE files, like other mingw packages > llvm-libunwind: use over libunwind - IUSE removed: > mp3: was a no-op forgotten IUSE > oss: this is ossv4 support which needs unpackaged media-sound/oss and a patched kernel, makes little sense to expose as USE that sometime confuse users (use EXTRA_ECONF=--with-oss instead) > realtime: wrt bug #753698, drop dependency on rtkit > run-exes: leave .desktop's MimeType alone (force current default), not convinced a USE to sed MimeType out makes sense and untrusted potentially harmful files are not limited to .exe, could be doing this for every .desktop (...don't open untrusted files, or use a user patch if really must) > threads: leave it up to defaults, no need to touch this (dos/samba optfeature'ish USE could make sense to remove but left alone for now) - no warnings if disable mono/gecko defaults, does not feel necessary - skip some
[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-vanilla/, app-emulation/wine-vanilla/files/
commit: 3baf5a5158b264648f59c99c172a8bb3c9b92fe7
Author: Sergei Trofimovich gentoo org>
AuthorDate: Tue Jul 6 22:31:19 2021 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Fri Jul 16 23:22:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3baf5a51
app-emulation/wine-vanilla: revert winegcc '=' parameter handling
LDFLAGS=-Wl,--defsym=__gentoo_check_ldflags__=0 causes
wine-vanilla-6.12 build failures in form of:
```
tools/winegcc/winegcc -o dlls/acledit/acledit.dll.so ... \
-Wl,--defsym=__gentoo_check_ldflags__=0
ld:--defsym:0: syntax error
collect2: error: ld returned 1 exit status
winegcc: /usr/lib/ccache/bin/x86_64-pc-linux-gnu-gcc failed
```
The change is a revert of upstream commit fcda0afd
("winegcc: Support -Wl,foo=... style linker options.")
Bug: https://bugs.winehq.org/show_bug.cgi?id=51413
Closes: https://bugs.gentoo.org/800809
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/21618
Signed-off-by: Sergei Trofimovich gentoo.org>
.../files/wine-vanilla-6.12-winegcc-equals-args.patch | 13 +
app-emulation/wine-vanilla/wine-vanilla-6.12.ebuild | 1 +
2 files changed, 14 insertions(+)
diff --git
a/app-emulation/wine-vanilla/files/wine-vanilla-6.12-winegcc-equals-args.patch
b/app-emulation/wine-vanilla/files/wine-vanilla-6.12-winegcc-equals-args.patch
new file mode 100644
index 000..562b63af063
--- /dev/null
+++
b/app-emulation/wine-vanilla/files/wine-vanilla-6.12-winegcc-equals-args.patch
@@ -0,0 +1,13 @@
+https://bugs.winehq.org/show_bug.cgi?id=51413
+https://bugs.gentoo.org/800809
+--- a/tools/winegcc/winegcc.c
b/tools/winegcc/winegcc.c
+@@ -1982,7 +1982,7 @@ int main(int argc, char **argv)
+ if (strncmp("-Wl,", opts.args->base[i], 4) == 0)
+ {
+ unsigned int j;
+-strarray* Wl = strarray_fromstring(opts.args->base[i]
+ 4, ",=");
++strarray* Wl = strarray_fromstring(opts.args->base[i]
+ 4, ",");
+ for (j = 0; j < Wl->size; j++)
+ {
+ if (!strcmp(Wl->base[j], "--image-base") && j <
Wl->size - 1)
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.12.ebuild
b/app-emulation/wine-vanilla/wine-vanilla-6.12.ebuild
index b16b5176cce..e725ccf27b9 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.12.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.12.ebuild
@@ -144,6 +144,7 @@ PATCHES=(
"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
+ "${FILESDIR}/wine-vanilla-6.12-winegcc-equals-args.patch" #800809
)
PATCHES_BIN=()
[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-vanilla/, app-emulation/wine-vanilla/files/
commit: 2fa21fd6ae2fa715e69e07582fcf70c007e155b2 Author: NP-Hardass gentoo org> AuthorDate: Sat Sep 30 17:53:28 2017 + Commit: NP Hardass gentoo org> CommitDate: Sat Sep 30 19:35:02 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fa21fd6 app-emulation/wine-vanilla: Backport freetype-2.8.1 support Bug: https://bugs.gentoo.org/631376 Bug: https://bugs.gentoo.org/631676 Package-Manager: Portage-2.3.10, Repoman-2.3.3 app-emulation/wine-vanilla/Manifest| 1 + .../wine-vanilla/files/builtin_ms_va_list.c| 9 app-emulation/wine-vanilla/files/pr66838.c | 36 - app-emulation/wine-vanilla/files/pr69140.c | 37 -- .../wine-vanilla/files/wine-1.5.26-winegcc.patch | 59 -- .../wine-vanilla/files/wine-1.6-memset-O3.patch| 21 .../files/wine-1.9.5-multilib-portage.patch| 31 .../files/wine-2.0-multislot-apploader.patch | 14 - ...nilla-2.2.ebuild => wine-vanilla-2.0-r1.ebuild} | 45 +++-- ...a-2.0.1.ebuild => wine-vanilla-2.0.1-r1.ebuild} | 45 +++-- .../wine-vanilla/wine-vanilla-2.0.1.ebuild | 39 +- ...a-2.0.1.ebuild => wine-vanilla-2.0.2-r1.ebuild} | 45 +++-- .../wine-vanilla/wine-vanilla-2.0.2.ebuild | 39 +- app-emulation/wine-vanilla/wine-vanilla-2.0.ebuild | 39 +- app-emulation/wine-vanilla/wine-vanilla-2.1.ebuild | 43 +++- .../wine-vanilla/wine-vanilla-2.10.ebuild | 43 +++- .../wine-vanilla/wine-vanilla-2.11.ebuild | 43 +++- .../wine-vanilla/wine-vanilla-2.12.ebuild | 43 +++- .../wine-vanilla/wine-vanilla-2.13.ebuild | 43 +++- .../wine-vanilla/wine-vanilla-2.14.ebuild | 43 +++- .../wine-vanilla/wine-vanilla-2.15.ebuild | 43 +++- .../wine-vanilla/wine-vanilla-2.16.ebuild | 43 +++- .../wine-vanilla/wine-vanilla-2.17.ebuild | 43 +++- .../wine-vanilla/wine-vanilla-2.18.ebuild | 40 ++- app-emulation/wine-vanilla/wine-vanilla-2.2.ebuild | 43 +++- app-emulation/wine-vanilla/wine-vanilla-2.3.ebuild | 43 +++- app-emulation/wine-vanilla/wine-vanilla-2.4.ebuild | 43 +++- app-emulation/wine-vanilla/wine-vanilla-2.5.ebuild | 43 +++- app-emulation/wine-vanilla/wine-vanilla-2.6.ebuild | 43 +++- app-emulation/wine-vanilla/wine-vanilla-2.7.ebuild | 43 +++- app-emulation/wine-vanilla/wine-vanilla-2.8.ebuild | 43 +++- app-emulation/wine-vanilla/wine-vanilla-2.9.ebuild | 43 +++- .../wine-vanilla/wine-vanilla-.ebuild | 47 ++--- 33 files changed, 715 insertions(+), 563 deletions(-) diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest index 14fcc0025fa..6ce2882b142 100644 --- a/app-emulation/wine-vanilla/Manifest +++ b/app-emulation/wine-vanilla/Manifest @@ -1,3 +1,4 @@ +DIST gentoo-wine-patches-20170830.tar.xz 58456 SHA256 fb7781d0ae360cbc3860c2d2e81527a1b903da824c01f5d5040e95aaf99a3970 SHA512 5e5159e3252b246bba0ef7fdba345db3ab1071c5b8b8b625f98eda18779d4024c5b76bdbf49ce7bd5c6b01b422807adf76820beddb2b4a6ee9e67d13052cc575 WHIRLPOOL a79be264bab3fcdeee06fef47efd28e6e1125254ac7f82300cb6ba2591ef69cd76b5fed8f778b1849a0659e680e9fc785f0273d55cb2ed95648a74dffa5e22d2 DIST wine-2.0.1.tar.xz 18845444 SHA256 6cfb4eaae566dc7afb7ac0f1f2db2c0d69969952acab0debf084ee8f7b071583 SHA512 b32d07443655898768383b7409c21093b60c028fef166a596dad5dfab5a329b9fce4552e612c6d182e4f67eb1f28ed497fe2ed6af55dd3e96a124547722d WHIRLPOOL 0fbaf53504e4e40db6227f45f5b92ac388c2bf23d4f573e4d3b60ccaaadeeccb5a696226d1bd4aa8b245f21c8d6a13aac423ead3f4692ebc1e8e613714168501 DIST wine-2.0.2.tar.xz 18854952 SHA256 f71884f539928877f4b415309f582825d3d3c9976104e43d566944c710713c9a SHA512 3f37080a951819304cd3475f6012f1d6b5a94879b137cdf816cac4c8fde68ddc777905e92277ec5dce96437d8c32c43d55d3750b582781a9f9774b118f1a5b90 WHIRLPOOL cf21a899c60749c37353abc4ba974b3d6cc369769ace70fde899ff1cb5ac8a97828165cf2dbfbcf0915f5196ac58974948fe3e5b2c9854296a5eea75f8023ae5 DIST wine-2.0.tar.bz2 23662707 SHA256 9756f5a2129b6a83ba701e546173cbff86caa671b0af73eb8f72c03b20c066c6 SHA512 b0a57ba8202d9fc396e5bfb7a7718d6bababbed8f3351e7fdc36afa37f35a871e04903757618f73427aeb71a52b2d323977d79e48f8b38d636f23fd404441186 WHIRLPOOL fa9f774d87dae73c7d1f3b86dc3b03ea27065eb6140f1cac13c82fe16f7ebff8f8365ed447220cf5c2788b9f4aae7c482e4f9e2e69f47e5435209e148f5dbdfe diff --git a/app-emulation/wine-vanilla/files/builtin_ms_va_list.c b/app-emulation/wine-vanilla/files/builtin_ms_va_list.c deleted file mode 100644 index f36fc2609a0..000 --- a/app-emulation/wine-vanilla/files/builtin_ms_va_list.c +++ /dev/null @@ -1,9 +0,0 @@ -/* Taken from Wine's configure
