From d1edfd3a57afc1db57e14cc58d3f28eea8eefd64 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 12 Nov 2022 15:32:09 +0000 Subject: gentoo auto-resync : 12:11:2022 - 15:32:08 --- app-emulation/wine-staging/Manifest | 3 ++- .../files/wine-staging-7.21-crossflags.patch | 29 ++++++++++++++++++++++ .../wine-staging/wine-staging-9999.ebuild | 26 +++++++++++-------- 3 files changed, 47 insertions(+), 11 deletions(-) create mode 100644 app-emulation/wine-staging/files/wine-staging-7.21-crossflags.patch (limited to 'app-emulation/wine-staging') diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest index ba05b26095c5..c351d8851f53 100644 --- a/app-emulation/wine-staging/Manifest +++ b/app-emulation/wine-staging/Manifest @@ -1,6 +1,7 @@ AUX wine-staging-7.17-noexecstack.patch 223 BLAKE2B 6e6cfc208f11c2c2b7bbc392e3703c50669ba9abf088dac0dd7aa8d6e59fcdd6656f5ad6955e4ef87c25d6f4082d83af71a09b2928934222b25847b8b2b5089f SHA512 43fc5c50c33e09f028c2369a660499fbb6c240931c6b7d44c4e838deee1df0390706967b375d36ee8eea339e86a5af1c7a49a76d884860c045c3476d8c8d2a5f AUX wine-staging-7.17-unwind.patch 1694 BLAKE2B ad8ba23e07a846152bd93e76a0b226869c8a9a28f197321b0faec3ad3721d05b892c69829d89933f245a7b6e0c8070db0e7dfef7d4b9bb047052d57f5ba7067b SHA512 80c3a1f347e7250cb1d7ab958507987b2aaeaf660c4ffb95c19118011ee61957629a9e28f2600fdafb384b61c26f50bcdaebab1fcbe30a9553c63cbed664c817 AUX wine-staging-7.20-unwind.patch 1450 BLAKE2B 80e9222c95393aaa4b95e05597a4181030fc988d95e416d2f92631f29f640b9abb3dd0853d005de4725b41c09224e478741902075259d48a30830a923790579f SHA512 e1a72f1463be32975daa02064acb96189cd79cb41ff98f89b58e46c97100a3ac46405b1b9982378c9de275acbdb74168853e47b932e06398cdd2981b23f483ce +AUX wine-staging-7.21-crossflags.patch 876 BLAKE2B 84dc39960e40c94f6e0bce4c8206b6d276e4d916f4b98d0f83a40ac0a7349f59b68010eb6bd4ba2b0ca854abb74a2faf58f54258e86cd1c800e849410d0570a9 SHA512 ee53bb03ce6ec181d2d87c63659802c4b68941c55264c8700e13ae83c0f9913a7ff8f45a5c42d40e302d7731535ba673a7fe669d0bebbfa35555e1f6187ab31b DIST wine-7.17.tar.xz 28379876 BLAKE2B 536af8f1ac9c4dd8bae2d16cba226c99c45cd64f0a9a2569022baefee61556801d3ee15f480fd18445baecb6c78dd7950f98542dc88a3282ee5d457d0e4ddfb1 SHA512 fd8017e6174db0047a3957db3045b2ad9024e07b1e2f81800521f0b7e7f7660add6a08e09bc60e3d140816cec70aae8324fe15643bd05e541f22f66ffda52508 DIST wine-7.18.tar.xz 28412876 BLAKE2B 1f25c8669a2afbead142923a39913b3f21df641e446a6136e7ecd282f6c31bc70578036e83f3dd28d22516d987ddca179198f76effb5c9aca089f4755ffa873e SHA512 e651b18cef73b4619e953b746d0c207c0220279003560aaf195c2569a22308af129e1460651a246e6a87dcfbcfcff08f52f970734035eb55ab45d8970fd56a02 DIST wine-7.19.tar.xz 28502612 BLAKE2B b7b270656955c7a1e1d84e8bbc7e3e8abff5aedadb5e8a458f0b1109d746875a359f3d2f53b1c9c6caae65d17fd1d205466cd3a884034a8bad6afe9456f13b5d SHA512 f76dbda97cccad4c0f249b5dd4e8d48afa832134f1704ae228650bb73ee82823e628b23bd53a3f8729e06a8933597ff2fffa5551f156fc9c9181b67c066747d5 @@ -13,5 +14,5 @@ EBUILD wine-staging-7.17.ebuild 11195 BLAKE2B 96902242f3a26b3b6629247f89d4673ede EBUILD wine-staging-7.18.ebuild 11195 BLAKE2B 96902242f3a26b3b6629247f89d4673ede219737d0a879825b33c069b3ab8c539ada527252581727cf04554a0339cb16b4aa70616c7142863833179898ae1204 SHA512 d3f357c9b204ed852160bf51a1a23700db6ac8bc383dbfce40564e4b2ff92677d991ba343d25be02be61b4d8447fee26137ccc636f171a7a856206d97f2a7080 EBUILD wine-staging-7.19.ebuild 11123 BLAKE2B c5de757465bb7033ebc20796b6a4319eb115bc60f6c1512f3b9eaf3e9cc2a23e63900a4aafb379fb27f30642c698902759808aea9c76883c05f7bc30ff723912 SHA512 43321290cc12244b7a917885d9f3574362864d34f1360a500e17de15bc0a6cba34493fb986aff9168abb91d0cc1d57ded684b92bd31ae9a9b3ed6fa10ff8ad92 EBUILD wine-staging-7.20.ebuild 11123 BLAKE2B 269c3156f5b190e358a498830930c6a26c09c6a5be5a7db899572496a95e739f8508115c007832ff568a31b984a66584149b408c8d38552931fb9e04e2136be8 SHA512 3b1fb7c272f27b4cced6112655f38270c95ed95fa844bc861489413070e8921438be57afe6138a8674ca67c97ef09a92d4d1ba8ebcaa26069b4857b2b7b60de3 -EBUILD wine-staging-9999.ebuild 11123 BLAKE2B 269c3156f5b190e358a498830930c6a26c09c6a5be5a7db899572496a95e739f8508115c007832ff568a31b984a66584149b408c8d38552931fb9e04e2136be8 SHA512 3b1fb7c272f27b4cced6112655f38270c95ed95fa844bc861489413070e8921438be57afe6138a8674ca67c97ef09a92d4d1ba8ebcaa26069b4857b2b7b60de3 +EBUILD wine-staging-9999.ebuild 11224 BLAKE2B bf13e52b8c69cce318a89c8d2e88a3a52131fc7b56147206c4ffd04457af17c7f8f4574334eff2067115787d94adeea5d656a68640dc4ecc8ca185176da1c11c SHA512 6814a3750f3b58ac7c894c14113cd2f9520094e2c7f788270b5a432ffacbd985e8001a12f9fad6e6d28cd467de608c5e80561b2984865b67a674078d1e30d670 MISC metadata.xml 2352 BLAKE2B c3bc247559ce143b4c8497b17dbeccf283ecb70463ca8230ba46d949c0def97f15c0b676149524111f7d151722d7c6343dc16dddaba5093fba60c62389da778d SHA512 a05a2b4bdaa01b7f097cf824f2b949b2e5ece864c7307dfca42a384711c9db09f486c3d398c9c1f187daadfcc646bb14fe7c488140fea2a3f7092a5e3a8011d1 diff --git a/app-emulation/wine-staging/files/wine-staging-7.21-crossflags.patch b/app-emulation/wine-staging/files/wine-staging-7.21-crossflags.patch new file mode 100644 index 000000000000..bdf5aeefb5bf --- /dev/null +++ b/app-emulation/wine-staging/files/wine-staging-7.21-crossflags.patch @@ -0,0 +1,29 @@ +Restore CROSSLDFLAGS and ensure tested flags are saved in +{arch}_*FLAGS (e.g. -fno-strict-aliasing) + +quickfix, odds are this will be revamped upstream +--- a/configure.ac ++++ b/configure.ac +@@ -919,9 +919,9 @@ + saved_CC=$CC + saved_CFLAGS=$CFLAGS ++ saved_LDFLAGS=$LDFLAGS + + CFLAGS=${CROSSCFLAGS:-"-g -O2"} ++ LDFLAGS=${CROSSLDFLAGS:-} + AS_VAR_COPY([CC],[${wine_arch}_CC]) +- AS_VAR_COPY([${wine_arch}_CFLAGS],[CFLAGS]) +- AS_VAR_COPY([${wine_arch}_LDFLAGS],[LDFLAGS]) + AS_VAR_SET([${wine_arch}_EXTRACFLAGS],["-D__WINE_PE_BUILD -Wall"]) + +@@ -1052,6 +1052,10 @@ + AS_VAR_APPEND([${wine_arch}_LDFLAGS],[" -Wl,--build-id"])]) + ++ AS_VAR_COPY([${wine_arch}_CFLAGS],[CFLAGS]) ++ AS_VAR_COPY([${wine_arch}_LDFLAGS],[LDFLAGS]) ++ + CC=$saved_CC + CFLAGS=$saved_CFLAGS ++ LDFLAGS=$saved_LDFLAGS + done + diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index 9ac0bc6e5297..a2cb290f769f 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -30,10 +30,10 @@ SLOT="${PV}" IUSE=" +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2 - +gstreamer kerberos ldap +mingw +mono netapi nls odbc openal - opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl - selinux +ssl +truetype udev udisks +unwind usb v4l +vulkan - +xcomposite xinerama" + +gstreamer kerberos ldap +mingw +mono netapi nls odbc opencl + +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux + +ssl +truetype udev udisks +unwind usb v4l +vulkan +xcomposite + xinerama" REQUIRED_USE=" X? ( truetype ) crossdev-mingw? ( mingw )" # bug #551124 for truetype @@ -84,7 +84,6 @@ WINE_COMMON_DEPEND=" media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] ) ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) - openal? ( media-libs/openal[${MULTILIB_USEDEP}] ) opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] ) pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] ) @@ -118,7 +117,9 @@ BDEPEND=" sys-devel/bison sys-devel/flex virtual/pkgconfig - mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) ) + mingw? ( !crossdev-mingw? ( + >=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}] + ) ) nls? ( sys-devel/gettext )" IDEPEND="app-eselect/eselect-wine" @@ -127,6 +128,7 @@ QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext PATCHES=( "${FILESDIR}"/${PN}-7.17-noexecstack.patch "${FILESDIR}"/${PN}-7.20-unwind.patch + "${FILESDIR}"/${PN}-7.21-crossflags.patch ) pkg_pretend() { @@ -223,7 +225,6 @@ src_configure() { $(use_with mingw) $(use_with netapi) $(use_with nls gettext) - $(use_with openal) $(use_with opencl) $(use_with opengl) $(use_with osmesa) @@ -259,8 +260,9 @@ src_configure() { mkdir ../build${bits} || die cd ../build${bits} || die - # CROSSCC_amd64/x86 are unused by Wine, but recognized here for users + pe_arch=i386 if (( bits == 64 )); then + pe_arch=x86_64 : "${CROSSCC:=${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}" conf+=( --enable-win64 ) elif use amd64; then @@ -273,8 +275,12 @@ src_configure() { fi : "${CROSSCC:=${CROSSCC_x86:-i686-w64-mingw32-gcc}}" - # use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu) if use mingw; then + # CROSSCC is no longer recognized by Wine, but still use for now + # (future handling for CROSS* variables is subject to changes) + conf+=( ac_cv_prog_${pe_arch}_CC="${CROSSCC}" ) + + # use *FLAGS for mingw, but strip unsupported : "${CROSSCFLAGS:=$( filter-flags '-fstack-clash-protection' #758914 filter-flags '-fstack-protector*' #870136 @@ -283,7 +289,7 @@ src_configure() { : "${CROSSLDFLAGS:=$( filter-flags '-fuse-ld=*' CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}" - export CROSS{CC,{C,LD}FLAGS} + export CROSS{C,LD}FLAGS fi ECONF_SOURCE=${S} econf "${conf[@]}" -- cgit v1.2.3