diff options
Diffstat (limited to 'app-emulation')
49 files changed, 441 insertions, 1409 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz Binary files differindex 8cc5f93a8fca..d659d8b2ea08 100644 --- a/app-emulation/Manifest.gz +++ b/app-emulation/Manifest.gz diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest index d731c7efaa95..eeef05782c18 100644 --- a/app-emulation/dxvk/Manifest +++ b/app-emulation/dxvk/Manifest @@ -3,15 +3,13 @@ AUX dxvk-2.3.1-gcc14.patch 167 BLAKE2B 3a52e5c02c145dd8732993f540db239ba8d9ef7b3 AUX dxvk-2.4-d3d8-setup.patch 220 BLAKE2B 7f21542907d02e2924595aaff32709882149137b97b2e00bb0196293315dd04b7f72fbd2cd4d0ffc6b28ca1ef2c5047b29039ef3d2a0cc953439307e5ecb0ef6 SHA512 ec510f45686f5222044486e659729b3126aed58a9e66dfd72434e44255ea3507b19e53111e7c430fe96f3058847a3fd32a8f903f3cee1e2ce45ab11bd9f2f2f7 DIST dxvk-2.3.1.tar.gz 1005669 BLAKE2B d78448fcde9d600f7206dfa606fca4069e7563bb8b181fbc172691d6c45586904ae529550926a03612ed3cc1f2a2dff00990638125c1d7ce6179d3cd3ba8df04 SHA512 085567ac263872eb93d776ce7cf982690603e240a977dbb51ad69344af387fd745536ca62819afd4a809732a6f2d22b36c3df9538decf37dec527973d41e392f DIST dxvk-2.4.1.tar.gz 1060662 BLAKE2B 43294af5829fe306acdb72c07b94c28d34eb798a2eaf6d2e42c2b80900e9b6f4f323569dfd51d565c836237fddce26b843f69e4ff57fc2a5838382993a9dd6ed SHA512 629e45bbdaddf83cd8a394877289781e8f54330b4c865b2d453ba3068a6054511a3697ca115497b64df0ce9ee36748a7fdb01fdc5f49a7dc44c4a3d3e47bf6de -DIST dxvk-2.5.2.tar.gz 1135676 BLAKE2B 4f0f030867365e75ec4fdc56fcbbaba26393ed4beb2fb34c351457fe4a23c2e1d9c50f96370112ac4eb98af86e833788f9b075ca399915e37b87a27591d9847a SHA512 b7ee35911c777e27a56aa3b43c26acec14a03531a39f9c465460011d0f2f0c3ee43d09095fbaa8890beae37dcb48520fe232def79279d6a11d0295224b60ce5f DIST dxvk-2.5.3.tar.gz 1142475 BLAKE2B 04bfb577902effec9e22b6546cdfc2b3dd76b84e72c23cb26ac4e54f7aa9464b15d7d74b41dd810fc62d4fff9bbb24cee2771f562a7b931025abfa5995b000bc SHA512 93de46ab69dceea9e13904d9f267a53295a885676bce432c13d992ea33553250e03a695caf15f2c0a9a416c0ed3d799a9155a09dcadfeb43e516780fb188b122 DIST libdisplay-info-275e6459c7ab1ddd4b125f28d0440716e4888078.tar.bz2 81172 BLAKE2B 7a1e9e2feeb95e06e9d3f49ad9d14a8a152cca525085e819cda0b69c238fb79dddd6d547cd0f0a4b51dfc1ec74ac4c006345b9fc48563807bc8ab3bab58ea5ff SHA512 794e94e8c16d65901a7b705d1ba3361817b4e9e19e520b1004bcab232d0347f5713594d67f3c2b79d4f86b3012e710c648975547d27a63de043fcbe9e6b7e66d DIST setup_dxvk.sh 4631 BLAKE2B 25270e1f6dfd446b1d124eac3bd19da8bc770527d02d987949fc3ae0bead07866dafa25f77a90b9a408413a724354a29a4a156ff5c9dc75e26b66e079824ec86 SHA512 257fd84e29a7037f04a1a2a506502c71d527af58f8c84d8c3dfb64597ebdc41c3dca362eaf20ab4bc1982b76428c1f843815d56a6e1369d072e0009e270cb121 DIST spirv-headers-8b246ff75c6615ba4532fe4fde20f1be090c3764.tar.gz 472513 BLAKE2B f1ad7e11c306c62509655eb41d74efc5fb88688780d006c6944844e964b339baa000f70e115c4df2947e882c9ac33186e301b31138c38fe5f997f7af7260f521 SHA512 fe1d9d70b217b194c92dd397bca386ce8452bc5ec3967d64a257b3a531386fe6a6ecb5e9ed8ab5bc5a2707c5378f02f05809d6d197dcfb3f87cd33304c3b1959 DIST vulkan-headers-46dc0f6e514f5730784bb2cac2a7c731636839e8.tar.gz 2255426 BLAKE2B efaf09df3274586c4df2bdd0b1dd9dd43b3b6125e0033ae87af999aea64709e9758bc7b675398b480ae063e28273732d768062d97f6cd61d63ccc798ca7410a5 SHA512 7ea993f7c8ff72dc6bedbfdaced29782ab372228e9111f747d931955e832a7920114f5d1953ecd34d220634a53449ca2ed4c0ed28d3165e258c4d9fafd0aa4be -EBUILD dxvk-2.3.1-r1.ebuild 6667 BLAKE2B ac8620ba4b92cfa33c88db128f98304df7060dcdbaddcff8a570ebe9b2a5e9e6a5ab559088b2d2c30254160bfdc91f414a942421bddf387330f72721eedced08 SHA512 ce8129e47bd4a1a8431e052fc60e831ef6fd692d970d430fc4b111d71b4130915967679d8a96d4ba9c4647826dc34c924b585e3b07db67abb78c6b5e1b458de5 -EBUILD dxvk-2.4.1.ebuild 6104 BLAKE2B 74a6bd12561ec92336b95aa9b8aa1c7167fa5ce984f5d8104e0e3d76140a337891a70215d907929bd7d06c8ef7c5e35a24572aff615ab1479357f0e712d8e999 SHA512 042a6473b19dd1d1a735a8092f944944f0c94e40124e6c96f118de08f2bd83a3a1c6e02767f2cb8a475ca40a540b0d264414e956ecc77a939cf89775ec727d65 -EBUILD dxvk-2.5.2.ebuild 6065 BLAKE2B e93f18c43646759f9220da686e014f71fc2f65d22e0edb80456f1ac53334b78599289edc700a97402564285719d75ded9aa3bbd8b0c9c4b908f65afed0b89a37 SHA512 a067fc8c3b09cc67d6aa6c265488e78732b48deb601c3d2a6a26610f391f0c41c9a5bdbddccf8cf7d7688ce933e5e17f4d0bd5f2f47e10f2ba3f99406f8ad44a -EBUILD dxvk-2.5.3.ebuild 6065 BLAKE2B 9ea9bab828b43dbea7259959a76364d72e1d0167f8c1a95de7896736487f39551bf8a3ce9f609ec6a70f4440a5838b5b5fb7241aade1f0f1f1a78504fbdcc661 SHA512 1dd7320105a01cdbf25de83538996fd006d1ebd2042e653749f6a1dd8c1f45e616f5220bb6c0a73dfe60022ee041d78d73ac853bb40f1a99a4ae7cdf3dd5f331 -EBUILD dxvk-9999.ebuild 5675 BLAKE2B 1a648a3beb76989d2ca6ba95568df20ffaf8499bebfbef49954106c10f3c89ec421f3ddb342d9e540f79e3ee315be53c0bef3f86fffb906ec7a6c754ac43a272 SHA512 c76c11f47704e5a2593abd65d3576555c4a4a96982755d68dc63103d80333a539327c6f2cc0e72c604cfe0d7b5c0a2067f01a12cffa20d65d78d3dcefc595fb2 +EBUILD dxvk-2.3.1-r1.ebuild 6617 BLAKE2B 47f91edb7dd06c3c66922fc3c4f2069d89adecc61a629f0307070651e74cae9cbaaf081524f12c2c95827633f98996a1955adf82b3c888fd6f6f2c5297dfdfa0 SHA512 af2e1915d711b7aa37d281903dc05621c20962eb7d34e40d2ba2233fc8371657f62ef3616410db091caf1cab41500e6bbc7c8ed1a523bfacbfd6c90a9b804dbb +EBUILD dxvk-2.4.1.ebuild 6056 BLAKE2B 988a2cb5a59389949e28af242d42af8f72b4cc60773205dd311eb50e3157908bd6d74fa83d14d983fd4a1a1c2623ebe1b2ba5659002aa335d5b99d57906b6f8d SHA512 016104a49fda4fe4a3bbc946f53917e532a8ab7eb9206502b30bb474183cd2b8015b7f2afc0f9bbb93e206aee19c52f56f0b16b6446276c3623c13a0fd1375f5 +EBUILD dxvk-2.5.3.ebuild 6017 BLAKE2B 86e20a255fe28aec6c3381fb1bfad4aa2fabf4b4727ac96bdc8ec861194b97ac4a5cda8a586b06cd377c5be09fe67daabfb878aaab451400a148cd8fce786a99 SHA512 7ef56bc5856134e57c920c49513efb5dd7cebe760a8f7cebf671e89af2eb227babf2c50c849bb1e5b84d2f619a2ab68db22d4b93cbc3aae9a8ace65a22b4e3fe +EBUILD dxvk-9999.ebuild 5627 BLAKE2B b389cce248d282f570ad07d85ea59e6f09805e3f3bb1982b7d0e29c867025b6c56130d62c60f3f6e399e763f4c953ee14e7528d3ec77e7e0612eb79af869f1cd SHA512 01436e1d5781948298b8ec3d2ff585e68c16d29b251a12a2e3c9a7e35703fbe3f525ef9d60b13419df7405d6bb6441e4a888853d4b8211050c4c87df3c72ab86 MISC metadata.xml 944 BLAKE2B 804e365c1a6f88001f88c96e0e7cd67d444bee147d764b6c2dff0fb37d836754a2c21a1ea8b505b11c9de93dbc2533e10d0e15dea72b0c05db9d5ada2123a90e SHA512 c7f045fed2ef25fed4094551d0a420fe218d541a678cce4a18fce3d8c090e64dfacbdcce67fcfa202d4c3aeed8911a83b2bf5077e7e13a75aa0e5902d33e4716 diff --git a/app-emulation/dxvk/dxvk-2.3.1-r1.ebuild b/app-emulation/dxvk/dxvk-2.3.1-r1.ebuild index 640326b8a12d..6302477d338f 100644 --- a/app-emulation/dxvk/dxvk-2.3.1-r1.ebuild +++ b/app-emulation/dxvk/dxvk-2.3.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,7 +6,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..13} ) MULTILIB_ABIS="amd64 x86" # allow usage on /no-multilib/ MULTILIB_COMPAT=( abi_x86_{32,64} ) -inherit flag-o-matic meson-multilib python-any-r1 +inherit eapi9-ver flag-o-matic meson-multilib python-any-r1 if [[ ${PV} == 9999 ]]; then inherit git-r3 @@ -180,9 +180,7 @@ pkg_postinst() { elog "it. See ${EROOT}/usr/share/doc/${PF}/README.md* for handling configs." fi - if [[ ! ${REPLACING_VERSIONS##* } ]] || - ver_test ${REPLACING_VERSIONS##* } -lt 2.0 - then + if ver_replacing -lt 2.0; then elog elog ">=${PN}-2.0 requires drivers and Wine to support vulkan-1.3, meaning:" elog ">=wine-*-7.1 (or >=wine-proton-7.0), and >=mesa-22.0 (or >=nvidia-drivers-510)" diff --git a/app-emulation/dxvk/dxvk-2.4.1.ebuild b/app-emulation/dxvk/dxvk-2.4.1.ebuild index c9d781e59ece..dcd2da53321e 100644 --- a/app-emulation/dxvk/dxvk-2.4.1.ebuild +++ b/app-emulation/dxvk/dxvk-2.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,7 +6,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..13} ) MULTILIB_ABIS="amd64 x86" # allow usage on /no-multilib/ MULTILIB_COMPAT=( abi_x86_{32,64} ) -inherit flag-o-matic meson-multilib python-any-r1 +inherit eapi9-ver flag-o-matic meson-multilib python-any-r1 if [[ ${PV} == 9999 ]]; then inherit git-r3 @@ -169,9 +169,7 @@ pkg_postinst() { elog "removed upstream, handling may change in the future." fi - if use d3d8 && [[ ${REPLACING_VERSIONS##* } ]] && - ver_test ${REPLACING_VERSIONS##* } -lt 2.4 - then + if use d3d8 && ver_replacing -lt 2.4; then elog elog ">=${PN}-2.4 now provides d3d8.dll, to make use of it will need to" elog "update old wine prefixes which is typically done by re-running:" diff --git a/app-emulation/dxvk/dxvk-2.5.2.ebuild b/app-emulation/dxvk/dxvk-2.5.2.ebuild deleted file mode 100644 index ae26f5d047a0..000000000000 --- a/app-emulation/dxvk/dxvk-2.5.2.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) -MULTILIB_ABIS="amd64 x86" # allow usage on /no-multilib/ -MULTILIB_COMPAT=( abi_x86_{32,64} ) -inherit flag-o-matic meson-multilib python-any-r1 - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/doitsujin/dxvk.git" - EGIT_SUBMODULES=( - # picky about headers and is cross-compiled making -I/usr/include troublesome - include/{spirv,vulkan} - subprojects/libdisplay-info - ) -else - HASH_SPIRV=8b246ff75c6615ba4532fe4fde20f1be090c3764 - HASH_VULKAN=46dc0f6e514f5730784bb2cac2a7c731636839e8 - HASH_DISPLAYINFO=275e6459c7ab1ddd4b125f28d0440716e4888078 - SRC_URI=" - https://github.com/doitsujin/dxvk/archive/refs/tags/v${PV}.tar.gz - -> ${P}.tar.gz - https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz - -> spirv-headers-${HASH_SPIRV}.tar.gz - https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz - -> vulkan-headers-${HASH_VULKAN}.tar.gz - https://gitlab.freedesktop.org/JoshuaAshton/libdisplay-info/-/archive/${HASH_DISPLAYINFO}/libdisplay-info-${HASH_DISPLAYINFO}.tar.bz2 - " - KEYWORDS="-* amd64 x86" -fi - -DESCRIPTION="Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux / Wine" -HOMEPAGE="https://github.com/doitsujin/dxvk/" - -# setup_dxvk.sh is no longer provided, fetch old until a better solution -SRC_URI+=" https://raw.githubusercontent.com/doitsujin/dxvk/cd21cd7fa3b0df3e0819e21ca700b7627a838d69/setup_dxvk.sh" - -LICENSE="ZLIB Apache-2.0 MIT" -SLOT="0" -IUSE="+abi_x86_32 crossdev-mingw +d3d8 +d3d9 +d3d10 +d3d11 +dxgi +strip" -REQUIRED_USE=" - || ( d3d8 d3d9 d3d10 d3d11 dxgi ) - d3d8? ( d3d9 ) - d3d10? ( d3d11 ) - d3d11? ( dxgi ) -" - -BDEPEND=" - ${PYTHON_DEPS} - dev-util/glslang - !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.10.3-wow64-setup.patch - "${FILESDIR}"/${PN}-2.4-d3d8-setup.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} == binary ]] && return - - if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then - local tool=-w64-mingw32-g++ - for tool in $(usev abi_x86_64 x86_64${tool}) $(usev abi_x86_32 i686${tool}); do - if ! type -P ${tool} >/dev/null; then - eerror "With USE=crossdev-mingw, it is necessary to setup the mingw toolchain." - eerror "For instructions, please see: https://wiki.gentoo.org/wiki/Mingw" - use abi_x86_32 && use abi_x86_64 && - eerror "Also, with USE=abi_x86_32, will need both i686 and x86_64 toolchains." - die "USE=crossdev-mingw is set but ${tool} was not found" - elif [[ ! $(LC_ALL=C ${tool} -v 2>&1) =~ "Thread model: posix" ]]; then - eerror "${PN} requires GCC to be built with --enable-threads=posix" - eerror "Please see: https://wiki.gentoo.org/wiki/Mingw#POSIX_threads_for_Windows" - die "USE=crossdev-mingw is set but ${tool} does not use POSIX threads" - fi - done - fi -} - -src_prepare() { - if [[ ${PV} != 9999 ]]; then - rmdir include/{spirv,vulkan} subprojects/libdisplay-info || die - mv ../SPIRV-Headers-${HASH_SPIRV} include/spirv || die - mv ../Vulkan-Headers-${HASH_VULKAN} include/vulkan || die - mv ../libdisplay-info-${HASH_DISPLAYINFO} subprojects/libdisplay-info || die - fi - cp -- "${DISTDIR}"/setup_dxvk.sh . || die - - default - - sed -i "/^basedir=/s|=.*|=${EPREFIX}/usr/lib/${PN}|" setup_dxvk.sh || die -} - -src_configure() { - use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} - - # random segfaults been reported with LTO in some games, filter as - # a safety (note that optimizing this further won't really help - # performance, GPU does the actual work) - filter-lto - - # -mavx with mingw-gcc has a history of obscure issues and - # disabling is seen as safer, e.g. `WINEARCH=win32 winecfg` - # crashes with -march=skylake >=wine-8.10, similar issues with - # znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273 - append-flags -mno-avx - - if [[ ${CHOST} != *-mingw* ]]; then - if [[ ! -v MINGW_BYPASS ]]; then - unset AR CC CXX RC STRIP - filter-flags '-fuse-ld=*' - filter-flags '-mfunction-return=thunk*' #878849 - - # some bashrc-mv users tend to do CFLAGS="${LDFLAGS}" and then - # strip-unsupported-flags miss these during compile-only tests - # (primarily done for 23.0 profiles' -z, not full coverage) - filter-flags '-Wl,-z,*' #928038 - fi - - CHOST_amd64=x86_64-w64-mingw32 - CHOST_x86=i686-w64-mingw32 - CHOST=$(usex x86 ${CHOST_x86} ${CHOST_amd64}) - - strip-unsupported-flags - fi - - multilib-minimal_src_configure -} - -multilib_src_configure() { - # multilib's ${CHOST_amd64}-gcc -m32 is unusable with crossdev, - # unset again so meson eclass will set ${CHOST}-gcc + others - use crossdev-mingw && [[ ! -v MINGW_BYPASS ]] && unset AR CC CXX RC STRIP - - local emesonargs=( - --prefix="${EPREFIX}"/usr/lib/${PN} - --{bin,lib}dir=x${MULTILIB_ABI_FLAG: -2} - --force-fallback-for=libdisplay-info # system's is ELF (unusable) - $(meson_use {,enable_}d3d8) - $(meson_use {,enable_}d3d9) - $(meson_use {,enable_}d3d10) - $(meson_use {,enable_}d3d11) - $(meson_use {,enable_}dxgi) - $(usev strip --strip) # portage won't strip .dll, so allow it here - ) - - meson_src_configure -} - -multilib_src_install_all() { - dobin setup_dxvk.sh - dodoc README.md dxvk.conf - - find "${ED}" -type f -name '*.a' -delete || die -} - -pkg_postinst() { - if [[ ! ${REPLACING_VERSIONS} ]]; then - elog "To enable ${PN} on a wine prefix, you can run the following command:" - elog - elog " WINEPREFIX=/path/to/prefix setup_dxvk.sh install --symlink" - elog - elog "See ${EROOT}/usr/share/doc/${PF}/README.md* for details." - elog "Note: setup_dxvk.sh is unofficially temporarily provided as it was" - elog "removed upstream, handling may change in the future." - fi - - if use d3d8 && [[ ${REPLACING_VERSIONS##* } ]] && - ver_test ${REPLACING_VERSIONS##* } -lt 2.4 - then - elog - elog ">=${PN}-2.4 now provides d3d8.dll, to make use of it will need to" - elog "update old wine prefixes which is typically done by re-running:" - elog - elog " WINEPREFIX=/path/to/prefix setup_dxvk.sh install --symlink" - elog - fi -} diff --git a/app-emulation/dxvk/dxvk-2.5.3.ebuild b/app-emulation/dxvk/dxvk-2.5.3.ebuild index 7e739356a90c..2e4e20063b47 100644 --- a/app-emulation/dxvk/dxvk-2.5.3.ebuild +++ b/app-emulation/dxvk/dxvk-2.5.3.ebuild @@ -6,7 +6,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..13} ) MULTILIB_ABIS="amd64 x86" # allow usage on /no-multilib/ MULTILIB_COMPAT=( abi_x86_{32,64} ) -inherit flag-o-matic meson-multilib python-any-r1 +inherit eapi9-ver flag-o-matic meson-multilib python-any-r1 if [[ ${PV} == 9999 ]]; then inherit git-r3 @@ -168,9 +168,7 @@ pkg_postinst() { elog "removed upstream, handling may change in the future." fi - if use d3d8 && [[ ${REPLACING_VERSIONS##* } ]] && - ver_test ${REPLACING_VERSIONS##* } -lt 2.4 - then + if use d3d8 && ver_replacing -lt 2.4; then elog elog ">=${PN}-2.4 now provides d3d8.dll, to make use of it will need to" elog "update old wine prefixes which is typically done by re-running:" diff --git a/app-emulation/dxvk/dxvk-9999.ebuild b/app-emulation/dxvk/dxvk-9999.ebuild index 9552c61fc99e..b24fcd5ba6ba 100644 --- a/app-emulation/dxvk/dxvk-9999.ebuild +++ b/app-emulation/dxvk/dxvk-9999.ebuild @@ -6,7 +6,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..13} ) MULTILIB_ABIS="amd64 x86" # allow usage on /no-multilib/ MULTILIB_COMPAT=( abi_x86_{32,64} ) -inherit flag-o-matic meson-multilib python-any-r1 +inherit eapi9-ver flag-o-matic meson-multilib python-any-r1 if [[ ${PV} == 9999 ]]; then inherit git-r3 @@ -162,9 +162,7 @@ pkg_postinst() { elog "removed upstream, handling may change in the future." fi - if use d3d8 && [[ ${REPLACING_VERSIONS##* } ]] && - ver_test ${REPLACING_VERSIONS##* } -lt 2.4 - then + if use d3d8 && ver_replacing -lt 2.4; then elog elog ">=${PN}-2.4 now provides d3d8.dll, to make use of it will need to" elog "update old wine prefixes which is typically done by re-running:" diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest index c64b88233043..f098921f5fcd 100644 --- a/app-emulation/libvirt/Manifest +++ b/app-emulation/libvirt/Manifest @@ -26,11 +26,11 @@ DIST libvirt-10.8.0.tar.xz 9575348 BLAKE2B fb7d7b6d8a158c0045bb7fae4080cf8d58f8f DIST libvirt-10.8.0.tar.xz.asc 833 BLAKE2B 25b01613df138dbaa921bfe3d3a2384182d4bff1a5828d0b9cccb08e4a48465d0b89391f83824889052e7827b107304289a3a38589039a302c93a15a5d4fe169 SHA512 1099f61b835351165bfa203f3d7d485f16b89e29234a6301e50cf3b5e47e4c7edb9808c23a6fd5045ed44d8349e78596923ea7cc1896e8239b5816e871fdc0cc DIST libvirt-11.0.0.tar.xz 9700388 BLAKE2B 0fc248bfcc505e143fa56560a216ed62ddeb8f8def5eaf32772bc5f0c1ca87f92dc530d9290f6349dc8727590f6148ffb6627e119f1e89fb0e151f1e6346b645 SHA512 ac5fd17d3f488c241017d967364e0441373e9ab0457dab1acfe84fd0b90353dc5d185cc7fcd2b0d7995af4137a3fa18371abb5511686456a9e720f7ec7829da9 DIST libvirt-11.0.0.tar.xz.asc 833 BLAKE2B c959800b18ac7220970d6a772aefe4a5b53419298641b4fc659db2585d187701b823cda06ea2e16ff8bfa50c7552fb3eb50ff5c4ea40fb4a3c6eb93921481165 SHA512 7b1bb3d902986bc269bf9efd0ab2dbfb256c3e02e0d410e3bf81ddb649b1d0983090adc1857d59db79fa7ac19b983496a80ac3bf6ae13163bb772cea05b5728b -EBUILD libvirt-10.10.0-r1.ebuild 10156 BLAKE2B cab20284f4764e79eddeb3baa24406a825b2c8b9691983fc639034744258f19760a5d8cf02421c3a1a44ebdb3ebf7c3e0e359dc5dc020555494ad5f675948187 SHA512 4b00f545d3abbd6e0382560ef94c068c55bc1212ba2256803b1c2412c64916da2497d1c180359d924caecd3cb7517d4a1b372253df82b745917aa691ce6436b9 +EBUILD libvirt-10.10.0-r1.ebuild 10172 BLAKE2B 4fcfec9ef56ba146955ba821f8badbc1de0350a88b216a6e705a3d15546f52cb083a9aac612ae5ab3d6ab38eb0b4d12be7c9965084c3c213ad9f86a74b1e3258 SHA512 92d179c3fc9d0ed53d83f930a107081e62c67efab1ff136adc3332a080d4ce3aea9d93c332ee32406804a99ee3bad4951b7408292770bd0c21911d73f2008c81 EBUILD libvirt-10.3.0-r4.ebuild 10193 BLAKE2B 01515dc6f7d77c235b2be818a8f27af6996282cf08d33d57bd84f9a2d3b12ff82082883123d88fc13d6cb8a249c2986ee888e11ab3a9be9de29c24940b6d8352 SHA512 a56a13ce5165a300849708ac6052fbf6703fe0d6db0f05101679f628f43f9e14289e7e3d303f8e0dd66b74160926e32624797df6048e137d88c8fe3b2abcee3f EBUILD libvirt-10.5.0-r2.ebuild 10075 BLAKE2B 2093b04c2cd3690694d250e9435fe7222e88320f4e21384a11e62bf015f3a0636fadb39e040b87d3e62b1cc343dd09abb3d661912fa0ff9188f8dfdb512ec887 SHA512 0e1c5927c420dcc26f2bdb165112bb7d559a7c4f045ce582e0ed001028b1bbe186646d8b1301abfaa06aeeed65773ed14654bd0277c3dd7cbeeb39ebde87c0d8 EBUILD libvirt-10.6.0-r1.ebuild 10075 BLAKE2B 2093b04c2cd3690694d250e9435fe7222e88320f4e21384a11e62bf015f3a0636fadb39e040b87d3e62b1cc343dd09abb3d661912fa0ff9188f8dfdb512ec887 SHA512 0e1c5927c420dcc26f2bdb165112bb7d559a7c4f045ce582e0ed001028b1bbe186646d8b1301abfaa06aeeed65773ed14654bd0277c3dd7cbeeb39ebde87c0d8 EBUILD libvirt-10.8.0.ebuild 10072 BLAKE2B b3b6dd462d2c817a03a63ac2017b3d157ffc8334c20ac579a013bd59de99b0764358149d2853d421244eec5e6aa4e91ba40864f84c4d1afe4cba78c8aef55f77 SHA512 f1d8c447a8c4933be27e20260add44c66046743739f98fa3502ce3e942da61acb0258438c12d165bdd3e4783ab01bc40e9b86bf7ecc2c8aa7a6305390b4c51b2 -EBUILD libvirt-11.0.0.ebuild 10072 BLAKE2B 64e614c2f06f416fbc869cd291e290a2ac4dec118e7ebaabde3663f84d477b1034a81e3d214c249c287888bd28802f48ac59b3a96d8c0400351714c67f1c236d SHA512 d056c775f5fccb567180df15a4abc18c90acf5b80b5e825343ebd691b3ad7b06f84031e3b7d87e338b1b6bca7f2177ef336c62aa87ccb692aed4cfc8cd542ccd -EBUILD libvirt-9999.ebuild 10076 BLAKE2B 81a583833456106d5a8bad4eff15ea8adb20d33809f4080d2855f830fa1423dc2e03dc713c7325617917fee59b922ce20e6c90f2998736a47e7c07ee03545d01 SHA512 3068458c0449e789a01f695384c4a94b6417784ac2e5a73b7468609a6e92657004a509fc0d7519d752b701229c08fdc285690c2fd358779dcaff06aac86065c2 +EBUILD libvirt-11.0.0.ebuild 10088 BLAKE2B cd8d867441289e994ae329426272bdbf49ed4d79e8145556c2b168fc7a1c07c4242ca7969359eca74e5ad8f4caa837dd517d28a7c11fb4cb60a04e455289ff5a SHA512 c50841c8dc8a7eb3cd0ab543f4a15098707729e2ff3c531bc9e3efaf8efa2d8ef8ac7f58858d43d228bff46768d237077454cde4adf7fc6d048dae1eb1f1e57b +EBUILD libvirt-9999.ebuild 9809 BLAKE2B 6537162426a467e23f1b6db240f2595a74a3ebaa336d41a087ab868d55327268731b2c163614e7942765e62c1a067eebd92796f99f655689c9c9c96e52b6c540 SHA512 a52eb3c5332f0d446cc989272b04c89f9049c9fa8a7279cb2ce7da7b46f4c3f2b3a09944acf42aa5480d616021eca5bbf0998300758d641c3bc76ff4a21e3568 MISC metadata.xml 3822 BLAKE2B badb40564def06854a0c3af011b5de2888d722996c9b15df570a709161e49796f3d76ba2365c4adc1724f16bee3518d0e87ed6d2619d505b5ba2f1fd02c90f34 SHA512 f31e86b4d0c1faaf5bf0ac253cf20ce7728b94841debb590356efc0fa1e1a3d095a94e69ce0a34f793faadf10ed00ae1212aac54d13288f1975db4f032fd8b50 diff --git a/app-emulation/libvirt/libvirt-10.10.0-r1.ebuild b/app-emulation/libvirt/libvirt-10.10.0-r1.ebuild index b78609727579..1627df058ddb 100644 --- a/app-emulation/libvirt/libvirt-10.10.0-r1.ebuild +++ b/app-emulation/libvirt/libvirt-10.10.0-r1.ebuild @@ -216,6 +216,7 @@ pkg_setup() { ~NETFILTER_XT_CONNMARK ~NETFILTER_XT_MARK ~NETFILTER_XT_TARGET_CHECKSUM + ~NET_ACT_CSUM ~IP_NF_FILTER ~IP_NF_MANGLE ~IP_NF_NAT diff --git a/app-emulation/libvirt/libvirt-11.0.0.ebuild b/app-emulation/libvirt/libvirt-11.0.0.ebuild index 3bf3bc2e7d59..59aba7615840 100644 --- a/app-emulation/libvirt/libvirt-11.0.0.ebuild +++ b/app-emulation/libvirt/libvirt-11.0.0.ebuild @@ -215,6 +215,7 @@ pkg_setup() { ~NETFILTER_XT_CONNMARK ~NETFILTER_XT_MARK ~NETFILTER_XT_TARGET_CHECKSUM + ~NET_ACT_CSUM ~IP_NF_FILTER ~IP_NF_MANGLE ~IP_NF_NAT diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index f7f15c967707..28c7fc107ed5 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -205,9 +205,6 @@ pkg_setup() { ~!GRKERNSEC_CHROOT_CHMOD ~!GRKERNSEC_CHROOT_CAPS" - kernel_is lt 4 7 && use lxc && CONFIG_CHECK+=" - ~DEVPTS_MULTIPLE_INSTANCES" - use virt-network && CONFIG_CHECK+=" ~BRIDGE_EBT_MARK_T ~BRIDGE_NF_EBTABLES @@ -215,6 +212,8 @@ pkg_setup() { ~NETFILTER_XT_CONNMARK ~NETFILTER_XT_MARK ~NETFILTER_XT_TARGET_CHECKSUM + ~NETFILTER_XT_TARGET_MASQUERADE + ~NET_ACT_CSUM ~IP_NF_FILTER ~IP_NF_MANGLE ~IP_NF_NAT @@ -222,17 +221,6 @@ pkg_setup() { ~IP6_NF_MANGLE ~IP6_NF_NAT" - # This was renamed in kernel commit v5.2-rc1~133^2~174^2~6 - if use virt-network ; then - if kernel_is -lt 5 2 ; then - CONFIG_CHECK+=" - ~IP_NF_TARGET_MASQUERADE" - else - CONFIG_CHECK+=" - ~NETFILTER_XT_TARGET_MASQUERADE" - fi - fi - # Bandwidth Limiting Support use virt-network && CONFIG_CHECK+=" ~BRIDGE_EBT_T_NAT diff --git a/app-emulation/vkd3d-proton/Manifest b/app-emulation/vkd3d-proton/Manifest index 4e97131b3422..ccd914964af2 100644 --- a/app-emulation/vkd3d-proton/Manifest +++ b/app-emulation/vkd3d-proton/Manifest @@ -15,9 +15,9 @@ DIST vkd3d-proton-vulkan-headers-83e1a9ed8c.tar.gz 1299014 BLAKE2B 0b1e635aaa6ee DIST vulkan-headers-29f979ee5aa58b7b005f805ea8df7a855c39ff37.tar.gz 2359246 BLAKE2B 4208b0837789cb26bcb5309d8f1f56aa58dca2f06f61557b6624aa9e63566e62b1e544da33050a48489e58c3e71022ff58dd10ebca00008105c8a909cc07a44c SHA512 15618de42ee2bc019053f00e51afdf37dbdedc1ce6ec18e806e169ba002ac7720c8b3c75e57adb01e56d2c0f5888ddf6418f688bcb666859549befdfa3beb8b5 DIST vulkan-headers-5677bafb820e476441e9e1f745371b72133407d3.tar.gz 2281652 BLAKE2B 03c55bf485214631d2e669165d3ed2dc068a3bc7bdffe59c5173a15885281cef4e57c5327b22de857ab9604f8e52bbcd6de0d9f5ff7cb3eee407845de722621d SHA512 d5d8eccae8f577d712ada89e42d88e0602f6eb499bf2e08f93505e5ffd554b0df8de74751fbe321184a0cfdaf60ce475273e9becca7a8f837afe6c5597b19671 DIST vulkan-headers-f030d9dd8ca297b84b10330cee87f72acc3b0aab.tar.gz 2255357 BLAKE2B 07cfa8ccdd26966116e7c35e0d350be94936469f2b9af77c84b8c61495b6ba76813047b5d26bba1fabd44a8f35396b32b6ad32c3b93b0b1a818ce9ed45f93db2 SHA512 6adf81d16d07710322b7c92a0e0436ee33be94d55116e3c460eabb4196a180f8c7b481c19a84a8bbea4e98dda6cf63ff2876f196348921a0c1d9c8c1005cd521 -EBUILD vkd3d-proton-2.12.ebuild 7797 BLAKE2B 244c709c7dddf6457dad446186c248ed8cb1f7e8fb8061048c9a3a5f096d4f743156534274d6da157a8128a48fb4df260bc71d9c46f038aec3c1fca5d1493a05 SHA512 c46beceb54d66e33dafd95302a3388b2b1ef652742678abbdcfad7493eba475a03dfcb152556a2878d90f8bb02b4db7b0506a9ee9f9db0399f3abb5cdb5aa450 -EBUILD vkd3d-proton-2.13.ebuild 7797 BLAKE2B 22686584d6e884394ab857d68bf14b1af0dd1f503b2f321e805f06de71bbd53a9c2cc5d75153f7b7b278d3f30e8ddcd82dfeb7ad6e90bc4788bcf4312a820e5d SHA512 36a45269d3ca276674d3153f8fa352d5ef21eb986b5a1a41b873e241870ab78bd18fec020208124f2d1d131651f6d13bd80f4a27b353009dcebdebf529c4e5f5 -EBUILD vkd3d-proton-2.14.1.ebuild 7797 BLAKE2B c1bb1f4e7c1b80534b7b9a196c84e37fdb69f9d69f8e8d9283e13c01c567c2807d1292f61b35759845c0a1ed6541a8b26270d0067bc4c504cb33bd9a3079540e SHA512 2993b07c3f74345ae93b664e8455fe8edcc7416d8fbd9568cee3fe236f8a616c03e46c94fc9fb7c8520bca353d13d5334ee43aae02ad572e8db96d7df59e6c4c +EBUILD vkd3d-proton-2.12.ebuild 7709 BLAKE2B a0f3ef9f754ffdc20de5940144b31998500b03899a1f7c88f4f127b01e5c22e324f313aa5a4c6c63d8b270b1364af000c1e115521bfe41b6fa1a56baa180fc1a SHA512 8cc5d3f094e1c13b3f5943dd1f902dd52983447a124e3164b28bddfd7d41a7565249152158cf04f5f197f656965bb7e4ad337e7b2dee082c41a89364f2374a05 +EBUILD vkd3d-proton-2.13.ebuild 7709 BLAKE2B e33feff723d60a282c68b9e95f4cee5313533ae6699738f86ae28412094a1b9ea159c634549af59ba7ee1bc12a25760a1e51b927e83c773f5f4ecf1e35789cbd SHA512 6450ab901288fbe813af09730b0fb5b58ff05d4ab8adb2aa85308acfbd98dae3ec9c4b63a541bfa584c714c57fb8453a2d190debcf0ad0fe329e214266162c66 +EBUILD vkd3d-proton-2.14.1.ebuild 7709 BLAKE2B 52f317a2005ee5678d2dd0ace5786e5ed1a0e140c920e295243cd3ee1e9c3c43adf87dfd34daf41dca8128c343c97c9f323f0d22937272b2c3bde44c6347cc14 SHA512 eb798e41efaf241aecad069abedf0cfb945ea888d1f365bfcea2734b8eeb6da6c2697638977c01a3df960ce28993f5e4a870d3f3c3a44a8de6baf1b305dee3ea EBUILD vkd3d-proton-2.6-r1.ebuild 6898 BLAKE2B d65133bfa465040c0f8a2c5d148d907ebe063589f5ef3916c39d9441a409d759127561ee006454b75d8eecb36c6a083eefbc0739a2fee06b63f9c0bf7a2a34d8 SHA512 92f849054d2f4e26a5533b8db9417e7baebaaad99fd4393915503b2edc6c25caa7ed99720bf6bc17bd9bc3b065cca8fb61fbb0c77bd2f2036fbd1a4d0ddb19c3 -EBUILD vkd3d-proton-9999.ebuild 7599 BLAKE2B 914e57c539f829bdc09b41c38e676e297be8aa8edd83772cb9a9faf0daaa4a7213e36460691b240560b34a1228bd9f1adb2ebc8f6ad1d30fed9885b9bc73c521 SHA512 c5929ab80d96c636e82b03ec4da2d43be30c6b08898e6c03e0f2aad1b388eea5727d8fc3597c4b08167ced0057d915dfe6727eeceea365a34efd68537731ee70 +EBUILD vkd3d-proton-9999.ebuild 7511 BLAKE2B e283143902ac7c52d559ee68d47bcf875bb64da0d4185e26edd48f76aaebd9985b7a6434e02162dadace8356d4ce8530ecff87355254fce5b9c02223ce904cff SHA512 6805ccb07811e7e4524c7dde3ca7c24aa543efa2d2de2f569d944120c1df454f8fad394a65fe69557ddad1b1d6f45656271215edb28ddda5875f46ae0ef83275 MISC metadata.xml 677 BLAKE2B 1caac710282366e24f8276c8748d9c84e19fcf9a064e901fbca4989be500f56be0e01d7a499aba5435d3537ae80111a7ca6842755bde7f3e34eba517c8e19e83 SHA512 89151eba97cd38f7c8d13c697ada2c2d2b9cff1ad16af42243f387f0700cb824304a9d6e1b740bb43c2474cf77e2550718d4a03d33095a254b7491ff5f1f3daa diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-2.12.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-2.12.ebuild index b2632b34036a..8c2a99c5de97 100644 --- a/app-emulation/vkd3d-proton/vkd3d-proton-2.12.ebuild +++ b/app-emulation/vkd3d-proton/vkd3d-proton-2.12.ebuild @@ -1,11 +1,11 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 MULTILIB_ABIS="amd64 x86" # allow usage on /no-multilib/ MULTILIB_COMPAT=( abi_x86_{32,64} ) -inherit flag-o-matic meson-multilib toolchain-funcs +inherit eapi9-ver flag-o-matic meson-multilib toolchain-funcs if [[ ${PV} == 9999 ]]; then inherit git-r3 @@ -188,20 +188,20 @@ pkg_postinst() { elog "on it, not meant to function independently even if only using d3d12." elog elog "See ${EROOT}/usr/share/doc/${PF}/README.md* for details." - elif [[ ${REPLACING_VERSIONS##* } ]]; then - if ver_test ${REPLACING_VERSIONS##* } -lt 2.7; then - elog - elog ">=${PN}-2.7 requires drivers and Wine to support vulkan-1.3, meaning:" - elog ">=wine-*-7.1 (or >=wine-proton-7.0), and >=mesa-22.0 (or >=nvidia-drivers-510)" - fi + fi - if ver_test ${REPLACING_VERSIONS##* } -lt 2.9; then - elog - elog ">=${PN}-2.9 has a new file to install (d3d12core.dll), old Wine prefixes that" - elog "relied on '--symlink' may need updates by using the setup_vkd3d_proton.sh." - elog - elog "Furthermore, it may not function properly if >=app-emulation/dxvk-2.1's" - elog "dxgi.dll is not available on that prefix (even if only using d3d12)." - fi + if ver_replacing -lt 2.7; then + elog + elog ">=${PN}-2.7 requires drivers and Wine to support vulkan-1.3, meaning:" + elog ">=wine-*-7.1 (or >=wine-proton-7.0), and >=mesa-22.0 (or >=nvidia-drivers-510)" + fi + + if ver_replacing -lt 2.9; then + elog + elog ">=${PN}-2.9 has a new file to install (d3d12core.dll), old Wine prefixes that" + elog "relied on '--symlink' may need updates by using the setup_vkd3d_proton.sh." + elog + elog "Furthermore, it may not function properly if >=app-emulation/dxvk-2.1's" + elog "dxgi.dll is not available on that prefix (even if only using d3d12)." fi } diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-2.13.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-2.13.ebuild index 5ec5819e4a2f..2ddc2bc48d4f 100644 --- a/app-emulation/vkd3d-proton/vkd3d-proton-2.13.ebuild +++ b/app-emulation/vkd3d-proton/vkd3d-proton-2.13.ebuild @@ -1,11 +1,11 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 MULTILIB_ABIS="amd64 x86" # allow usage on /no-multilib/ MULTILIB_COMPAT=( abi_x86_{32,64} ) -inherit flag-o-matic meson-multilib toolchain-funcs +inherit eapi9-ver flag-o-matic meson-multilib toolchain-funcs if [[ ${PV} == 9999 ]]; then inherit git-r3 @@ -188,20 +188,20 @@ pkg_postinst() { elog "on it, not meant to function independently even if only using d3d12." elog elog "See ${EROOT}/usr/share/doc/${PF}/README.md* for details." - elif [[ ${REPLACING_VERSIONS##* } ]]; then - if ver_test ${REPLACING_VERSIONS##* } -lt 2.7; then - elog - elog ">=${PN}-2.7 requires drivers and Wine to support vulkan-1.3, meaning:" - elog ">=wine-*-7.1 (or >=wine-proton-7.0), and >=mesa-22.0 (or >=nvidia-drivers-510)" - fi + fi - if ver_test ${REPLACING_VERSIONS##* } -lt 2.9; then - elog - elog ">=${PN}-2.9 has a new file to install (d3d12core.dll), old Wine prefixes that" - elog "relied on '--symlink' may need updates by using the setup_vkd3d_proton.sh." - elog - elog "Furthermore, it may not function properly if >=app-emulation/dxvk-2.1's" - elog "dxgi.dll is not available on that prefix (even if only using d3d12)." - fi + if ver_replacing -lt 2.7; then + elog + elog ">=${PN}-2.7 requires drivers and Wine to support vulkan-1.3, meaning:" + elog ">=wine-*-7.1 (or >=wine-proton-7.0), and >=mesa-22.0 (or >=nvidia-drivers-510)" + fi + + if ver_replacing -lt 2.9; then + elog + elog ">=${PN}-2.9 has a new file to install (d3d12core.dll), old Wine prefixes that" + elog "relied on '--symlink' may need updates by using the setup_vkd3d_proton.sh." + elog + elog "Furthermore, it may not function properly if >=app-emulation/dxvk-2.1's" + elog "dxgi.dll is not available on that prefix (even if only using d3d12)." fi } diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-2.14.1.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-2.14.1.ebuild index 124415b08e86..ee481dec3ed1 100644 --- a/app-emulation/vkd3d-proton/vkd3d-proton-2.14.1.ebuild +++ b/app-emulation/vkd3d-proton/vkd3d-proton-2.14.1.ebuild @@ -5,7 +5,7 @@ EAPI=8 MULTILIB_ABIS="amd64 x86" # allow usage on /no-multilib/ MULTILIB_COMPAT=( abi_x86_{32,64} ) -inherit flag-o-matic meson-multilib toolchain-funcs +inherit eapi9-ver flag-o-matic meson-multilib toolchain-funcs if [[ ${PV} == 9999 ]]; then inherit git-r3 @@ -188,20 +188,20 @@ pkg_postinst() { elog "on it, not meant to function independently even if only using d3d12." elog elog "See ${EROOT}/usr/share/doc/${PF}/README.md* for details." - elif [[ ${REPLACING_VERSIONS##* } ]]; then - if ver_test ${REPLACING_VERSIONS##* } -lt 2.7; then - elog - elog ">=${PN}-2.7 requires drivers and Wine to support vulkan-1.3, meaning:" - elog ">=wine-*-7.1 (or >=wine-proton-7.0), and >=mesa-22.0 (or >=nvidia-drivers-510)" - fi + fi - if ver_test ${REPLACING_VERSIONS##* } -lt 2.9; then - elog - elog ">=${PN}-2.9 has a new file to install (d3d12core.dll), old Wine prefixes that" - elog "relied on '--symlink' may need updates by using the setup_vkd3d_proton.sh." - elog - elog "Furthermore, it may not function properly if >=app-emulation/dxvk-2.1's" - elog "dxgi.dll is not available on that prefix (even if only using d3d12)." - fi + if ver_replacing -lt 2.7; then + elog + elog ">=${PN}-2.7 requires drivers and Wine to support vulkan-1.3, meaning:" + elog ">=wine-*-7.1 (or >=wine-proton-7.0), and >=mesa-22.0 (or >=nvidia-drivers-510)" + fi + + if ver_replacing -lt 2.9; then + elog + elog ">=${PN}-2.9 has a new file to install (d3d12core.dll), old Wine prefixes that" + elog "relied on '--symlink' may need updates by using the setup_vkd3d_proton.sh." + elog + elog "Furthermore, it may not function properly if >=app-emulation/dxvk-2.1's" + elog "dxgi.dll is not available on that prefix (even if only using d3d12)." fi } diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild index 12ec38649be1..a573681d93e6 100644 --- a/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild +++ b/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 MULTILIB_ABIS="amd64 x86" # allow usage on /no-multilib/ MULTILIB_COMPAT=( abi_x86_{32,64} ) -inherit flag-o-matic meson-multilib toolchain-funcs +inherit eapi9-ver flag-o-matic meson-multilib toolchain-funcs if [[ ${PV} == 9999 ]]; then inherit git-r3 @@ -188,20 +188,20 @@ pkg_postinst() { elog "on it, not meant to function independently even if only using d3d12." elog elog "See ${EROOT}/usr/share/doc/${PF}/README.md* for details." - elif [[ ${REPLACING_VERSIONS##* } ]]; then - if ver_test ${REPLACING_VERSIONS##* } -lt 2.7; then - elog - elog ">=${PN}-2.7 requires drivers and Wine to support vulkan-1.3, meaning:" - elog ">=wine-*-7.1 (or >=wine-proton-7.0), and >=mesa-22.0 (or >=nvidia-drivers-510)" - fi + fi - if ver_test ${REPLACING_VERSIONS##* } -lt 2.9; then - elog - elog ">=${PN}-2.9 has a new file to install (d3d12core.dll), old Wine prefixes that" - elog "relied on '--symlink' may need updates by using the setup_vkd3d_proton.sh." - elog - elog "Furthermore, it may not function properly if >=app-emulation/dxvk-2.1's" - elog "dxgi.dll is not available on that prefix (even if only using d3d12)." - fi + if ver_replacing -lt 2.7; then + elog + elog ">=${PN}-2.7 requires drivers and Wine to support vulkan-1.3, meaning:" + elog ">=wine-*-7.1 (or >=wine-proton-7.0), and >=mesa-22.0 (or >=nvidia-drivers-510)" + fi + + if ver_replacing -lt 2.9; then + elog + elog ">=${PN}-2.9 has a new file to install (d3d12core.dll), old Wine prefixes that" + elog "relied on '--symlink' may need updates by using the setup_vkd3d_proton.sh." + elog + elog "Furthermore, it may not function properly if >=app-emulation/dxvk-2.1's" + elog "dxgi.dll is not available on that prefix (even if only using d3d12)." fi } diff --git a/app-emulation/wine-gecko/Manifest b/app-emulation/wine-gecko/Manifest index 1d6656be1980..9d5400d2cfd8 100644 --- a/app-emulation/wine-gecko/Manifest +++ b/app-emulation/wine-gecko/Manifest @@ -1,7 +1,3 @@ -DIST wine-gecko-2.47.2-x86.msi 59162112 BLAKE2B 75197c5145dd047d637ea950ed1df918b79446bbb5aae642a90d95af96870cd1756b8469deca105d986ae2dc166ad1b2b89dd7e16c7d13baa4b215b30c3ba909 SHA512 4e6e688fada1edd3d7e0e131246dcae8c6db1a2fde946540b6f8c8b2deee8aa19f210368132f00789d4f49bf2b5e5ac671d4d3699f557e652ece50e55fbcbd43 -DIST wine-gecko-2.47.2-x86.tar.xz 45556880 BLAKE2B 43334edd68f22e21347a49bcd7321d90111652fe6143fcb94fa97cee950701f1891b41e8c4ea75854d5232a74c2007534d3fdb190c6abfb96290193f6a4546d2 SHA512 de39bacf9e8b45971e3e675ccbbac0731855b81e148619a98fb126c38ab385f10f1e68e0a52a663fa1a079192b378f4d4e4cdb0a11c5e9dd46221a9604214250 -DIST wine-gecko-2.47.2-x86_64.msi 55354880 BLAKE2B c234602e29a6597d26e7a78ec85ac66471ecd8fcea5360d6f32323e4cbee4aca2ccd5530706e8779346ff2d08f1c4900fef198763e431ce7cd232ef117933336 SHA512 9bbaf061d5d2035e6df0898a847697bbed071abaf95ccde08b5ace7a2c6fc871db16443596b23a889def82f98591973fe8ca88063021d8779f8faa48973f239c -DIST wine-gecko-2.47.2-x86_64.tar.xz 43025348 BLAKE2B 0c956043d7a49cdd88a3af4b25191087fd638a68b958e13a46bbf4310ecf7cdeb973eb3ea5b254f2d4f90f2a715d35c25a67b1883159a60a0ff6eea70e0f1077 SHA512 cf7af1087823188c3be6665d7662bf1029c58b4b8db271e5f4bfed15df217b905653b034b62ed0fa961f528be40f0325b378669d27c9a18ef5b9d98ef8c63aeb DIST wine-gecko-2.47.3-x86.msi 55686144 BLAKE2B ce428b35ce70968c12141832aab6044a4e9ecb198b7ce0af69264de2ef16aa7045b154e8dbcb17ef068e5a30a19224014a07210583166394353c0b67ad3f119b SHA512 988390450e5e64bde903595e8cbed39b6e9c6ea928130f6f20cc3c6692c46db8c2a2e0c5dc49ea324e96ee65af3749414aad8b092a02bf7453499178e01c7527 DIST wine-gecko-2.47.3-x86.tar.xz 43291212 BLAKE2B 441659dd002c14b7774b0c2dc4bbc8d29f16bda7b9d1b5ff7d75dca53a6b01366c62270fa617f8bcd7ac07871de72c016d66e557b4d4f734227c0c4ec0b74013 SHA512 c1530c4aec4743b5acb14cecac909ece6e140eec2171ad4b154513de9aead7a323789251e27f4f1c3ff0d6af9cd2590193db99380e2c91a1640dcff49f78b84e DIST wine-gecko-2.47.3-x86_64.msi 54623744 BLAKE2B 2783e060e2277925ca4b1193f4c13d7af88c7605d48d4bdd118826340e293547edc83fa185e2c64fddb629c632480062bedf995b6f65b07360cf9496bbd21f9a SHA512 c8d617695426c19bdb8a415fb0f00dc3ff9aa6c023599d24313f1c6ac50bbf36bc42dc0cdd58dee93c5ad4998468000d123080cbea09efe1bca3d8f7bfa2bd1d @@ -10,7 +6,6 @@ DIST wine-gecko-2.47.4-x86.msi 55187968 BLAKE2B f0ecd9cf41290082918be54eb9646aa3 DIST wine-gecko-2.47.4-x86.tar.xz 43025064 BLAKE2B 2a73c12585b502ae11188482cbc9fb1f45f95bfe4383a7615011104b132f4845f9813d01fb40277e1934fab5f1b35ab40b4f4a66a9967463dd1d666a666904e9 SHA512 1279456eca4439e9adc3c97678fabeca42cc89f683246805ca14f85fc104bf4ba970fb6490f4ebd0938fc8e0a0ca372b000fdd5165f900070eeee30a1aeec117 DIST wine-gecko-2.47.4-x86_64.msi 53898752 BLAKE2B dabc9957670d388b3c24fb850c444f28561b200f608f8cb6434d661198dc09786d8c61d5ad007fa9f3a1820425b5b9b46253a6b825d5461539a76c0c4d8e8315 SHA512 075f95ff7a33ad0af6ad53fe8f0f6e2ab233ceb950957d2fbf7d4955543dfe143d14fade283061df14562e6345a7cbaf754fc92d591ea03a5573accb290ae530 DIST wine-gecko-2.47.4-x86_64.tar.xz 41935496 BLAKE2B 62856a88266b4757602c0646e024f832974a93f03b9df253fd4895d4f11a41b435840ad8f7003ec85a0d8087dec15f2e096dbfb4b01ebe4d365521e48fd0c5c0 SHA512 1defbbc1fb5029bf43872a4e1c49995b61e0f106b1fcc4c99159bf4788226981b9ba8a25a2296d3a9312dbfa7e27b469ca27c0867afb218990d45f68705dbfbe -EBUILD wine-gecko-2.47.2.ebuild 1275 BLAKE2B cc9fb505b9e019ca70e085d2f7ec979e3e5e606f983e6f5a0c622a2f4849175a2be6c787bb948ef49168f1e80f4a17765b4411732e7e11db7c81ede5b3511add SHA512 b1732ad8f3a028f035280592ac8271b1c64b6d052de6ed00073ec0aea97f56c0482e72b3f84f4dc364338e5619be40c39c01dc361f0f98c1ee635aca99fdb455 EBUILD wine-gecko-2.47.3.ebuild 1275 BLAKE2B cc9fb505b9e019ca70e085d2f7ec979e3e5e606f983e6f5a0c622a2f4849175a2be6c787bb948ef49168f1e80f4a17765b4411732e7e11db7c81ede5b3511add SHA512 b1732ad8f3a028f035280592ac8271b1c64b6d052de6ed00073ec0aea97f56c0482e72b3f84f4dc364338e5619be40c39c01dc361f0f98c1ee635aca99fdb455 EBUILD wine-gecko-2.47.4.ebuild 1275 BLAKE2B cc9fb505b9e019ca70e085d2f7ec979e3e5e606f983e6f5a0c622a2f4849175a2be6c787bb948ef49168f1e80f4a17765b4411732e7e11db7c81ede5b3511add SHA512 b1732ad8f3a028f035280592ac8271b1c64b6d052de6ed00073ec0aea97f56c0482e72b3f84f4dc364338e5619be40c39c01dc361f0f98c1ee635aca99fdb455 MISC metadata.xml 360 BLAKE2B 0ba4f28c9fb2b313f332b56122c9293d60094c1d7c8bc76928818003bc7e3e07385b370759a676ecd5714dc74bf1bba66680c9ceb4655bc4d10767e9483d947e SHA512 feb28080c619be3fa965d7ebdcdb01587ba9dac001737a485d5746b97951638aff49493e9b5ae22ddc29b37a1b09a9f1b1703b979d3531d8e10ea331d0e12085 diff --git a/app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild b/app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild deleted file mode 100644 index 11113939eae9..000000000000 --- a/app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Mozilla Gecko based version of Internet Explorer for Wine" -HOMEPAGE=" - https://gitlab.winehq.org/wine/wine/-/wikis/Gecko/ - https://gitlab.winehq.org/wine/wine-gecko/ -" -SRC_URI=" - shared? ( - abi_x86_32? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.tar.xz ) - abi_x86_64? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86_64.tar.xz ) - ) - !shared? ( - abi_x86_32? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.msi ) - abi_x86_64? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86_64.msi ) - ) -" -S=${WORKDIR} - -LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0" -SLOT="${PV}" -# keep straight-to-stable, builds nothing and the stabilization process -# is wasteful and annoying for users using ~testing wine in stable -# (wine also pins to specific versions, so stable won't use latest) -KEYWORDS="amd64 x86" -IUSE="+abi_x86_32 abi_x86_64 +shared" -REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )" - -src_install() { - insinto /usr/share/wine/gecko - - if use shared; then - use abi_x86_32 && doins -r ${P}-x86 - use abi_x86_64 && doins -r ${P}-x86_64 - else - use abi_x86_32 && doins "${DISTDIR}"/${P}-x86.msi - use abi_x86_64 && doins "${DISTDIR}"/${P}-x86_64.msi - fi -} diff --git a/app-emulation/wine-mono/Manifest b/app-emulation/wine-mono/Manifest index 446a769fc719..8276127f7f94 100644 --- a/app-emulation/wine-mono/Manifest +++ b/app-emulation/wine-mono/Manifest @@ -1,25 +1,16 @@ -DIST wine-mono-7.0.0-x86.msi 86433280 BLAKE2B 9d164bf10f9c790a1f518624321a77965800742c84677a6372cd57b1f51bdd16a2d61ee85f868e84be9b07d4c3f5a7afa770e98637f698c2337c42d42890cf58 SHA512 d7af2a68c3b48cab93ddd489f674ab9064d69d5ca0b6c91e58713dd0408af9fb1ff82ef8847d91645d96df40cd5526c6735d621064a3598166ab5f51d1e0d076 -DIST wine-mono-7.0.0-x86.tar.xz 45085800 BLAKE2B 504c57acce486c19a54bf33cdb4b9444c07a58a7f56ced0c93178886a91fa5d94a61f6e26aa885f3e3a2cceb2ff792f01006a4b16fa5bb88c3d25ddff02fefd7 SHA512 a3977563c5eb6418eaeda25e5b39bd2ef1faf305d514979211e049280c4577718ca48c8566e527b97a58fc465b310dd600093a616102573e12e8985794d828a6 DIST wine-mono-7.4.0-x86.msi 87334912 BLAKE2B c0b778f9db59d1a2917631f1d6ca1a1798972a6a42e27975da78f3a35b77018a99228d7d95e5640c57618533a6b01bf2252859e3e978e2aa8dbdc8cd62afcc28 SHA512 cf35513b368324487c387d4339e5b05a90c4825b25ea603140524b79e69786ccc20dfb898213a9548c0313c0b0e4b160acb88364e4b280dd6712d185d9e5ae57 DIST wine-mono-7.4.0-x86.tar.xz 45404344 BLAKE2B 3a74106b9b3f21a88c2435f7988d66a54e08beea931a0ce0df6431c21add4ee2685bf9c9cb2404ee1a685736d61b1aee3cdd507130e5c5dddba7e506a2ff18bb SHA512 108cb5d969e84deeda3d2b11dba7cd73853fc3b088ecf2bcdb9bc5c5bbaaff03e72cd4f485d1935eda43cdd95b927886441be1d2204edeaee1ff1fea75735d22 DIST wine-mono-8.1.0-x86.msi 84905984 BLAKE2B 948b014fc6fba94bc97642b8aae266b8179b119ea3d8a0fdf47daee33eac65b8cc5dd1bc483ae4c66bdd1bdc10f4b73258bb6c83bca0911a30e86e358faafd20 SHA512 5c788dfa0c9b664242f3ce0ab24f3f9256dabf1e9fadc516140f267c763da1865b4536c707660acaf66e4a37d93198f5499971b4261e63d91252f6a7fc3eae4e DIST wine-mono-8.1.0-x86.tar.xz 40854944 BLAKE2B 0e0dd83b92016da328547173d25dc396a895a7a161cd54796c9bda34ae958856f1bee342c1bb5fcffcf695b35adf66b2bf83cfa61e01790bf4b0f2d198f84feb SHA512 ba87105a6527b9c392e9ad406e92fd90164e0abb3a348a1e343e63eff0ee8632399badb98f7fbc3581ce697ba09d98aafbf5033bf52fb14b7c7c280c64f25a84 DIST wine-mono-9.1.0-x86.msi 84623872 BLAKE2B 63e86a4f99a5300782017f0b1a2168ad49516e2b2a7e825d7f59b8e842874c7f84752058908e8f57ad1e650a68675c5ff81ad8ba973962ea075db590be0fa51b SHA512 e51744eb0b07a58516fe3f5115fe45b4924e285fe4688649d04dec522203af6b3aa066e5db9b37cbbfe6ce4b5d8e871e9881842227cbb20c0613b911b5bfc383 DIST wine-mono-9.1.0-x86.tar.xz 43820028 BLAKE2B 6249e661239b71ca2607cf5fb3285bbef3e4c056c87e15352e40d2875028dbaa7f1c1a8b4d908f74de8447b4166c61c708314dc6422e9f69a6eea5f588e7c73b SHA512 cede2b910e95fc43e658e6d4d8086ec5324407a32fff4852341178e1e56df240356c02f270e3be174f3ab82aa076e50d70be4da8e8c5f77e877fce8fe3217374 -DIST wine-mono-9.2.0-x86.msi 84566016 BLAKE2B 08c106998536622cdda10065304416a338ba9fe0e5680949c66b2766116bfc93c41b0169e0beb614f741edccf5fae576de78d2b1c6bc9f2dfa89036bfd3b23ed SHA512 3256358a49321173c17e8b907e0d8affed4fb735ca3da91749377501de1a924711f37971a9c8e05e687140d3d65399903e69bb5981d271f2b698a910d91e8b54 -DIST wine-mono-9.2.0-x86.tar.xz 43901320 BLAKE2B 125d81049bca105e8967338659dd21c174388dfc8be9802a5984b8fc11b4da22b82512590481d45ebd7554f89c5e9cad9c59b4406ba04436ada5b52ea2aea0cc SHA512 7d0039b7c77ed968c0e00eacd3bf716d3ec9dffc86f6cc2c2f9439320b889ae2e05cc4f9aade5e1a0122a86ee4b86cea4224e666aba0d0bb3f2fa6fb0d18f8ae -DIST wine-mono-9.3.0-x86.msi 84572160 BLAKE2B b6e13d5245b17c0f2857771c8bcfc7ca248d13f300df69970b5994d3287e3e4db0c49601b0cd29b7f6764f2abda5b54a3f0bf1ad1d2beb28033adba9276c7b5c SHA512 d5bb8ed9cc963292b37edb2ac3fb5945346b9632a080d5413ebde3470ff1702c9fdd0d4a25c0cd228e56abe11f6e1cf3d949a2c26099bf2fdef41aaf65f686ef -DIST wine-mono-9.3.0-x86.tar.xz 43906032 BLAKE2B 94dc27d305fb062f845064c07dcd00d2daaf9647ae5353e18267314b6534018bf22b1411981ef8e3cb9ef8fa0d91da662211376a309a243100d691386b1840e4 SHA512 094113aad504fa46d9f3b0ca6f7926c14fbda3edbbbc5dab307f19114fec0173a451a604b2083f399e61d5c6704971a0d602930cc9ba11502c863ec67318c480 DIST wine-mono-9.3.1-x86.msi 84572160 BLAKE2B 82f0aaec4cb816b28708c8bd8f347a128451046f33958b63d8cf6b6009d2f426f03d419017de4303f722ac0232bb2c9a1aba957411114ffc0b392db930888f69 SHA512 6653c6dd5484f3687be7ce13ca74e95abb5b0fa3c6901d57a97f4a218986e68154846ef19bf8ef5667f375b61600bb37e2e339b62a638a5eacd6f15a0022fc8a DIST wine-mono-9.3.1-x86.tar.xz 43896120 BLAKE2B 5f4c2a07355a3d394086467f1b0c45698cd83731a4137b59975abdeda2d564f44922a67b1bec111e4209c4fe74247486076e95dffc84d88b5b7a02774efd070b SHA512 cc4faff237b46d870e1afeb99be1e77f8f0d599c8567dfc365256558b4ec533efee3d5324bfe1bd5bc7f318112899dd800e3e2ef9cbc6d50063f47fc7039c879 DIST wine-mono-9.4.0-x86.msi 84639232 BLAKE2B fc53dadf9c73c489f0333ab25aa2ce85df7f1dcf82fd475ea0265772441f1b29804bd378e555f71eafc851393c833c5aef97f10103257ccb6c6951c46fcb5bd9 SHA512 c8907d1f3b04bfc86a4d230148558964984f4ce33a732802ccbbc89b3593bce1c32b2fae105db0efa7e1e7ee97e955e51b682f06efe595408ba4031b55b8fe0f DIST wine-mono-9.4.0-x86.tar.xz 43941584 BLAKE2B a4d88b274e06a8f8f02e2f74e55fd0df5e4836f45295af711f2f3d3f2bf18432bc7c41c9c2392a0e6b584b67358740acd7f3572cafd32afd08060e8c9e060c0a SHA512 2ea3fa22f64019ff71b4c368e3b83608c2b0cf4ffb63fc349b29e41ddc17d015bf431d41788ce3139ddc19336690b9460c983d18eea514351f069671012895f2 -EBUILD wine-mono-7.0.0.ebuild 890 BLAKE2B ad2e5524bdf84120a8025117258a8d62d3c730af80a6c9153a69f5f0214502ae18a2d231e8dd6b3e20ffd2204f8d4fa2285b62a2534edc2df545ce293cc7606f SHA512 30fe3161b3e5d68d4caf76d0ac7202757553d660346bb0e26cb53bf85b25b697b00cfb1f20efb495bddf4b73f1e8f3af3f920ccd94005474740aae948ab7bd92 EBUILD wine-mono-7.4.0.ebuild 890 BLAKE2B ad2e5524bdf84120a8025117258a8d62d3c730af80a6c9153a69f5f0214502ae18a2d231e8dd6b3e20ffd2204f8d4fa2285b62a2534edc2df545ce293cc7606f SHA512 30fe3161b3e5d68d4caf76d0ac7202757553d660346bb0e26cb53bf85b25b697b00cfb1f20efb495bddf4b73f1e8f3af3f920ccd94005474740aae948ab7bd92 EBUILD wine-mono-8.1.0.ebuild 890 BLAKE2B ad2e5524bdf84120a8025117258a8d62d3c730af80a6c9153a69f5f0214502ae18a2d231e8dd6b3e20ffd2204f8d4fa2285b62a2534edc2df545ce293cc7606f SHA512 30fe3161b3e5d68d4caf76d0ac7202757553d660346bb0e26cb53bf85b25b697b00cfb1f20efb495bddf4b73f1e8f3af3f920ccd94005474740aae948ab7bd92 EBUILD wine-mono-9.1.0.ebuild 890 BLAKE2B ad2e5524bdf84120a8025117258a8d62d3c730af80a6c9153a69f5f0214502ae18a2d231e8dd6b3e20ffd2204f8d4fa2285b62a2534edc2df545ce293cc7606f SHA512 30fe3161b3e5d68d4caf76d0ac7202757553d660346bb0e26cb53bf85b25b697b00cfb1f20efb495bddf4b73f1e8f3af3f920ccd94005474740aae948ab7bd92 -EBUILD wine-mono-9.2.0.ebuild 890 BLAKE2B ad2e5524bdf84120a8025117258a8d62d3c730af80a6c9153a69f5f0214502ae18a2d231e8dd6b3e20ffd2204f8d4fa2285b62a2534edc2df545ce293cc7606f SHA512 30fe3161b3e5d68d4caf76d0ac7202757553d660346bb0e26cb53bf85b25b697b00cfb1f20efb495bddf4b73f1e8f3af3f920ccd94005474740aae948ab7bd92 -EBUILD wine-mono-9.3.0.ebuild 890 BLAKE2B ad2e5524bdf84120a8025117258a8d62d3c730af80a6c9153a69f5f0214502ae18a2d231e8dd6b3e20ffd2204f8d4fa2285b62a2534edc2df545ce293cc7606f SHA512 30fe3161b3e5d68d4caf76d0ac7202757553d660346bb0e26cb53bf85b25b697b00cfb1f20efb495bddf4b73f1e8f3af3f920ccd94005474740aae948ab7bd92 EBUILD wine-mono-9.3.1.ebuild 1012 BLAKE2B fae25c2cfe8499ebfc2743604fa782e022ee2eaa8e9f245c9f89915213841051a5460b0831febfd49b12a175db5dc26fe91544fffb31af403b3e0ef800284cd7 SHA512 0e0dde3c85f78e7b06c48ae2bc9531e4d278c31e0337762d9c5e13a6b8fe27547dc598f16bcfa5773e5e224869b2744148bc4259412cea4e5b68e74f92d492ff EBUILD wine-mono-9.4.0.ebuild 890 BLAKE2B ad2e5524bdf84120a8025117258a8d62d3c730af80a6c9153a69f5f0214502ae18a2d231e8dd6b3e20ffd2204f8d4fa2285b62a2534edc2df545ce293cc7606f SHA512 30fe3161b3e5d68d4caf76d0ac7202757553d660346bb0e26cb53bf85b25b697b00cfb1f20efb495bddf4b73f1e8f3af3f920ccd94005474740aae948ab7bd92 MISC metadata.xml 869 BLAKE2B fccb940bff530c2e7c311060ef585efc8f62c00480435fe62cdae5eaa5dd58fd6d41354f6656c166700114e356f7bd60c791a77e86a2cce2bf4421bb778d28dc SHA512 fba10cccd3d072a96332a065f3b08cca213b18820e14a0e0a8e135ad2a986b158766bed07bae7c468f445642145a25350f2cdee58d8a4ccb916fc6a0ea7b4a62 diff --git a/app-emulation/wine-mono/wine-mono-7.0.0.ebuild b/app-emulation/wine-mono/wine-mono-7.0.0.ebuild deleted file mode 100644 index a422ad716d3b..000000000000 --- a/app-emulation/wine-mono/wine-mono-7.0.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Replacement for the .NET runtime and class libraries in Wine" -HOMEPAGE=" - https://gitlab.winehq.org/wine/wine/-/wikis/Wine-Mono/ - https://gitlab.winehq.org/mono/wine-mono/ -" -SRC_URI=" - shared? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.tar.xz ) - !shared? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.msi ) -" -S=${WORKDIR} - -LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1" -SLOT="${PV}" -# keep straight-to-stable, builds nothing and the stabilization process -# is wasteful and annoying for users using ~testing wine in stable -# (wine also pins to specific versions, so stable won't use latest) -KEYWORDS="amd64 x86" -IUSE="+shared" - -src_install() { - insinto /usr/share/wine/mono - - if use shared; then - doins -r ${P} - else - doins "${DISTDIR}"/${P}-x86.msi - fi -} diff --git a/app-emulation/wine-mono/wine-mono-9.2.0.ebuild b/app-emulation/wine-mono/wine-mono-9.2.0.ebuild deleted file mode 100644 index a422ad716d3b..000000000000 --- a/app-emulation/wine-mono/wine-mono-9.2.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Replacement for the .NET runtime and class libraries in Wine" -HOMEPAGE=" - https://gitlab.winehq.org/wine/wine/-/wikis/Wine-Mono/ - https://gitlab.winehq.org/mono/wine-mono/ -" -SRC_URI=" - shared? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.tar.xz ) - !shared? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.msi ) -" -S=${WORKDIR} - -LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1" -SLOT="${PV}" -# keep straight-to-stable, builds nothing and the stabilization process -# is wasteful and annoying for users using ~testing wine in stable -# (wine also pins to specific versions, so stable won't use latest) -KEYWORDS="amd64 x86" -IUSE="+shared" - -src_install() { - insinto /usr/share/wine/mono - - if use shared; then - doins -r ${P} - else - doins "${DISTDIR}"/${P}-x86.msi - fi -} diff --git a/app-emulation/wine-mono/wine-mono-9.3.0.ebuild b/app-emulation/wine-mono/wine-mono-9.3.0.ebuild deleted file mode 100644 index a422ad716d3b..000000000000 --- a/app-emulation/wine-mono/wine-mono-9.3.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Replacement for the .NET runtime and class libraries in Wine" -HOMEPAGE=" - https://gitlab.winehq.org/wine/wine/-/wikis/Wine-Mono/ - https://gitlab.winehq.org/mono/wine-mono/ -" -SRC_URI=" - shared? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.tar.xz ) - !shared? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.msi ) -" -S=${WORKDIR} - -LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1" -SLOT="${PV}" -# keep straight-to-stable, builds nothing and the stabilization process -# is wasteful and annoying for users using ~testing wine in stable -# (wine also pins to specific versions, so stable won't use latest) -KEYWORDS="amd64 x86" -IUSE="+shared" - -src_install() { - insinto /usr/share/wine/mono - - if use shared; then - doins -r ${P} - else - doins "${DISTDIR}"/${P}-x86.msi - fi -} diff --git a/app-emulation/wine-proton/Manifest b/app-emulation/wine-proton/Manifest index 3edb02bce97d..b6597b2551d2 100644 --- a/app-emulation/wine-proton/Manifest +++ b/app-emulation/wine-proton/Manifest @@ -1,21 +1,16 @@ AUX README.gentoo 2435 BLAKE2B 2c41ce67c8f9139cf0a312c4477090077084550b79aa35ab4909de95046a2a0bbf6d05e549f59dfeb11253f1099878cbbd6fb141e3551c6b0ac503bef846d99b SHA512 0a5b2ac06c3b8cf1ef302d59193624bda224554476e1209aae485cbe913a0ffae6d553633983efaf89ce1296d52ec4dc2ab544ede96c2953e9f6ca602d5b787b AUX wine-proton-7.0.4-musl.patch 505 BLAKE2B 5c6d46c505e38c19e4c92e05243244739e6a2b84ebc548989167b65fe5ede439c628b510bce57ff8cd7ca765114c13dbb098116ba201ceba44069bf38daf5a64 SHA512 5e687119aa461e3440d3c7bbb2318db04ffbe414329931877b59a3f9752ee36e492bb25dda9b26c2f741664665487a34575423b24718e3f1b65f2d850c3681aa AUX wine-proton-7.0.4-noexecstack.patch 223 BLAKE2B dff1867e2977bd14fcfab9dfa2c2f1d3288f7edca75ddd7c9f02bfd06e9f63fac37bd59ea8aa891e13ab77bac35b369825d5490a9175ed9a7736e523b61d8944 SHA512 4ba3677042b693e513fc7a133c76a509f63d0ca20633d1e8d448bca9534c0d1a0fc58e77fa9b28fd8d936393605e97ee6e3bb5fac00872d6ac5808b7712586e3 -AUX wine-proton-7.0.4-restore-menubuilder.patch 572 BLAKE2B 7ace97fb82498d8f19297cab205d8b9ca07c5293172a0b017b5d887ec1f5daeb3ed64eb0a322904e528a72f4a225813c27b544015587d71fce97c41b6b1463a2 SHA512 1384f06d4264e22d332eb12fabd7408b8e250e39c195460f876460fe40d35d617c73100815c395f481e3af66676ccaa1a14592c05f1e5b092bfafe2f87112106 -AUX wine-proton-7.0.4-unwind.patch 1694 BLAKE2B 954cb0a395c3b45afc7a3f39f33d34cf041b9cf5a6c77d0a217d296c4c8d1f6503322c4f77188c4729b98318913b9bc86d37b7573713643590550297a0ae372a SHA512 f958e811a4754614bc9e7223f727e2c581c18607dccf14c6d7014012ff29107bd850540a40ff7a62e7bae6b87ae1ac28fd104fbbaf9ce954bf3acb38ddbeb7df -AUX wine-proton-7.0.6-mingw64-11.0.0.patch 849 BLAKE2B 26833ef532e7c5b8b0ae1442485c6c44f55a550c571942be2a894aada62ce87398973dfa5619f5a8d498b51479dda84eeae72803370539a7d28575a74310e173 SHA512 189bb20e8c399374567db308c2d3cf43a2b5e2d76b43970edaa3975c0c4ddb7fa245b9d05ed0f7a3452c8bf5264e743acff5a4830a94abd1c7df13664afc21e7 -AUX wine-proton-7.0.6-vulkan-libm.patch 429 BLAKE2B 437c37130a0bc64e135fe15f876d19f16afdb9586a12c3dd9010b8280333e880dd4125be32e42bd90a32349634daf9bee29d537280d83ebf6580f28f6b53e57b SHA512 12e331b39543b9fba089925ceee936e534612e625570cfe19653516cf95ebf9a2d99fc05373eafecd4ae4bbfc485c4aed9fba682f76219164117fd9f2879012f AUX wine-proton-8.0.1c-unwind.patch 1488 BLAKE2B 1a6d69484fb36f94f32d74679e809cfd7666363bede5dddedd2449e07251823b1ce86a717e06d342eec782aff501f27bc23433511c163da0b2a50c411df7ac53 SHA512 82ff0510fcab35471aa0db8f32f48cd62dbf78b3f5f36e3d191b86be55cb476df1ee689e5cd53c95d4f02199b5900eb0c8a45959693739a6c35e4c8b3cfa243f AUX wine-proton-8.0.4-restore-menubuilder.patch 382 BLAKE2B 04df3b2e495f49b4d66bc70a1198a3ab6c4dbb95c3ff145069b7086cf87de7233a1f5d6e56c861c0ff6f7e4b0869bb7ddf29a35ca9f32e47c05bf71fd0823ef3 SHA512 08bf5accb1ccf38519d5054c2d297da87aef0df5b5b5336d96e4b98a3af202ae8220c1e8cdf282c24b2706628e14a1afb7ff5f21f4a7a9f8e3f4f301f9e44c57 AUX wine-proton-8.0.5c-vulkan-libm.patch 447 BLAKE2B 026b982714ce21ce6492d5e3b9932f2af4b8f1342fc47de045d86e596996dab11a3b73bf5090714dbc5c405345b8d1a08afc6a337ddb91e744ca83c980ad390f SHA512 46655d7c65975a11a585acf9112fcc56242b2a65917aa8dc9ad9515b2f5348ad3e8a9b72d53b38b1d51ae9b661f175f54dda8cd3f04a56de1d0a18a2c4d6136c AUX wine-proton-9.0-rpath.patch 356 BLAKE2B f988fefb9590d1c8735f480349172b7c7634256ef07bfe19bc5a7e04363d1832cc999d7c30b78dc5af2f4a1c9bfac1f4fa5458461b865864dc3bbdff4e9f71fa SHA512 f0de44022c856ed9b058e6c64146e464e375114d56bcc369a7e72df847a4de0ad31cbb06042df3f6836b681cd342b8a228cf514a51ed9796542a4d9ea42a03e6 -DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B f140fcfdd1a47904c34a49d0795fa3326d7cf0d3fac8d6c2ef2a4926181a46223f43a2d1ca96c543e800c8c46b2a3cc51ae306a029d68a42608876e869e177d5 SHA512 793bbe2b23042301a1b518717d78cfff01eaffa0388883d010659a45779b9136d33cfac63f0c3fbb1e458953a954b423eb70ac4fa87633352267db890ceb2fef +AUX wine-proton-9.0.4-binutils2.44.patch 4104 BLAKE2B 4a0884969ade4ea83890672392dd29eb641f6c82ecdd8a6dd47853cc59e2cea73d42a95ce2197fc2833170aed7af508b19136f11859501dec22909297a691905 SHA512 f3bec4565acb4446783e44ac9823978ed1f8881814f7cae7ad5c5bd8d70cf5f13e68f0abefcf1038426b9b055fec1dabf3a6bbfc21bae1420654fdabe7bd206f DIST proton-wine-8.0-5c.tar.gz 48710071 BLAKE2B 99627baea6fb3d51231aa1e75a2734c3c1baba88326baf15b3d421d57a00472d25ba51c2140b51152c8aeae7dd240d3d77bb0d8835aa7eb3b745a51be120f8bb SHA512 0cf98d4e67866e55cc8cd5ea8da0d76aee8e37b130b3cbca604083c913e98ddf9038ecd6f9761d2e11443e282b372977400e251456c6d40e1365210c7578234d DIST proton-wine-9.0-2.tar.gz 49125171 BLAKE2B ac1e4a63f94689bc4fcc6ab4e2d12cfc214f54181515434ab950d8975d131a5f6333b1e6cb9b67eda61cf3e652e57e27e60ba3cff6a6ac403b07178f382f7e25 SHA512 82efee3100da80f650229d1abf3df4896ab71af4a79c6e5cf03aa646c56f435daf07c6f084a3264067cf90ce509102e3d7ee6d4bf7d0650baf645b5ece08cc7c DIST proton-wine-9.0-4.tar.gz 49339922 BLAKE2B 914ca093ac288c26400e4eeb2ea33943fc8ad89052aa7c97b5c44286dc175745720455d65163baa90b0d0271eb8028549315a3e8095b91947db2bd96c6fc4852 SHA512 e061f0a55b25493f67ca3add8c7e41020bb57cb15e8fb4fdf3c23f0cab2d00b703c90fbcf0dc1ca8b67e1726a76cee910e9ea6f567c88bc6c520dd6c9dbb75e9 -EBUILD wine-proton-7.0.6.ebuild 13138 BLAKE2B d309ce8c55dc63f99f54205c9e7601decb0400cd73aa14fd7a10c2b3a45162a8abbb0b32ca8ba21d18637ffb75fe2ab88422c3d7a899679fcc459f1807173901 SHA512 90fcde31389524651e300680554ed27451eba0fb099599ea1a13ea10e24f9c147c8c3555c688262240db8ebc13c061541b841e8dd6d1966ea2d54a70141c8a93 -EBUILD wine-proton-8.0.5c.ebuild 14090 BLAKE2B bff5e2b5f272af1aeaa1ca0de729b71e2629a8006c0700e633ff189b29360a42c51ccdf2e34195a198787c1a30be1e2c98fd92204e0a4ade1f1fda643db0ba26 SHA512 519b265f61adeb062cb886ec1fe109371b40f9fefcf06d9143639141054f2037e1ec25adc832b35fba5f2de234aa1d470edf2500bf0656880be7d32f137d060a -EBUILD wine-proton-9.0.2.ebuild 14990 BLAKE2B 88c90b9f79fcb843ddcbc976c5e731a778b7c422cefb488fd2a34ff3e5f00eb225d06ee88dc75803a8827da17eff72e60feecba5029974baa393e76ebecfc930 SHA512 cfa95408eedd6a3c121a4b469f3675dbf6aff717c7a405f1068ab02ce6411434dcde561a29fd63d92a32322f38989077ddd98c27ccc05c1f1c453a1a54a367c1 -EBUILD wine-proton-9.0.4.ebuild 14991 BLAKE2B 7b8f8fdfe9784b6d436d36a9258bec4c793ad8f80fa02ec69d50b11fbf3e2bb1b9a522d542517dbba31bc46b96a17ba7ce8a55fd916e6a13e8c2f180152ccc0e SHA512 960a21425ddc327854f3e608569104b2f10226c8309909c8d77fdd66be770d0fd7514de2d55cc6ba1cc7571eb68b73cedc8cb1c7329b542b5093ebfca7d03946 -EBUILD wine-proton-9999.ebuild 15118 BLAKE2B cbd7e649fe3887d2f8ef0c08f0c71c8d5ed7e34b41e24468ffe96658393f2839e2ba73cdc18d066a068756e31c7d47ce674137c38de2f428e77c7f523878775d SHA512 b4bd206699b1d4a9129e0d5a2b39bf506677868a670b660c038df3de9d2b0593029f7ba0faeae793cd09933f83a0b87cc88ae6df7ee6826f19a6bffea3119545 -MISC metadata.xml 1652 BLAKE2B 3033e8c5d53353750c4b20d39e2d70e944ebbae42f7c01cf83539500dc73051b46ba65e43ea2a2d965778bd0fe079b94ccaba85e49189b63406ac650237c5e65 SHA512 9293efe946d3d129006a0cb5c05a8e99073d189b3c71fe6db730bf3a5293117cfa6a87481bc3de7c7b4df18b033d752ff8fd84cb1e32e9d9715f15c73eba5b00 +EBUILD wine-proton-8.0.5c.ebuild 14136 BLAKE2B 4358b1230118ceba29bd8a8176e9b90c474588a9f5a091fe72dd98b894b4ec4cfc18050d42a376f6f4a7cfb87c071a70cc081fe1c292fb32754e1cdf058e3875 SHA512 5b555cbf725fad0c1e97992187e5236ce8aa5bf47350c92494f4fa53e47449273599f1f10a16bef1b229e50200892e3cb869a54d4488e16aba76db02df121046 +EBUILD wine-proton-9.0.2.ebuild 15036 BLAKE2B 7bf4c5ff1fc60f4c1ea7b468c62571be4ccccdedfb7caaba25d7a0e9ca4f4714ed9ad96cb6a91708b0f6e0bd2063a3bcc9307d41845412a7b040e018fe16a2e8 SHA512 5fa1ff85991acf5bced2cf7da07fd28379873f4d2a62dd16451d0c5be5b8782201a7092683b65ea443b8c665e1247d0ad8d678898cb27b7a037b56f8751f300d +EBUILD wine-proton-9.0.4.ebuild 15037 BLAKE2B 2e7c353b3b1e8bfcb92fb7968063120083c10da52b96d1c3f4adae8dd912e9dbd27a900d20c94effc4b527188f74ba9062a6c975c0b4aae55db9e3ea10cb2912 SHA512 0acc616e47523e0be9644825ebfd12e5f08e80b58a41a1b00f0c9af00d7d88292989248f209e7a2f19d9262e90b56eb486af40f020adb802191eac2e2b21d03e +EBUILD wine-proton-9999.ebuild 15164 BLAKE2B 2d4aff78c021877212943032aca9e05599827a04cd736439a8bb3c494c7e53984342eb8f780b8201f0516f5b9e1cbe6b428a0c016f936d9e2887aec2fc14f275 SHA512 9cf1679a09c99b45ca16b7079618a599d071e188174275c808ab89c95d7e59ea66aa5c34799da52093b52d995070922a466a28ed2b744010dc5682f5cf9def3c +MISC metadata.xml 1561 BLAKE2B c56918ab8f385550a8afd059d6df3e4c8cec39a0820b327a88b72a8159f1852cdc33c6b5e24cb8bdcef628707b6bc80950044a5998c7ac4c4017b017eef80c29 SHA512 1f5b24e0151d29c377082acab47d58e6b324602b01f688250cd32789a01c5269eb8dc65fc8ba8e0830e54c2c2d07ee5f14876754fe906c6480cdd962c262bb3b diff --git a/app-emulation/wine-proton/files/wine-proton-7.0.4-restore-menubuilder.patch b/app-emulation/wine-proton/files/wine-proton-7.0.4-restore-menubuilder.patch deleted file mode 100644 index 760340791060..000000000000 --- a/app-emulation/wine-proton/files/wine-proton-7.0.4-restore-menubuilder.patch +++ /dev/null @@ -1,14 +0,0 @@ -Without Steam there is no launcher by default, users with more custom -setups may not need this but others will want access to desktop entries. ---- a/configure.ac -+++ b/configure.ac -@@ -3683,2 +3683,3 @@ - WINE_CONFIG_MAKEFILE(programs/winefile) -+WINE_CONFIG_MAKEFILE(programs/winemenubuilder) - WINE_CONFIG_MAKEFILE(programs/winemine) ---- a/loader/wine.inf.in -+++ b/loader/wine.inf.in -@@ -5630,2 +5630,3 @@ - [Services] -+HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" - HKLM,"System\CurrentControlSet\Services\Eventlog\Application",,16 diff --git a/app-emulation/wine-proton/files/wine-proton-7.0.4-unwind.patch b/app-emulation/wine-proton/files/wine-proton-7.0.4-unwind.patch deleted file mode 100644 index 372def52ba0c..000000000000 --- a/app-emulation/wine-proton/files/wine-proton-7.0.4-unwind.patch +++ /dev/null @@ -1,40 +0,0 @@ -Fix build with llvm-libunwind, and also fix for non-llvm libunwind -when using clang+bfd given clang doesn't have _Unwind_Find_FDE in -its rtlib and expects it from llvm-libunwind. - -The _CONFIG_H_ check is for <llvm-libunwind-15 (adds _VERSION). ---- a/dlls/ntdll/unix/signal_x86_64.c -+++ b/dlls/ntdll/unix/signal_x86_64.c -@@ -646,7 +646,9 @@ - unsigned int cie_offset; - }; - -+#if defined(_LIBUNWIND_VERSION) || defined(____LIBUNWIND_CONFIG_H__) || !defined(__clang__) - extern const struct dwarf_fde *_Unwind_Find_FDE (void *, struct dwarf_eh_bases *); -+#endif - - static unsigned char dwarf_get_u1( const unsigned char **p ) - { -@@ -1368,7 +1370,7 @@ - unw_proc_info_t info; - int rc; - --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(_LIBUNWIND_VERSION) || defined(____LIBUNWIND_CONFIG_H__) - rc = unw_getcontext( &unw_context ); - if (rc == UNW_ESUCCESS) - rc = unw_init_local( &cursor, &unw_context ); -@@ -1491,11 +1493,13 @@ - NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEXT *context ) - { - struct dwarf_eh_bases bases; -+#if defined(_LIBUNWIND_VERSION) || defined(____LIBUNWIND_CONFIG_H__) || !defined(__clang__) - const struct dwarf_fde *fde = _Unwind_Find_FDE( (void *)(context->Rip - 1), &bases ); - - if (fde) - return dwarf_virtual_unwind( context->Rip, &dispatch->EstablisherFrame, context, fde, - &bases, &dispatch->LanguageHandler, &dispatch->HandlerData ); -+#endif - #ifdef HAVE_LIBUNWIND - return libunwind_virtual_unwind( context->Rip, &dispatch->EstablisherFrame, context, - &dispatch->LanguageHandler, &dispatch->HandlerData ); diff --git a/app-emulation/wine-proton/files/wine-proton-7.0.6-mingw64-11.0.0.patch b/app-emulation/wine-proton/files/wine-proton-7.0.6-mingw64-11.0.0.patch deleted file mode 100644 index 54ecc49c7235..000000000000 --- a/app-emulation/wine-proton/files/wine-proton-7.0.6-mingw64-11.0.0.patch +++ /dev/null @@ -1,20 +0,0 @@ -Hack: this does not actually need stdarg.h, but including it ensures -that _mingw.h will be loaded before the rest of Wine's winnt.h avoiding -issues with mingw64-runtime-11.0.0, e.g.: - - _mingw.h:602:60: error: redefinition of ‘__fastfail’ - make[1]: *** [Makefile:5900: dlls/advapi32/crypt_des.cross.o] Error 1 - -(other crypt_*.c happen to include stdarg.h first and don't fail, but this -one does not, same for several other files in dlls/) - -Not an issue with non-proton Wine 7.0 as Wine did not define __fastfail -until ~wine-7.10. Wine 8 does define it but does not seem to be a problem -there (perhaps due to different header layout). A more "right" fix would -be welcome, but given Proton-7 seems EOL it is not judged important. ---- a/include/winnt.h -+++ b/include/winnt.h -@@ -32,2 +32,3 @@ - #include <string.h> -+#include <stdarg.h> - #endif diff --git a/app-emulation/wine-proton/files/wine-proton-7.0.6-vulkan-libm.patch b/app-emulation/wine-proton/files/wine-proton-7.0.6-vulkan-libm.patch deleted file mode 100644 index b81778fb957c..000000000000 --- a/app-emulation/wine-proton/files/wine-proton-7.0.6-vulkan-libm.patch +++ /dev/null @@ -1,12 +0,0 @@ -Valve's patches add use of "ceil" without using libm, it works -by accident with -O2 but fails with -Os. - -ld: dlls/winevulkan/vulkan.o: in function `fshack_vk_queue_present': -vulkan.c:(.text+0x12f46): undefined reference to `ceil' ---- a/dlls/winevulkan/Makefile.in -+++ b/dlls/winevulkan/Makefile.in -@@ -4,3 +4,3 @@ - IMPORTS = user32 gdi32 advapi32 setupapi win32u --EXTRALIBS = $(PTHREAD_LIBS) -+EXTRALIBS = -lm $(PTHREAD_LIBS) - diff --git a/app-emulation/wine-proton/files/wine-proton-9.0.4-binutils2.44.patch b/app-emulation/wine-proton/files/wine-proton-9.0.4-binutils2.44.patch new file mode 100644 index 000000000000..c0d4ef6f5287 --- /dev/null +++ b/app-emulation/wine-proton/files/wine-proton-9.0.4-binutils2.44.patch @@ -0,0 +1,105 @@ +Note that this is only an issue when using mingw (PE) binutils-2.44, +host (ELF) binutils-2.44 has no impact on this and, before this patch, +using 2.44 could only happen with off-by-default USE=crossdev-mingw. + +https://bugs.winehq.org/show_bug.cgi?id=57819 +https://sourceware.org/PR32675 +https://gitlab.winehq.org/wine/wine/-/merge_requests/7328 +--- a/dlls/ntdll/loader.c ++++ b/dlls/ntdll/loader.c +@@ -4047,5 +4047,5 @@ + NTSTATUS nts; + FARPROC fp; +- DWORD id; ++ INT_PTR id; + + TRACE( "(%p, %p, %p, %p, %p, 0x%08lx)\n", base, desc, dllhook, syshook, addr, flags ); +--- a/tools/winebuild/import.c ++++ b/tools/winebuild/import.c +@@ -1514,4 +1514,14 @@ + } + ++static void output_import_section( int index, int is_delay ) ++{ ++ if (!is_delay) ++ output( "\n\t.section .idata$%d\n", index ); ++ else if (index == 5) ++ output( "\n\t.section .data$didat%d\n", index ); ++ else ++ output( "\n\t.section .rdata$didat%d\n", index ); ++} ++ + /* create a Windows-style import library */ + static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struct strarray files ) +@@ -1633,18 +1643,18 @@ + output( "\t.long 0\n" ); /* TimeDateStamp */ + +- output( "\n\t.section .idata$5\n" ); ++ output_import_section( 5, is_delay ); + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* FirstThunk tail */ + output( ".L__wine_import_addrs:\n" ); + +- output( "\n\t.section .idata$4\n" ); ++ output_import_section( 4, is_delay ); + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* OriginalFirstThunk tail */ + output( ".L__wine_import_names:\n" ); + + /* required to avoid internal linker errors with some binutils versions */ +- output( "\n\t.section .idata$2\n" ); ++ output_import_section( 2, is_delay ); + } + else + { +- output( "\n\t.section .idata$2\n" ); ++ output_import_section( 2, is_delay ); + output( "%s\n", asm_globl( import_desc ) ); + output_rva( ".L__wine_import_names" ); /* OriginalFirstThunk */ +@@ -1654,8 +1664,8 @@ + output_rva( ".L__wine_import_addrs" ); /* FirstThunk */ + +- output( "\n\t.section .idata$4\n" ); ++ output_import_section( 4, is_delay ); + output( ".L__wine_import_names:\n" ); /* OriginalFirstThunk head */ + +- output( "\n\t.section .idata$5\n" ); ++ output_import_section( 5, is_delay ); + output( ".L__wine_import_addrs:\n" ); /* FirstThunk head */ + } +@@ -1668,9 +1678,9 @@ + new_output_as_file(); + +- output( "\n\t.section .idata$4\n" ); ++ output_import_section( 4, is_delay ); + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* OriginalFirstThunk tail */ +- output( "\n\t.section .idata$5\n" ); ++ output_import_section( 5, is_delay ); + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* FirstThunk tail */ +- output( "\n\t.section .idata$7\n" ); ++ output_import_section( 7, is_delay ); + output( "%s\n", asm_globl( import_name ) ); + output( "\t%s \"%s\"\n", get_asm_string_keyword(), spec->file_name ); +@@ -1763,8 +1773,8 @@ + } + +- output( "\n\t.section .idata$4\n" ); ++ output_import_section( 4, is_delay ); + output_thunk_rva( by_name ? -1 : odp->ordinal, ".L__wine_import_name" ); + +- output( "\n\t.section .idata$5\n" ); ++ output_import_section( 5, is_delay ); + output( "%s\n", asm_globl( imp_name ) ); + if (is_delay) +@@ -1775,5 +1785,5 @@ + if (by_name) + { +- output( "\n\t.section .idata$6\n" ); ++ output_import_section( 6, is_delay ); + output( ".L__wine_import_name:\n" ); + output( "\t.short %d\n", odp->hint ); +@@ -1782,5 +1792,5 @@ + + /* reference head object to always pull its sections */ +- output( "\n\t.section .idata$7\n" ); ++ output_import_section( 7, is_delay ); + output_rva( "%s", asm_name( import_desc ) ); + diff --git a/app-emulation/wine-proton/metadata.xml b/app-emulation/wine-proton/metadata.xml index 3eb642f0a513..4e53c42efe00 100644 --- a/app-emulation/wine-proton/metadata.xml +++ b/app-emulation/wine-proton/metadata.xml @@ -20,7 +20,6 @@ <flag name="osmesa">Enable off-screen rendering (OpenGL in bitmaps) support</flag> <flag name="perl">Install helpers that require perl (winedump/winemaker)</flag> <flag name="sdl">Enable gamepad support using <pkg>media-libs/libsdl2</pkg></flag> - <flag name="vkd3d">Enable DirectX 12 support using <pkg>app-emulation/vkd3d</pkg></flag> <flag name="wow64"> Enable running 32bit applications without 32bit ELF multilib by mapping to 64bit calls (experimental, diff --git a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild deleted file mode 100644 index c4630cc016e8..000000000000 --- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild +++ /dev/null @@ -1,390 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MULTILIB_COMPAT=( abi_x86_{32,64} ) -PYTHON_COMPAT=( python3_{10..13} ) -inherit autotools flag-o-matic multilib multilib-build prefix -inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper - -WINE_GECKO=2.47.3 -WINE_MONO=7.4.0 -WINE_PV=$(ver_rs 2 -) - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/ValveSoftware/wine.git" - EGIT_BRANCH="bleeding-edge" -else - SRC_URI="https://github.com/ValveSoftware/wine/archive/refs/tags/proton-wine-${WINE_PV}.tar.gz" - S="${WORKDIR}/${PN}-wine-${WINE_PV}" - KEYWORDS="-* amd64 ~x86" -fi - -DESCRIPTION="Valve Software's fork of Wine" -HOMEPAGE="https://github.com/ValveSoftware/wine/" - -LICENSE="LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff" -SLOT="${PV}" -IUSE=" - +abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags debug - +fontconfig +gecko +gstreamer llvm-libunwind +mono nls openal - osmesa perl pulseaudio +sdl selinux +ssl udev udisks +unwind usb - v4l +vkd3d +xcomposite xinerama -" - -# tests are non-trivial to run, can hang easily, don't play well with -# sandbox, and several need real opengl/vulkan or network access -RESTRICT="test" - -# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked -WINE_DLOPEN_DEPEND=" - dev-libs/libgcrypt:=[${MULTILIB_USEDEP}] - media-libs/freetype[${MULTILIB_USEDEP}] - media-libs/libglvnd[X,${MULTILIB_USEDEP}] - media-libs/vulkan-loader[X,${MULTILIB_USEDEP}] - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] - x11-libs/libXi[${MULTILIB_USEDEP}] - x11-libs/libXrandr[${MULTILIB_USEDEP}] - x11-libs/libXrender[${MULTILIB_USEDEP}] - x11-libs/libXxf86vm[${MULTILIB_USEDEP}] - fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] ) - osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] ) - sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] ) - ssl? ( - dev-libs/gmp:=[${MULTILIB_USEDEP}] - net-libs/gnutls:=[${MULTILIB_USEDEP}] - ) - udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) - v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) - xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) -" -WINE_COMMON_DEPEND=" - ${WINE_DLOPEN_DEPEND} - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) - gstreamer? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - media-libs/gst-plugins-base:1.0[opengl,${MULTILIB_USEDEP}] - media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] - ) - openal? ( media-libs/openal[${MULTILIB_USEDEP}] ) - pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] ) - udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) - unwind? ( - llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] ) - !llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] ) - ) - usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] ) - vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] ) -" -RDEPEND=" - ${WINE_COMMON_DEPEND} - app-emulation/wine-desktop-common - gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] ) - gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] ) - mono? ( app-emulation/wine-mono:${WINE_MONO} ) - perl? ( - dev-lang/perl - dev-perl/XML-LibXML - ) - selinux? ( sec-policy/selinux-wine ) - udisks? ( sys-fs/udisks:2 ) -" -DEPEND=" - ${WINE_COMMON_DEPEND} - sys-kernel/linux-headers - x11-base/xorg-proto -" -BDEPEND=" - ${PYTHON_DEPS} - dev-lang/perl - sys-devel/binutils - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - nls? ( sys-devel/gettext ) - !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) -" -IDEPEND=">=app-eselect/eselect-wine-2" - -QA_CONFIG_IMPL_DECL_SKIP=( - __clear_cache # unused on amd64+x86 (bug #900332) - res_getservers # false positive -) -QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext - -PATCHES=( - "${FILESDIR}"/${PN}-7.0.4-musl.patch - "${FILESDIR}"/${PN}-7.0.4-noexecstack.patch - "${FILESDIR}"/${PN}-7.0.4-restore-menubuilder.patch - "${FILESDIR}"/${PN}-7.0.4-unwind.patch - "${FILESDIR}"/${PN}-7.0.6-mingw64-11.0.0.patch - "${FILESDIR}"/${PN}-7.0.6-vulkan-libm.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} == binary ]] && return - - if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then - local mingw=-w64-mingw32 - for mingw in $(usev abi_x86_64 x86_64${mingw}) $(usev abi_x86_32 i686${mingw}); do - if ! type -P ${mingw}-gcc >/dev/null; then - eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain" - eerror "yourself by installing sys-devel/crossdev then running:" - eerror - eerror " crossdev --target ${mingw}" - eerror - eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw" - eerror "--> Note that mingw builds are default for ${PN} even without this USE." - die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found" - fi - done - fi -} - -src_prepare() { - # sanity check, bumping these has a history of oversights - local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \ - dlls/appwiz.cpl/addons.c || die) - if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then - local gmfatal= - [[ ${PV} == *9999 ]] && gmfatal=nonfatal - ${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)" - fi - - default - - if tc-is-clang; then - # -mabi=ms was ignored by <clang:16 then turned error in :17 - # and it still gets used in install phase despite --with-mingw, - # drop as a quick fix for now which hopefully should be safe - sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die - fi - - # ensure .desktop calls this variant + slot - sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die - - # similarly to staging, append to `wine --version` for identification - sed -i "s/wine_build[^1]*1/& (Proton-${WINE_PV})/" configure.ac || die - - # datadir is not where wine-mono is installed, so prefixy alternate paths - hprefixify -w /get_mono_path/ dlls/mscoree/metahost.c - - # always update for patches (including user's wrt #432348) - eautoreconf - tools/make_requests || die # perl - dlls/winevulkan/make_vulkan -x vk.xml || die # python, needed for proton's - # tip: if need more for user patches, with portage can e.g. do - # echo "post_src_prepare() { tools/make_specfiles || die; }" \ - # > /etc/portage/env/app-emulation/wine-proton -} - -src_configure() { - WINE_PREFIX=/usr/lib/${P} - WINE_DATADIR=/usr/share/${P} - - local conf=( - --prefix="${EPREFIX}"${WINE_PREFIX} - --datadir="${EPREFIX}"${WINE_DATADIR} - --includedir="${EPREFIX}"/usr/include/${P} - --libdir="${EPREFIX}"${WINE_PREFIX} - --mandir="${EPREFIX}"${WINE_DATADIR}/man - - # upstream (Valve) doesn't really support misc configurations (e.g. - # adds vulkan code not always guarded by --with-vulkan), so force - # some major options that are typically needed by games either way - --with-freetype - --with-mingw # needed by many, notably Blizzard titles - --with-opengl - --with-vulkan - --with-x - - # ...and disable most options unimportant for games and unused by - # Proton rather than expose as volatile USEs with little support - --without-capi - --without-cups - --without-gphoto - --without-gssapi - --without-krb5 - --without-ldap - --without-netapi - --without-opencl - --without-pcap - --without-sane - ac_cv_lib_soname_odbc= - - $(use_enable gecko mshtml) - $(use_enable mono mscoree) - --disable-tests - $(use_with alsa) - $(use_with fontconfig) - $(use_with gstreamer) - $(use_with nls gettext) - $(use_with openal) - $(use_with osmesa) - --without-oss # media-sound/oss is not packaged (OSSv4) - $(use_with pulseaudio pulse) - $(use_with sdl) - $(use_with ssl gnutls) - $(use_with udev) - $(use_with udisks dbus) # dbus is only used for udisks - $(use_with unwind) - $(use_with usb) - $(use_with v4l v4l2) - $(use_with vkd3d) - $(use_with xcomposite) - $(use_with xinerama) - ) - - tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097) - filter-lto # build failure - filter-flags -Wl,--gc-sections # runtime issues (bug #931329) - use custom-cflags || strip-flags # can break in obscure ways at runtime - use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} - - # broken with gcc-15's c23 default (TODO: try w/o occasionally, bug #943849) - append-cflags -std=gnu17 - - # temporary workaround for tc-ld-force-bfd not yet enforcing with mold - # https://github.com/gentoo/gentoo/pull/28355 - [[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] && - append-ldflags -fuse-ld=bfd - - # >=wine-proton-9 has proper fixes and builds with gcc-14, but would - # rather not have to worry about fixing old branches (bug #924486) - append-cflags $(test-flags-CC -Wno-error=incompatible-pointer-types) - - # build using upstream's way (--with-wine64) - # order matters: configure+compile 64->32, install 32->64 - local -i bits - for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do - ( - einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..." - - mkdir ../build${bits} || die - cd ../build${bits} || die - - # CROSSCC_amd64/x86 are unused by Wine, but recognized here for users - if (( bits == 64 )); then - : "${CROSSCC:=${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}" - conf+=( --enable-win64 ) - elif use amd64; then - conf+=( - $(usev abi_x86_64 --with-wine64=../build64) - TARGETFLAGS=-m32 # for widl - ) - # _setup is optional, but use over Wine's auto-detect (+#472038) - multilib_toolchain_setup x86 - fi - : "${CROSSCC:=${CROSSCC_x86:-i686-w64-mingw32-gcc}}" - - # use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu) - : "${CROSSCFLAGS:=$( - filter-flags '-fstack-protector*' #870136 - filter-flags '-mfunction-return=thunk*' #878849 - - # some bashrc-mv users tend to do CFLAGS="${LDFLAGS}" and then - # strip-unsupported-flags miss these during compile-only tests - # (primarily done for 23.0 profiles' -z, not full coverage) - filter-flags '-Wl,-z,*' - - # -mavx with mingw-gcc has a history of obscure issues and - # disabling is seen as safer, e.g. `WINEARCH=win32 winecfg` - # crashes with -march=skylake >=wine-8.10, similar issues with - # znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273 - append-cflags -mno-avx #912268 - - CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}" - : "${CROSSLDFLAGS:=$( - filter-flags '-fuse-ld=*' - CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}" - export CROSS{CC,{C,LD}FLAGS} - - ECONF_SOURCE=${S} econf "${conf[@]}" - ) - done -} - -src_compile() { - use abi_x86_64 && emake -C ../build64 # do first - use abi_x86_32 && emake -C ../build32 -} - -src_install() { - use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install - use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last - - # symlink for plain 'wine' and install its man pages if 64bit-only #404331 - if use abi_x86_64 && use !abi_x86_32; then - dosym wine64 ${WINE_PREFIX}/bin/wine - dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader - local man - for man in ../build64/loader/wine.*man; do - : "${man##*/wine}" - : "${_%.*}" - insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1 - newins ${man} wine.1 - done - fi - - use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \ - "${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die - - # create variant wrappers for eselect-wine - local bin - for bin in "${ED}"${WINE_PREFIX}/bin/*; do - make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}" - done - - # don't let portage try to strip PE files with the wrong - # strip executable and instead handle it here (saves ~120MB) - dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows - use debug || - find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \ - -exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} + || die - - dodoc ANNOUNCE AUTHORS README* documentation/README* - readme.gentoo_create_doc -} - -pkg_preinst() { - has_version ${CATEGORY}/${PN} && WINE_HAD_ANY_SLOT= -} - -pkg_postinst() { - [[ -v WINE_HAD_ANY_SLOT ]] || readme.gentoo_print_elog - - if use abi_x86_32; then - # difficult to tell what is needed from here, but try to warn - if has_version 'x11-drivers/nvidia-drivers'; then - if has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'; then - ewarn "x11-drivers/nvidia-drivers is installed but is built without" - ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit" - ewarn "applications under ${PN} will likely not be usable." - ewarn "Multi-card setups may need this on media-libs/mesa as well." - fi - elif has_version 'media-libs/mesa[-abi_x86_32]'; then - ewarn "media-libs/mesa seems to be in use but is built without" - ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit" - ewarn "applications under ${PN} will likely not be usable." - fi - fi - - ewarn - ewarn "Warning: please consider ${PN} provided as-is without real" - ewarn "support. Upstream does not want bug reports unless can reproduce" - ewarn "with real Steam+Proton, and Gentoo is largely unable to help" - ewarn "unless it is a build/packaging issue. So, if need support, try" - ewarn "normal Wine or Proton instead." - - eselect wine update --if-unset || die -} - -pkg_postrm() { - eselect wine update --if-unset || die -} diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild index ca291e4a2bfa..c5e848376068 100644 --- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild +++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -127,6 +127,7 @@ PATCHES=( "${FILESDIR}"/${PN}-8.0.1c-unwind.patch "${FILESDIR}"/${PN}-8.0.4-restore-menubuilder.patch "${FILESDIR}"/${PN}-8.0.5c-vulkan-libm.patch + "${FILESDIR}"/${PN}-9.0.4-binutils2.44.patch ) pkg_pretend() { diff --git a/app-emulation/wine-proton/wine-proton-9.0.2.ebuild b/app-emulation/wine-proton/wine-proton-9.0.2.ebuild index 21ce4922b7c7..4315a6ab2158 100644 --- a/app-emulation/wine-proton/wine-proton-9.0.2.ebuild +++ b/app-emulation/wine-proton/wine-proton-9.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -138,6 +138,7 @@ PATCHES=( "${FILESDIR}"/${PN}-8.0.4-restore-menubuilder.patch "${FILESDIR}"/${PN}-8.0.5c-vulkan-libm.patch "${FILESDIR}"/${PN}-9.0-rpath.patch + "${FILESDIR}"/${PN}-9.0.4-binutils2.44.patch ) pkg_pretend() { diff --git a/app-emulation/wine-proton/wine-proton-9.0.4.ebuild b/app-emulation/wine-proton/wine-proton-9.0.4.ebuild index 1755a53c0c96..3b56b56302d6 100644 --- a/app-emulation/wine-proton/wine-proton-9.0.4.ebuild +++ b/app-emulation/wine-proton/wine-proton-9.0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -138,6 +138,7 @@ PATCHES=( "${FILESDIR}"/${PN}-8.0.4-restore-menubuilder.patch "${FILESDIR}"/${PN}-8.0.5c-vulkan-libm.patch "${FILESDIR}"/${PN}-9.0-rpath.patch + "${FILESDIR}"/${PN}-9.0.4-binutils2.44.patch ) pkg_pretend() { diff --git a/app-emulation/wine-proton/wine-proton-9999.ebuild b/app-emulation/wine-proton/wine-proton-9999.ebuild index 4319a3a8efc7..64c99557d831 100644 --- a/app-emulation/wine-proton/wine-proton-9999.ebuild +++ b/app-emulation/wine-proton/wine-proton-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -138,6 +138,7 @@ PATCHES=( "${FILESDIR}"/${PN}-8.0.4-restore-menubuilder.patch "${FILESDIR}"/${PN}-8.0.5c-vulkan-libm.patch "${FILESDIR}"/${PN}-9.0-rpath.patch + "${FILESDIR}"/${PN}-9.0.4-binutils2.44.patch ) pkg_pretend() { diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest index ad394d63310e..74cf1390c0b7 100644 --- a/app-emulation/wine-staging/Manifest +++ b/app-emulation/wine-staging/Manifest @@ -1,3 +1,4 @@ +AUX wine-staging-10.0-binutils2.44.patch 4104 BLAKE2B 1439d1f4720696297d7d108d7a905207ae690673ee95702b13c9bd5cad02bf4d5ee8cada9ea57645078daba58df7232e5abb7c999d3efb877f87f0819f7af45c SHA512 ce6bf25c41da2cc073a1badce0f0ea7921dd920e8c6333759280847ea6df05cb77206610bd64cb1c1d07b84647fa1724d28c015b4944697a0a7cbe49107ec7fe AUX wine-staging-7.17-noexecstack.patch 223 BLAKE2B 6e6cfc208f11c2c2b7bbc392e3703c50669ba9abf088dac0dd7aa8d6e59fcdd6656f5ad6955e4ef87c25d6f4082d83af71a09b2928934222b25847b8b2b5089f SHA512 43fc5c50c33e09f028c2369a660499fbb6c240931c6b7d44c4e838deee1df0390706967b375d36ee8eea339e86a5af1c7a49a76d884860c045c3476d8c8d2a5f AUX wine-staging-7.20-unwind.patch 1450 BLAKE2B 80e9222c95393aaa4b95e05597a4181030fc988d95e416d2f92631f29f640b9abb3dd0853d005de4725b41c09224e478741902075259d48a30830a923790579f SHA512 e1a72f1463be32975daa02064acb96189cd79cb41ff98f89b58e46c97100a3ac46405b1b9982378c9de275acbdb74168853e47b932e06398cdd2981b23f483ce AUX wine-staging-8.13-rpath.patch 554 BLAKE2B 209d8c581a9178242ee622338c5252f79b798cf5574f72b3984d71b7933e011b488060502715aa75630fbc3d10fcb03743ac31ed31664cacfc22b725253a117b SHA512 bbb25e02d19bd7c1a1f2d7db331d93cfcd5ce9172206ad9e19a44c52e5ece865d474eac024c2a5791dfa006c6efe0f68cd783ffc925ac793bf447d56090bdd02 @@ -7,8 +8,8 @@ DIST wine-9.0.tar.xz 30007216 BLAKE2B cf53177201a2f7eeb35d0d8ce220f80808d979099a DIST wine-staging-10.0.tar.gz 9490601 BLAKE2B 2843d6fbeca285a258dbb7505e2451d183b175a9d0b95a03551d635ca8a81c5ba5702d634f45be8d8574435a0fc77b84ca289350e4e74e97b9d5c7b1b8706fbe SHA512 1340473c0ede35450d9cb91bdca2fb237dd2c19e7cde7a05f3c2c70b741f4321e54a1cc4042a48dc83e07dc6967c904fae6c22233ce28fbc6dfa836cef281250 DIST wine-staging-10.1.tar.gz 9542987 BLAKE2B d23934dd7da9f324935087ad7cff74e544bc8191e3570a125e468c18a170459135ef37cce3780f4625c8b4e330c5bf3f32c59d1cd034a465def3ec60c7efa65c SHA512 1b837a2b0c417dcf1821139b0cf220995305b22e59cc5d93b5055d4c6dc9c36da7b05f6a9f136b5f1a60618e497c0e4d295343880504f7ebb1e9fafeb2f0b38a DIST wine-staging-9.0.tar.gz 9577631 BLAKE2B 0012978f54c618e73d407dd49dccff02853912d0c015098889802518e8c51b280f5d60e11291335dafc68944ee01cbcb7fd6c5825ef10ae1520c7b82d9846718 SHA512 362209fcadcf029152b681c76beb231d0cc8de1609b994094f1dc88ab871fddda08b3d8c2fe36ceb38909a9d634c1ade864ca0f28a6a7715ec286a8b2884981f -EBUILD wine-staging-10.0.ebuild 15577 BLAKE2B 5f035f49497906258934f92d729abde3382c41952de44fafbbf747aa8bf1c6623528dd7ec30efde05526cc977a9e5c1fe2cb624b49e8cab07af00dd09f0f8a5b SHA512 064fb6e369b75cfd94eea74b4826203b7cf2202bf35ef0f6b7fec4b05e775d62be08fa8c6e9cfe5a283791b8ba2d9b0d2477d7173cfdc6be4b545f8e1041bd0d -EBUILD wine-staging-10.1.ebuild 15577 BLAKE2B 5f035f49497906258934f92d729abde3382c41952de44fafbbf747aa8bf1c6623528dd7ec30efde05526cc977a9e5c1fe2cb624b49e8cab07af00dd09f0f8a5b SHA512 064fb6e369b75cfd94eea74b4826203b7cf2202bf35ef0f6b7fec4b05e775d62be08fa8c6e9cfe5a283791b8ba2d9b0d2477d7173cfdc6be4b545f8e1041bd0d -EBUILD wine-staging-9.0.ebuild 15782 BLAKE2B 715718be1cee4347d2327af0f8efe8973d1322183b3512e2c6a03078d8c6660c989c0d51c63d410a4c8c52c776b8a1d8b4c07462e8ce1154e9b15e505dffc3c3 SHA512 7b5e2f2abc68c255937eeb53b4662d5065a43b5bee86534d7ec701d5ea87c4ff8f3abede513aba2d73e99e5e7b2f05ff8897dd4d9e2cc00e3754adad7a8f6aab +EBUILD wine-staging-10.0.ebuild 15622 BLAKE2B c5b6dfd62b9349b62d321c0387e6865a1f57d1aa3618160778988e7bae088ec7150d7159187e2d6c9b6f0975f0adc7a338bb499443a6ba5c4c957dd05e3cc2d3 SHA512 ae7aaac96d218a2e14b7d2cad6c67a4687a4326c24f494ec1b819916b6e4a06f51122bc2dd225e8b9a8df45ee2b8185b954c2a04750fa6e658e21bd3058d5fcb +EBUILD wine-staging-10.1.ebuild 15622 BLAKE2B c5b6dfd62b9349b62d321c0387e6865a1f57d1aa3618160778988e7bae088ec7150d7159187e2d6c9b6f0975f0adc7a338bb499443a6ba5c4c957dd05e3cc2d3 SHA512 ae7aaac96d218a2e14b7d2cad6c67a4687a4326c24f494ec1b819916b6e4a06f51122bc2dd225e8b9a8df45ee2b8185b954c2a04750fa6e658e21bd3058d5fcb +EBUILD wine-staging-9.0.ebuild 15827 BLAKE2B c5943aca5853c48e7738344a4dd3e527af8f9b17f38a4062e16009c51ccbf6b351f4ccee1b9fe06c7a606f7255c0293ee7f8090a6d3e11ca288ef7f41cbfc260 SHA512 e0f743a8d86e93e166f45148780e52c9582fdfd94a93a685c95694469a83c7333129efcc4fd63e9942a41111a6ff5015ca50158c76160494be91829671f4c58f EBUILD wine-staging-9999.ebuild 15577 BLAKE2B 89236ab018b719162dcd15ce17e8130983b223596f3a434444cea02716ecce181f059606d90e3344e0aa14dc99582ae45989f9a685a527639dc1ce700ea3c02a SHA512 57ec46c07d740785b9f3322f1efa94fa3b0ec653d4366ad037103433fd58f4d8d6c733adf2bcc990e9f88e532e998dc2d92547800c59585bf7dedc62e0ad8b30 MISC metadata.xml 2718 BLAKE2B 6848ef9723706ba3437fe18dbacf798cc2f266545c9241ceb9b5e83600bd1e82e80e9bc1d963f7a62e3b974af90d6e330305aaa77b9d578e20201ba1172fd775 SHA512 c89ca2bce23e50982f5cf846d58fe9f962da0eb8e13d7065fbba5e07afa072a9df000accf1fdb3829225b1fe3434d706be55749aa6b7d34e1f28ac91f82fa436 diff --git a/app-emulation/wine-staging/files/wine-staging-10.0-binutils2.44.patch b/app-emulation/wine-staging/files/wine-staging-10.0-binutils2.44.patch new file mode 100644 index 000000000000..4b20dbf1344d --- /dev/null +++ b/app-emulation/wine-staging/files/wine-staging-10.0-binutils2.44.patch @@ -0,0 +1,105 @@ +Note that this is only an issue when using mingw (PE) binutils-2.44, +host (ELF) binutils-2.44 has no impact on this and, before this patch, +using 2.44 could only happen with off-by-default USE=crossdev-mingw. + +https://bugs.winehq.org/show_bug.cgi?id=57819 +https://sourceware.org/PR32675 +https://gitlab.winehq.org/wine/wine/-/merge_requests/7328 +--- a/dlls/ntdll/loader.c ++++ b/dlls/ntdll/loader.c +@@ -3848,5 +3848,5 @@ + NTSTATUS nts; + FARPROC fp; +- DWORD id; ++ INT_PTR id; + + TRACE( "(%p, %p, %p, %p, %p, 0x%08lx)\n", base, desc, dllhook, syshook, addr, flags ); +--- a/tools/winebuild/import.c ++++ b/tools/winebuild/import.c +@@ -1332,4 +1332,14 @@ + } + ++static void output_import_section( int index, int is_delay ) ++{ ++ if (!is_delay) ++ output( "\n\t.section .idata$%d\n", index ); ++ else if (index == 5) ++ output( "\n\t.section .data$didat%d\n", index ); ++ else ++ output( "\n\t.section .rdata$didat%d\n", index ); ++} ++ + /* create a Windows-style import library */ + static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struct strarray files ) +@@ -1455,18 +1465,18 @@ + output( "\t.long 0\n" ); /* TimeDateStamp */ + +- output( "\n\t.section .idata$5\n" ); ++ output_import_section( 5, is_delay ); + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* FirstThunk tail */ + output( ".L__wine_import_addrs:\n" ); + +- output( "\n\t.section .idata$4\n" ); ++ output_import_section( 4, is_delay ); + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* OriginalFirstThunk tail */ + output( ".L__wine_import_names:\n" ); + + /* required to avoid internal linker errors with some binutils versions */ +- output( "\n\t.section .idata$2\n" ); ++ output_import_section( 2, is_delay ); + } + else + { +- output( "\n\t.section .idata$2\n" ); ++ output_import_section( 2, is_delay ); + output( "%s\n", asm_globl( import_desc ) ); + output_rva( ".L__wine_import_names" ); /* OriginalFirstThunk */ +@@ -1476,8 +1486,8 @@ + output_rva( ".L__wine_import_addrs" ); /* FirstThunk */ + +- output( "\n\t.section .idata$4\n" ); ++ output_import_section( 4, is_delay ); + output( ".L__wine_import_names:\n" ); /* OriginalFirstThunk head */ + +- output( "\n\t.section .idata$5\n" ); ++ output_import_section( 5, is_delay ); + output( ".L__wine_import_addrs:\n" ); /* FirstThunk head */ + } +@@ -1490,9 +1500,9 @@ + new_output_as_file(); + +- output( "\n\t.section .idata$4\n" ); ++ output_import_section( 4, is_delay ); + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* OriginalFirstThunk tail */ +- output( "\n\t.section .idata$5\n" ); ++ output_import_section( 5, is_delay ); + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* FirstThunk tail */ +- output( "\n\t.section .idata$7\n" ); ++ output_import_section( 7, is_delay ); + output( "%s\n", asm_globl( import_name ) ); + output( "\t%s \"%s\"\n", get_asm_string_keyword(), spec->file_name ); +@@ -1585,8 +1595,8 @@ + } + +- output( "\n\t.section .idata$4\n" ); ++ output_import_section( 4, is_delay ); + output_thunk_rva( by_name ? -1 : odp->ordinal, ".L__wine_import_name" ); + +- output( "\n\t.section .idata$5\n" ); ++ output_import_section( 5, is_delay ); + output( "%s\n", asm_globl( imp_name ) ); + if (is_delay) +@@ -1597,5 +1607,5 @@ + if (by_name) + { +- output( "\n\t.section .idata$6\n" ); ++ output_import_section( 6, is_delay ); + output( ".L__wine_import_name:\n" ); + output( "\t.short %d\n", odp->hint ); +@@ -1604,5 +1614,5 @@ + + /* reference head object to always pull its sections */ +- output( "\n\t.section .idata$7\n" ); ++ output_import_section( 7, is_delay ); + output_rva( "%s", asm_name( import_desc ) ); + diff --git a/app-emulation/wine-staging/wine-staging-10.0.ebuild b/app-emulation/wine-staging/wine-staging-10.0.ebuild index 18b40a459062..517e06a88c97 100644 --- a/app-emulation/wine-staging/wine-staging-10.0.ebuild +++ b/app-emulation/wine-staging/wine-staging-10.0.ebuild @@ -173,6 +173,7 @@ PATCHES=( "${FILESDIR}"/${PN}-7.17-noexecstack.patch "${FILESDIR}"/${PN}-7.20-unwind.patch "${FILESDIR}"/${PN}-8.13-rpath.patch + "${FILESDIR}"/${PN}-10.0-binutils2.44.patch ) pkg_pretend() { diff --git a/app-emulation/wine-staging/wine-staging-10.1.ebuild b/app-emulation/wine-staging/wine-staging-10.1.ebuild index 18b40a459062..517e06a88c97 100644 --- a/app-emulation/wine-staging/wine-staging-10.1.ebuild +++ b/app-emulation/wine-staging/wine-staging-10.1.ebuild @@ -173,6 +173,7 @@ PATCHES=( "${FILESDIR}"/${PN}-7.17-noexecstack.patch "${FILESDIR}"/${PN}-7.20-unwind.patch "${FILESDIR}"/${PN}-8.13-rpath.patch + "${FILESDIR}"/${PN}-10.0-binutils2.44.patch ) pkg_pretend() { diff --git a/app-emulation/wine-staging/wine-staging-9.0.ebuild b/app-emulation/wine-staging/wine-staging-9.0.ebuild index 7bd88b9de330..fc7dfd731bbc 100644 --- a/app-emulation/wine-staging/wine-staging-9.0.ebuild +++ b/app-emulation/wine-staging/wine-staging-9.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -177,6 +177,7 @@ PATCHES=( "${FILESDIR}"/${PN}-7.17-noexecstack.patch "${FILESDIR}"/${PN}-7.20-unwind.patch "${FILESDIR}"/${PN}-8.13-rpath.patch + "${FILESDIR}"/${PN}-10.0-binutils2.44.patch ) pkg_pretend() { diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest index 8d9a293c69e5..c79baee704d0 100644 --- a/app-emulation/wine-vanilla/Manifest +++ b/app-emulation/wine-vanilla/Manifest @@ -1,16 +1,14 @@ +AUX wine-vanilla-10.0-binutils2.44.patch 4104 BLAKE2B 607821c8066161b611e01caa8d9754373e0726e1569ed3cd854bf61ec279d89a89e4e001e269b8c7da1b711e2ab2e6166709d6cc6f330c4d4ab96ed32f5fa8f9 SHA512 475b2ed549f39ae6b9381e644eae1e2a067bc9d7f2b48341458e3475e70c7eb5256a597dc87581b2d9253752f801fd9c4121d0ced8dfccc879b026abea48697d AUX wine-vanilla-7.0-noexecstack.patch 223 BLAKE2B dff1867e2977bd14fcfab9dfa2c2f1d3288f7edca75ddd7c9f02bfd06e9f63fac37bd59ea8aa891e13ab77bac35b369825d5490a9175ed9a7736e523b61d8944 SHA512 4ba3677042b693e513fc7a133c76a509f63d0ca20633d1e8d448bca9534c0d1a0fc58e77fa9b28fd8d936393605e97ee6e3bb5fac00872d6ac5808b7712586e3 -AUX wine-vanilla-7.0-unwind.patch 1694 BLAKE2B 017c7b761d692f8e8d23f52e51529880f95bddf5fee4309ab97bee951527bd427924dbb335e4bf57a27405e3d2440666f774c6859b81933d3007247e1cbf4898 SHA512 5d20960a8eda2d80097d6db81287c9d05ed4ea50df974c93391a427b743383a6806f24bc552c18a9336e7aea0ceb801972865ff470bde8ea7fd9423f57eb09ae AUX wine-vanilla-7.20-unwind.patch 1450 BLAKE2B 3f90cc131104ad72a11ae30c582b79b3e4d8c0278d51c0a193fb9e460cf088b315503bd08bd904e8d28f72f40ab3df90f83f2542b991888a2f504cc7d2adad4d SHA512 a6c4672a44c1220d5b1efabeca535a4a3510fe92aac73c38f65a09bfbd271af8b8b1bfe2c408ba5356806cb71252a6956b8130fcd06a475037b9e51d28c2a156 AUX wine-vanilla-8.13-rpath.patch 554 BLAKE2B 209d8c581a9178242ee622338c5252f79b798cf5574f72b3984d71b7933e011b488060502715aa75630fbc3d10fcb03743ac31ed31664cacfc22b725253a117b SHA512 bbb25e02d19bd7c1a1f2d7db331d93cfcd5ce9172206ad9e19a44c52e5ece865d474eac024c2a5791dfa006c6efe0f68cd783ffc925ac793bf447d56090bdd02 DIST wine-10.0.tar.xz 32011244 BLAKE2B 92178cf484cf33e9f3b8340429ee8e68c36e0d25eee4a892f059ab73f103cfcb9eb15e1883bc9fd8c8fe311d4ccbb56582d1f780da7b1406a7839a13addd29ae SHA512 effb41c5641993e2e52eaa825cc19b7d9846e084992c5a5b066ead2339b24384d320898a9cee347a9a87106bcb3b0f54c8cd2c8d4de3a887a658052ddd5168d6 DIST wine-10.1.tar.xz 32026152 BLAKE2B 573c4cc10c96c164eb02111b0a457be5500ab42c6d103180af5b2f88cdbcc134ea1fdb794687e6c736ebb5f9aa266e51424df26cd239fa26679d968ab5844cc3 SHA512 2dbc63e43e2cc1e0bf6294a926e8afc316e9f32efdce644229cb33bba98f6001c3f285b527767a83e5284558ef11f00515048aad031c6fc9122a4ce0692952af -DIST wine-7.0.2.tar.xz 27179980 BLAKE2B 721ab574092638b32d3a483b6ae3def0c9d706cc888662ca461ab8c7060b10077e83cede69663ea2a8b97729f3801209fbba5f8e8828ce20454700ffbbd76cb5 SHA512 330c71005a6a8054b5068ac4484e9015e9f8bf55d5a451aaf5f79b7f78a025732b454251c31473abf21504cce3b78e50cf7e3e0d0116bb755dc8396bd790289a DIST wine-8.0.2.tar.xz 29060452 BLAKE2B dcffaba6c90c4e02a7bc591a81e11aced06c006370c4c316c8a367b2f5814926063482959fabfe9d674ee1b5a560e59087e9b711e28360ced3aee2bbd6bb8fdb SHA512 e86dd31247d757d48ffb2d24f20edab3fc6ef9c3e395567a7b363951bb681335ba3adb8b84639011b24b6eb274582d56880298d6d95fb100acc072383d4e973f DIST wine-9.0.tar.xz 30007216 BLAKE2B cf53177201a2f7eeb35d0d8ce220f80808d979099a928ad60652d1dee92620c433cc105dffab4e9309f41766087ad1544ef49d2922538bb420d62f6dd64117a1 SHA512 838daf2c4581f83f8573b988036f517d57b84894b090a2a17433255d6d044dfa880e6724cdb83082a36c333df9d2083ab68ae53927622a620edd59f33462ada4 -EBUILD wine-vanilla-10.0.ebuild 14493 BLAKE2B f6471f3260d1ea333e7bf9788d456327451fa82ff5572b33a108445b3bacf250c1373b8ee0403462aacdccfbc292993a0db768d29303780329f122600d61b521 SHA512 2f1773cef622aaf15cdba41b2b3a7b257d9e2d2cbc018c0f29c36fffffd8e37da09c7f38185fd31463c434fc8246783b7f100a3c678b2c194acd615998fbcd68 -EBUILD wine-vanilla-10.1.ebuild 14494 BLAKE2B 27dc34b9e28be42a76db150ee0c1eca3ac8bc29cfcc8892262549cb0a84729d3fc20128b6c5541190675b3997870d5a49d03bc05e68b1a7934fe66b1666576a2 SHA512 2f29b829f20d0a38c4e1db134b248ad5a182a140c41700f50cfcfcc76d87e905b3c1c55ece659d3f960b1e42928a582ffec527e60befb29cbb7690b3472db6e4 -EBUILD wine-vanilla-7.0.2.ebuild 12901 BLAKE2B c56de298278ea1f64164156da06828db82b418a5e1041b816635cf21a30b93127bdacd35caca340518a446d4a1cefaccb3095285882d1cc5b89c4de565ed5128 SHA512 5fe2e8c635e0625ae9abc418110498250db8fef4b45484c2c2b147f492f90043fcd251d14072bee2cbe4558c9d7672ea3a114174fff66ac0205c3c6256dd6906 -EBUILD wine-vanilla-8.0.2.ebuild 12989 BLAKE2B 38ec6d327ee3fe44fb3857615ceccd38ab8552d3c90ea7a5e3ca03eaa8b2c489ca02789c88f593bbb429304f62cd92a46f6af72b4cb63920cc0fb8a0338cdb57 SHA512 a39c6e6caa21abfe2a2a43119d4507769004fcc489c66af615d0761cbec02732a35e5bef7c7a2d8422e80311078167695d8d4fbf580aa7290dd06b25cdbe2a30 -EBUILD wine-vanilla-9.0.ebuild 14266 BLAKE2B 7eb89a6784065bdd547d3a4e768e57603a41dc8d5879006ef0e9cb630968000c00169b16bd77b7b2fc42296bb8bcbe3407020becf893b09b73c6c5ee798818cc SHA512 cf52d3b7a90152636c887c7576c17c540896dfd0195912829a49259f1506f84c35daf22f86ecbf9020951332ab32f846ca6cc251ef8ef13ca501566e0a9b0cbc -EBUILD wine-vanilla-9999.ebuild 14494 BLAKE2B 4d06d529dc848c809041b80fa5b2abdb81e2cbc2b268e9c39aec3b8f0587b4059c872368c6c9c75f76d69a965fc6c874b26396af415ecfc975ff527c1f031870 SHA512 cccaf07d1df55481fdaa0ca1185b01b606f2eccc401e126ed84f25bdcb080b7c8528e4d77b0b3365e612a62a7f772e29dcbd6ebd586a0335e13706473608d043 -MISC metadata.xml 2785 BLAKE2B 8f5b1b8e24a96e3735964681c2f55d6c77c2584be75e82a93c79b44fdde34a3730405fc3f226209a2cb140efa106ae202c236f9b35444fbafa7f9cae1751fe4c SHA512 dac99517bc4dc1dce8174ae133e035bf76d14edb2a4b61165f6fade16db30c775f8dc26d4c5dd4ce2cb362dc5ac1df5dea4c18f1795007ece185686179251cb3 +EBUILD wine-vanilla-10.0.ebuild 14538 BLAKE2B 1abaa69f1bacf4834d7b7def542b67bc7a78cc8d5ff3305fcd7a95a14b0e191c6d1d81640d5f0c1c15260ec4753803cfcecb42cc2d1fc7bf24801e42fa07c0aa SHA512 e4178f22b70dca1ac0b495e50d7b742cf1153a79093cf75670f14c8db454032d4ea6ebee63d23a2675d431107a3c072ff85f9e15d85a6f35db9279f2d1eec881 +EBUILD wine-vanilla-10.1.ebuild 14539 BLAKE2B 2a0bc0ff6f1937599d35f41db8b79f514e2a92e4887911f3cf55a975833dc65a8ac41f2be8dec34e5bd19a73cd65106bebd6103957dec7af355b366127e60111 SHA512 0a35a294a4c8c398baec956344278635d950c7db78a3b31e4e97e95877999b79d833fb1af386fbefbfaf8e7ce9310ab1167774fef87fc02d59689c63e8f52ff1 +EBUILD wine-vanilla-8.0.2.ebuild 13034 BLAKE2B 898ed541c3311528ba4a4055da4043833428b2732b06ab5f51f5d87872cc591179c1362dc37b4eab9d6fdd3f1678c7fb1750469cd45c84afb8422de57cfab4a1 SHA512 099c2443f3e6a28bd0cd49c6a81f720f9eaa51c6da0759ee2ba9a4aa204306a319493e581efccef2ca437cc16df80cd7a90427c93e3981d631c82f5268b6ec62 +EBUILD wine-vanilla-9.0.ebuild 14311 BLAKE2B d8f6afb2bf29b3d8e4ecd51265cd3427c1e1711d97d2c77f16f70ba808ddbaca910d8b6993d66b684dc264f05e409fb6c0b62b59225047180ba79aa09cbcc2bd SHA512 b01db0b4849d60181035270e80a9043f659ebf19543d9451a4c5ecdaa73f40bf9eaba514d3c0d59c90429d8da64aad662e1f9dd16d96ce9963dc613f6b675b18 +EBUILD wine-vanilla-9999.ebuild 13722 BLAKE2B 326c9d3f4e877afc9f066b1ddad018cc68ce39e46a76c74d107d2c59c560b2b1f38cd3968e0809272d80dae5ff02d2642c0fa5e5231186336ca6f1936b1091ca SHA512 a576a236d7ec3eb3eeabd32d0cbf6d4f0d0ddffce62c5191a5d076c194d136903410c8103d16afb1126f65e6ea23b75710e5f82a4c5eba3db47c654c2c0743b0 +MISC metadata.xml 2694 BLAKE2B 01c000d837b123829986a3f60d8d70b7f3a294ed5b51a024f65c132daa7536237632c76113c866c250178bd44f833c2de6d3e4c77904dfa5ff7e8fb9a7dd332e SHA512 749d959889c8669c07e3f85c79780a08038b2547f4a9b343cb4f38bd79e62a36909723d405ce2f9c8c509720d7817bd2da21fd832b15ff63dd0bca04745319b6 diff --git a/app-emulation/wine-vanilla/files/wine-vanilla-10.0-binutils2.44.patch b/app-emulation/wine-vanilla/files/wine-vanilla-10.0-binutils2.44.patch new file mode 100644 index 000000000000..d7e30393569e --- /dev/null +++ b/app-emulation/wine-vanilla/files/wine-vanilla-10.0-binutils2.44.patch @@ -0,0 +1,105 @@ +Note that this is only an issue when using mingw (PE) binutils-2.44, +host (ELF) binutils-2.44 has no impact on this and, before this patch, +using 2.44 could only happen with off-by-default USE=crossdev-mingw. + +https://bugs.winehq.org/show_bug.cgi?id=57819 +https://sourceware.org/PR32675 +https://gitlab.winehq.org/wine/wine/-/merge_requests/7328 +--- a/dlls/ntdll/loader.c ++++ b/dlls/ntdll/loader.c +@@ -3750,5 +3750,5 @@ + NTSTATUS nts; + FARPROC fp; +- DWORD id; ++ INT_PTR id; + + TRACE( "(%p, %p, %p, %p, %p, 0x%08lx)\n", base, desc, dllhook, syshook, addr, flags ); +--- a/tools/winebuild/import.c ++++ b/tools/winebuild/import.c +@@ -1332,4 +1332,14 @@ + } + ++static void output_import_section( int index, int is_delay ) ++{ ++ if (!is_delay) ++ output( "\n\t.section .idata$%d\n", index ); ++ else if (index == 5) ++ output( "\n\t.section .data$didat%d\n", index ); ++ else ++ output( "\n\t.section .rdata$didat%d\n", index ); ++} ++ + /* create a Windows-style import library */ + static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struct strarray files ) +@@ -1455,18 +1465,18 @@ + output( "\t.long 0\n" ); /* TimeDateStamp */ + +- output( "\n\t.section .idata$5\n" ); ++ output_import_section( 5, is_delay ); + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* FirstThunk tail */ + output( ".L__wine_import_addrs:\n" ); + +- output( "\n\t.section .idata$4\n" ); ++ output_import_section( 4, is_delay ); + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* OriginalFirstThunk tail */ + output( ".L__wine_import_names:\n" ); + + /* required to avoid internal linker errors with some binutils versions */ +- output( "\n\t.section .idata$2\n" ); ++ output_import_section( 2, is_delay ); + } + else + { +- output( "\n\t.section .idata$2\n" ); ++ output_import_section( 2, is_delay ); + output( "%s\n", asm_globl( import_desc ) ); + output_rva( ".L__wine_import_names" ); /* OriginalFirstThunk */ +@@ -1476,8 +1486,8 @@ + output_rva( ".L__wine_import_addrs" ); /* FirstThunk */ + +- output( "\n\t.section .idata$4\n" ); ++ output_import_section( 4, is_delay ); + output( ".L__wine_import_names:\n" ); /* OriginalFirstThunk head */ + +- output( "\n\t.section .idata$5\n" ); ++ output_import_section( 5, is_delay ); + output( ".L__wine_import_addrs:\n" ); /* FirstThunk head */ + } +@@ -1490,9 +1500,9 @@ + new_output_as_file(); + +- output( "\n\t.section .idata$4\n" ); ++ output_import_section( 4, is_delay ); + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* OriginalFirstThunk tail */ +- output( "\n\t.section .idata$5\n" ); ++ output_import_section( 5, is_delay ); + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* FirstThunk tail */ +- output( "\n\t.section .idata$7\n" ); ++ output_import_section( 7, is_delay ); + output( "%s\n", asm_globl( import_name ) ); + output( "\t%s \"%s\"\n", get_asm_string_keyword(), spec->file_name ); +@@ -1585,8 +1595,8 @@ + } + +- output( "\n\t.section .idata$4\n" ); ++ output_import_section( 4, is_delay ); + output_thunk_rva( by_name ? -1 : odp->ordinal, ".L__wine_import_name" ); + +- output( "\n\t.section .idata$5\n" ); ++ output_import_section( 5, is_delay ); + output( "%s\n", asm_globl( imp_name ) ); + if (is_delay) +@@ -1597,5 +1607,5 @@ + if (by_name) + { +- output( "\n\t.section .idata$6\n" ); ++ output_import_section( 6, is_delay ); + output( ".L__wine_import_name:\n" ); + output( "\t.short %d\n", odp->hint ); +@@ -1604,5 +1614,5 @@ + + /* reference head object to always pull its sections */ +- output( "\n\t.section .idata$7\n" ); ++ output_import_section( 7, is_delay ); + output_rva( "%s", asm_name( import_desc ) ); + diff --git a/app-emulation/wine-vanilla/files/wine-vanilla-7.0-unwind.patch b/app-emulation/wine-vanilla/files/wine-vanilla-7.0-unwind.patch deleted file mode 100644 index 74f22362ea9b..000000000000 --- a/app-emulation/wine-vanilla/files/wine-vanilla-7.0-unwind.patch +++ /dev/null @@ -1,40 +0,0 @@ -Fix build with llvm-libunwind, and also fix for non-llvm libunwind -when using clang+bfd given clang doesn't have _Unwind_Find_FDE in -its rtlib and expects it from llvm-libunwind. - -The _CONFIG_H_ check is for <llvm-libunwind-15 (adds _VERSION). ---- a/dlls/ntdll/unix/signal_x86_64.c -+++ b/dlls/ntdll/unix/signal_x86_64.c -@@ -635,7 +635,9 @@ - unsigned int cie_offset; - }; - -+#if defined(_LIBUNWIND_VERSION) || defined(____LIBUNWIND_CONFIG_H__) || !defined(__clang__) - extern const struct dwarf_fde *_Unwind_Find_FDE (void *, struct dwarf_eh_bases *); -+#endif - - static unsigned char dwarf_get_u1( const unsigned char **p ) - { -@@ -1357,7 +1359,7 @@ - unw_proc_info_t info; - int rc; - --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(_LIBUNWIND_VERSION) || defined(____LIBUNWIND_CONFIG_H__) - rc = unw_getcontext( &unw_context ); - if (rc == UNW_ESUCCESS) - rc = unw_init_local( &cursor, &unw_context ); -@@ -1480,11 +1482,13 @@ - NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEXT *context ) - { - struct dwarf_eh_bases bases; -+#if defined(_LIBUNWIND_VERSION) || defined(____LIBUNWIND_CONFIG_H__) || !defined(__clang__) - const struct dwarf_fde *fde = _Unwind_Find_FDE( (void *)(context->Rip - 1), &bases ); - - if (fde) - return dwarf_virtual_unwind( context->Rip, &dispatch->EstablisherFrame, context, fde, - &bases, &dispatch->LanguageHandler, &dispatch->HandlerData ); -+#endif - #ifdef HAVE_LIBUNWIND - return libunwind_virtual_unwind( context->Rip, &dispatch->EstablisherFrame, context, - &dispatch->LanguageHandler, &dispatch->HandlerData ); diff --git a/app-emulation/wine-vanilla/metadata.xml b/app-emulation/wine-vanilla/metadata.xml index 04c6a41bee45..dd7a4eda1c35 100644 --- a/app-emulation/wine-vanilla/metadata.xml +++ b/app-emulation/wine-vanilla/metadata.xml @@ -29,7 +29,6 @@ This variant of the Wine packaging does not include external patchsets <flag name="perl">Install helpers that require perl (winedump/winemaker)</flag> <flag name="samba">Pull in <pkg>net-fs/samba</pkg> with winbind for NTLM auth support</flag> <flag name="sdl">Enable gamepad support using <pkg>media-libs/libsdl2</pkg></flag> - <flag name="vkd3d">Enable DirectX 12 support using <pkg>app-emulation/vkd3d</pkg></flag> <flag name="wow64"> Enable running 32bit applications without 32bit ELF multilib by mapping to 64bit calls (experimental, diff --git a/app-emulation/wine-vanilla/wine-vanilla-10.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-10.0.ebuild index 9e662b350f3e..d912312e42aa 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-10.0.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-10.0.ebuild @@ -163,6 +163,7 @@ PATCHES=( "${FILESDIR}"/${PN}-7.0-noexecstack.patch "${FILESDIR}"/${PN}-7.20-unwind.patch "${FILESDIR}"/${PN}-8.13-rpath.patch + "${FILESDIR}"/${PN}-10.0-binutils2.44.patch ) pkg_pretend() { diff --git a/app-emulation/wine-vanilla/wine-vanilla-10.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-10.1.ebuild index 7ad0553e1237..0a51b2565e22 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-10.1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-10.1.ebuild @@ -163,6 +163,7 @@ PATCHES=( "${FILESDIR}"/${PN}-7.0-noexecstack.patch "${FILESDIR}"/${PN}-7.20-unwind.patch "${FILESDIR}"/${PN}-8.13-rpath.patch + "${FILESDIR}"/${PN}-10.0-binutils2.44.patch ) pkg_pretend() { diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild deleted file mode 100644 index 9cc201c4e78e..000000000000 --- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild +++ /dev/null @@ -1,394 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MULTILIB_COMPAT=( abi_x86_{32,64} ) -inherit autotools flag-o-matic multilib multilib-build -inherit prefix toolchain-funcs wrapper - -WINE_GECKO=2.47.2 -WINE_MONO=7.0.0 - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git" -else - (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0 - SRC_URI="https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz" - S="${WORKDIR}/wine-${PV}" - KEYWORDS="-* amd64 x86" -fi - -DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" -HOMEPAGE=" - https://www.winehq.org/ - https://gitlab.winehq.org/wine/wine/ -" - -LICENSE="LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff" -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 +vkd3d +vulkan - +xcomposite xinerama -" -# bug #551124 for truetype -REQUIRED_USE=" - X? ( truetype ) - crossdev-mingw? ( mingw ) -" - -# tests are non-trivial to run, can hang easily, don't play well with -# sandbox, and several need real opengl/vulkan or network access -RESTRICT="test" - -# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked -WINE_DLOPEN_DEPEND=" - X? ( - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] - x11-libs/libXi[${MULTILIB_USEDEP}] - x11-libs/libXrandr[${MULTILIB_USEDEP}] - x11-libs/libXrender[${MULTILIB_USEDEP}] - x11-libs/libXxf86vm[${MULTILIB_USEDEP}] - opengl? ( - media-libs/libglvnd[X,${MULTILIB_USEDEP}] - osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] ) - ) - xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) - ) - cups? ( net-print/cups[${MULTILIB_USEDEP}] ) - fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] ) - kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) - netapi? ( net-fs/samba[${MULTILIB_USEDEP}] ) - odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] ) - sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] ) - ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) - truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] ) - udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) - v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) - vulkan? ( media-libs/vulkan-loader[X?,${MULTILIB_USEDEP}] ) -" -WINE_COMMON_DEPEND=" - ${WINE_DLOPEN_DEPEND} - X? ( - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - ) - alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) - capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] ) - gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) - gstreamer? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] - 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}] ) - scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] ) - udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) - unwind? ( - llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] ) - !llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] ) - ) - usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] ) - vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] ) -" -RDEPEND=" - ${WINE_COMMON_DEPEND} - app-emulation/wine-desktop-common - dos? ( - || ( - games-emulation/dosbox - games-emulation/dosbox-staging - ) - ) - gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] ) - gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] ) - mono? ( app-emulation/wine-mono:${WINE_MONO} ) - perl? ( - dev-lang/perl - dev-perl/XML-LibXML - ) - samba? ( net-fs/samba[winbind] ) - selinux? ( sec-policy/selinux-wine ) - udisks? ( sys-fs/udisks:2 ) -" -DEPEND=" - ${WINE_COMMON_DEPEND} - sys-kernel/linux-headers - X? ( x11-base/xorg-proto ) -" -BDEPEND=" - dev-lang/perl - sys-devel/binutils - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) ) - nls? ( sys-devel/gettext ) -" -IDEPEND=">=app-eselect/eselect-wine-2" - -QA_CONFIG_IMPL_DECL_SKIP=( - __clear_cache # unused on amd64+x86 (bug #900338) - res_getservers # false positive -) -QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext - -PATCHES=( - "${FILESDIR}"/${PN}-7.0-noexecstack.patch - "${FILESDIR}"/${PN}-7.0-unwind.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} == binary ]] && return - - if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then - local mingw=-w64-mingw32 - for mingw in $(usev abi_x86_64 x86_64${mingw}) $(usev abi_x86_32 i686${mingw}); do - if ! type -P ${mingw}-gcc >/dev/null; then - eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain" - eerror "yourself by installing sys-devel/crossdev then running:" - eerror - eerror " crossdev --target ${mingw}" - eerror - eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw" - die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found" - fi - done - fi -} - -src_prepare() { - # sanity check, bumping these has a history of oversights - local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \ - dlls/appwiz.cpl/addons.c || die) - if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then - local gmfatal= - [[ ${PV} == *9999 ]] && gmfatal=nonfatal - ${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)" - fi - - default - - if tc-is-clang; then - if use mingw; then - # -mabi=ms was ignored by <clang:16 then turned error in :17 - # if used without --target *-windows, then gets used in install - # phase despite USE=mingw, drop as a quick fix for now - sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die - else - # ./configure will fail, abort early - die "building ${PN} with clang is only supported with USE=mingw" - fi - fi - - # ensure .desktop calls this variant + slot - sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die - - # datadir is not where wine-mono is installed, so prefixy alternate paths - hprefixify -w /get_mono_path/ dlls/mscoree/metahost.c - - # always update for patches (including user's wrt #432348) - eautoreconf - tools/make_requests || die # perl - # tip: if need more for user patches, with portage can e.g. do - # echo "post_src_prepare() { tools/make_specfiles || die; }" \ - # > /etc/portage/env/app-emulation/wine-vanilla -} - -src_configure() { - WINE_PREFIX=/usr/lib/${P} - WINE_DATADIR=/usr/share/${P} - - local conf=( - --prefix="${EPREFIX}"${WINE_PREFIX} - --datadir="${EPREFIX}"${WINE_DATADIR} - --includedir="${EPREFIX}"/usr/include/${P} - --libdir="${EPREFIX}"${WINE_PREFIX} - --mandir="${EPREFIX}"${WINE_DATADIR}/man - $(use_enable gecko mshtml) - $(use_enable mono mscoree) - --disable-tests - $(use_with X x) - $(use_with alsa) - $(use_with capi) - $(use_with cups) - $(use_with fontconfig) - $(use_with gphoto2 gphoto) - $(use_with gstreamer) - $(use_with kerberos gssapi) - $(use_with kerberos krb5) - $(use_with ldap) - $(use_with mingw) - $(use_with netapi) - $(use_with nls gettext) - $(use_with openal) - $(use_with opencl) - $(use_with opengl) - $(use_with osmesa) - --without-oss # media-sound/oss is not packaged (OSSv4) - $(use_with pcap) - $(use_with pulseaudio pulse) - $(use_with scanner sane) - $(use_with sdl) - $(use_with ssl gnutls) - $(use_with truetype freetype) - $(use_with udev) - $(use_with udisks dbus) # dbus is only used for udisks - $(use_with unwind) - $(use_with usb) - $(use_with v4l v4l2) - $(use_with vkd3d) - $(use_with vulkan) - $(use_with xcomposite) - $(use_with xinerama) - $(usev !odbc ac_cv_lib_soname_odbc=) - ) - - tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097) - filter-lto # build failure - filter-flags -Wl,--gc-sections # runtime issues (bug #931329) - use custom-cflags || strip-flags # can break in obscure ways at runtime - use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} - - # broken with gcc-15's c23 default (TODO: try w/o occasionally, bug #943849) - append-cflags -std=gnu17 - - # temporary workaround for tc-ld-force-bfd not yet enforcing with mold - # https://github.com/gentoo/gentoo/pull/28355 - [[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] && - append-ldflags -fuse-ld=bfd - - # >=wine-vanilla-9 has proper fixes and builds with gcc-14, but - # would rather not have to worry about fixing old branches - append-cflags $(test-flags-CC -Wno-error=incompatible-pointer-types) - - # build using upstream's way (--with-wine64) - # order matters: configure+compile 64->32, install 32->64 - local -i bits - for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do - ( - einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..." - - mkdir ../build${bits} || die - cd ../build${bits} || die - - # CROSSCC_amd64/x86 are unused by Wine, but recognized here for users - if (( bits == 64 )); then - : "${CROSSCC:=${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}" - conf+=( --enable-win64 ) - elif use amd64; then - conf+=( - $(usev abi_x86_64 --with-wine64=../build64) - TARGETFLAGS=-m32 # for widl - ) - # _setup is optional, but use over Wine's auto-detect (+#472038) - multilib_toolchain_setup x86 - fi - : "${CROSSCC:=${CROSSCC_x86:-i686-w64-mingw32-gcc}}" - - # use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu) - if use mingw; then - : "${CROSSCFLAGS:=$( - filter-flags '-fstack-protector*' #870136 - filter-flags '-mfunction-return=thunk*' #878849 - - # some bashrc-mv users tend to do CFLAGS="${LDFLAGS}" and then - # strip-unsupported-flags miss these during compile-only tests - # (primarily done for 23.0 profiles' -z, not full coverage) - filter-flags '-Wl,-z,*' - - # -mavx with mingw-gcc has a history of obscure issues and - # disabling is seen as safer, e.g. `WINEARCH=win32 winecfg` - # crashes with -march=skylake >=wine-8.10, similar issues with - # znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273 - append-cflags -mno-avx #912268 - - CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}" - : "${CROSSLDFLAGS:=$( - filter-flags '-fuse-ld=*' - CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}" - export CROSS{CC,{C,LD}FLAGS} - fi - - ECONF_SOURCE=${S} econf "${conf[@]}" - ) - done -} - -src_compile() { - use abi_x86_64 && emake -C ../build64 # do first - use abi_x86_32 && emake -C ../build32 -} - -src_install() { - use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install - use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last - - # symlink for plain 'wine' and install its man pages if 64bit-only #404331 - if use abi_x86_64 && use !abi_x86_32; then - dosym wine64 ${WINE_PREFIX}/bin/wine - dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader - local man - for man in ../build64/loader/wine.*man; do - : "${man##*/wine}" - : "${_%.*}" - insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1 - newins ${man} wine.1 - done - fi - - use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \ - "${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die - - # create variant wrappers for eselect-wine - local bin - for bin in "${ED}"${WINE_PREFIX}/bin/*; do - make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}" - done - - # don't let portage try to strip PE files with the wrong - # strip executable and instead handle it here (saves ~120MB) - if use mingw; then - dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows - use debug || - find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \ - -exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} + || die - fi - - dodoc ANNOUNCE AUTHORS README* documentation/README* -} - -pkg_postinst() { - if use abi_x86_32 && { use opengl || use vulkan; }; then - # difficult to tell what is needed from here, but try to warn - if has_version 'x11-drivers/nvidia-drivers'; then - if has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'; then - ewarn "x11-drivers/nvidia-drivers is installed but is built without" - ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit" - ewarn "applications under ${PN} will likely not be usable." - ewarn "Multi-card setups may need this on media-libs/mesa as well." - fi - elif has_version 'media-libs/mesa[-abi_x86_32]'; then - ewarn "media-libs/mesa seems to be in use but is built without" - ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit" - ewarn "applications under ${PN} will likely not be usable." - fi - fi - - eselect wine update --if-unset || die -} - -pkg_postrm() { - eselect wine update --if-unset || die -} diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild index 95f7ef5d7382..1a8afb08db8d 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -144,6 +144,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}-10.0-binutils2.44.patch ) pkg_pretend() { diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild index 0ee385cb279a..300262a71242 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -161,6 +161,7 @@ PATCHES=( "${FILESDIR}"/${PN}-7.0-noexecstack.patch "${FILESDIR}"/${PN}-7.20-unwind.patch "${FILESDIR}"/${PN}-8.13-rpath.patch + "${FILESDIR}"/${PN}-10.0-binutils2.44.patch ) pkg_pretend() { diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index d653eed512f5..a3201550680a 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -364,28 +364,8 @@ src_install() { use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last - # Ensure both wine64 and wine are available if USE=abi_x86_64 (wow64, - # -abi_x86_32, and/or EXTRA_ECONF could cause varying scenarios where - # one or the other could be missing and that is unexpected for users - # and some tools like winetricks) - if use abi_x86_64; then - if [[ -e ${ED}${WINE_PREFIX}/bin/wine64 && ! -e ${ED}${WINE_PREFIX}/bin/wine ]]; then - dosym wine64 ${WINE_PREFIX}/bin/wine - dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader - - # also install wine(1) man pages (incl. translations) - local man - for man in ../build64/loader/wine.*man; do - : "${man##*/wine}" - : "${_%.*}" - insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1 - newins ${man} wine.1 - done - elif [[ ! -e ${ED}${WINE_PREFIX}/bin/wine64 && -e ${ED}${WINE_PREFIX}/bin/wine ]]; then - dosym wine ${WINE_PREFIX}/bin/wine64 - dosym wine-preloader ${WINE_PREFIX}/bin/wine64-preloader - fi - fi + # "wine64" is no longer provided, but a keep symlink for old scripts + use abi_x86_64 && dosym wine ${WINE_PREFIX}/bin/wine64 use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \ "${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die |