diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-05-08 00:00:57 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-05-08 00:00:57 +0100 |
commit | 5181ced3f3566a9610b85922b083c8f84f20d78f (patch) | |
tree | d7eb288527e8bc248dd17ff874995d8bffe06704 /app-emulation | |
parent | 7bcfea9c5e79a425a62a66bba477b9d3c0d7fdd0 (diff) |
gentoo auto-resync : 08:05:2024 - 00:00:57
Diffstat (limited to 'app-emulation')
33 files changed, 112 insertions, 820 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz Binary files differindex 230ce9f1a6df..de4a03ed1622 100644 --- a/app-emulation/Manifest.gz +++ b/app-emulation/Manifest.gz diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest index 62a3ffbf8a92..c50879652fc3 100644 --- a/app-emulation/dxvk/Manifest +++ b/app-emulation/dxvk/Manifest @@ -1,21 +1,13 @@ AUX dxvk-1.10.3-gcc13.patch 398 BLAKE2B 48b1f18b8368a7dccdd479df8c37b6667fe918f4c47846e0c9e7bb5f04746fbb773decabd905a4877e1bea42ab9af88d042f667272969e0bda7d44f215d78938 SHA512 e3b84263641c3abb34c31721b29eaa314f02bbd15e1ee5b3e3cefd51f57f9123b2cbb32174ed1806dcb03994ee3db8df3282d5f4791d8f1188c09f7c55cbf113 AUX dxvk-1.10.3-wow64-setup.patch 579 BLAKE2B bebc84f2cdcc32da5cd55db4041a26dd469175932536c02dc1049c95a259e6ab3a59dde507b04c8a29055ac0d8c2c96c2732efa81b5bf5b13c54300732e3d3a4 SHA512 1364feec383902e81a855929273126d519b0033064482a0662eda92569657b1a932bd8bd2584395a746bf14e443d9a9c2d75bf484bbb80654536a6c315ffa5dc +AUX dxvk-2.3.1-gcc14.patch 167 BLAKE2B 3a52e5c02c145dd8732993f540db239ba8d9ef7b3d5546b90b1f64530700f7498e435a0acd0f9faee36138038f9aa374ec2fcf3e154be175892ce4d16b9ae2c5 SHA512 c3c2c16b0adcfbfff23a81c9bca02cc03954536366797688c5cce9e2a0b7dd14a904950e9b4e25a95e10da2a72044c1d6d214831fa639a4705cad46b9a282757 DIST dxvk-1.10.3.tar.gz 1204407 BLAKE2B 3507ffe4abf9c45f2a138b05e7cf706322a6bf3d2e9ae86a9d6216b206c09f79eac696ee7dfe33d0bef55e727f51301c36eb89bfa3b3f429d7d5fafc1eebdcb4 SHA512 8995b231b3f3650beda04c01f30186d10a373075a4774b4ecbfb3bbeb4de99c57555f1db0611e5c61c6a411a7215e0faf228f9861f6b7adae6fc365e8056f7e3 -DIST dxvk-2.2.tar.gz 976671 BLAKE2B 537fb8d8adb69562f8e759c6f68e5ed38a62e6ebcf05d7ed1ea32fef518af30cd53d3ffec0e3dba175d449d80de980585f91bfcf8c3904a08385b17b55b9b63b SHA512 02d066093855c3ecae7123fcaeaa32212e03fcda9556c5b70ff23eadc07240199003b8e4673f5b492487fa6e240d70a36f5b4e60b0f389f422cf4474b7197e2f DIST dxvk-2.3.1.tar.gz 1005669 BLAKE2B d78448fcde9d600f7206dfa606fca4069e7563bb8b181fbc172691d6c45586904ae529550926a03612ed3cc1f2a2dff00990638125c1d7ce6179d3cd3ba8df04 SHA512 085567ac263872eb93d776ce7cf982690603e240a977dbb51ad69344af387fd745536ca62819afd4a809732a6f2d22b36c3df9538decf37dec527973d41e392f -DIST dxvk-2.3.tar.gz 996736 BLAKE2B 55944472726e1d946b84cec386267bb65511c83a18647076b5d76c78d552ad2e4710a125c3e1a9f1c0c65b8de43a122c61aec5873ec0d566a20a1f4a9088f461 SHA512 d60421f6b93e09fb18d7f92f636bb228ec5d9ab6a90ca73e1e3c240c50ad35a90ac25fce1ac3f0a940c4da8e92e1c4267a2c602eaa78ff64db12507cc4d08173 -DIST dxvk-libdisplay-info-275e6459c7.tar.bz2 81172 BLAKE2B 7a1e9e2feeb95e06e9d3f49ad9d14a8a152cca525085e819cda0b69c238fb79dddd6d547cd0f0a4b51dfc1ec74ac4c006345b9fc48563807bc8ab3bab58ea5ff SHA512 794e94e8c16d65901a7b705d1ba3361817b4e9e19e520b1004bcab232d0347f5713594d67f3c2b79d4f86b3012e710c648975547d27a63de043fcbe9e6b7e66d -DIST dxvk-libdisplay-info-d39344f466.tar.bz2 81232 BLAKE2B af76ccd3c40bc953008bc30d222c72f90bdc77f47f767b6e7423efaa0ec89d746396a755160b5470e219a15a0aa392be6066aab12921b45a1adb35d88132cd97 SHA512 79b4bf325cefc39bc587233bd82ff64c927ca5f829b8172d213c3d47af725c8dc7fe33576a8e96a869075ee2a8f00d165f3aa9e6c472e862a47e5c800b2b3315 -DIST dxvk-spirv-headers-0bcc624926.tar.gz 437771 BLAKE2B 08815e36ad99b84777e38ad0c5616b6608a552f993e7f67433f2b8e20de81e9bce41420ac5998f5b67bca70a92ce70aed91b238990bd431c7b97070dfb0c5a60 SHA512 5995cf75d5605d41e9643bca81c195ef5aaa17d596e0282807f6fa8f8c494f7b63a41d611c535ae43dc3d609436aabef1e0d89626f37e6f20bad17b5e122e32c -DIST dxvk-vulkan-headers-85c2334e92.tar.gz 2046570 BLAKE2B 8e7f917d440793d85afae9227514fd97ae6cab6ece53abc54320808c10ddbc84a5421663f6b7549c98fbe8b8144a3c5b8bea73d39e6c99a289c5b0baadf3abd8 SHA512 eb7bcec11fb4e7302411c30501e72d567f481a14098ece9c54c023fe4644298f1c14268ef240cfe73ddb75f9817946513cc2218e34b706ea0be5e94ecbed0f91 -DIST dxvk-vulkan-headers-98f440ce68.tar.gz 1691979 BLAKE2B bf6fd288f16df7adcb5cebeb6e13713db1c26a0b833dead2fb522227861abc60b2d0cda8e3f46f8e89cccb629e01081ba27763989ad6fd336c60a475b198c1c8 SHA512 69238d37d0af0162e0fd68094cd2fa9baa320497d34a9de491dea086c23291d0815b51e89218b1f0ee2b3314cbc8ac1809d6edb15ca51fcb282fe1e2b39a1a77 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-1.10.3-r1.ebuild 4988 BLAKE2B c1a07a25db7117285e6d0ba5bddcc5b9690b9171bf1c887547f6a9e9804bc3366b325859ac4f4d439b702ea38e96c51b5067cc21c354bd98a324430a2166b527 SHA512 8566dad60c3a8cc4e996bd8d1430ad7a62db5eae2860b635a998ea7c87c7f8a9fd2f268b1f736d27addbb3c408dac6ffb7f3993a02fb16d42b9c238f2692a945 -EBUILD dxvk-2.2-r1.ebuild 6586 BLAKE2B 7d4d75ad7d488a505a8d171df94e68442006a1f11070d3a3b932af1e639ec9d1694513f2c56a2084e1c5fdfce6ccecc09bb6f68a68efee4cdf4b015d43f5244e SHA512 3b1559fe19f983566203073d51d7c31cb821240f17f64f755c38b3bc7c97014c35b6b8574633f7096a35921234b14471928ee6fc4312094a88df2d50cc574188 -EBUILD dxvk-2.3.1-r1.ebuild 6628 BLAKE2B 6fcd0155b5a11000473d1405dc9ca0bffa074ab4b8dafd939c3699d8b5f39f531258a30778aa484e2feb65213278f37d03cb62347766ae200754db229932b87d SHA512 788ae1680e206ab956a09fc113095e19cef6ff2c441fc7631b7b1c214b2042edb592d3e7ffb63d174ca959ded7887a062de85e454e81008eba9db3bb420b40a8 -EBUILD dxvk-2.3.ebuild 6586 BLAKE2B 2d47d4e67b6077591f70998f08213cc58d9643f9b2b94eef6a3856fbbc38bbeafc9789bace6df1130ef91eb40e0e489a165ace1755f700644d5849515e034d90 SHA512 2147b8824e0a97ed7718769ed6a6fe0410a21ced0b02f368916dcb9c50d5a90972ab3a53ef56e6b892c244e900acaeb230ab331c0bfa8dc04df7b748f9aa4b5c -EBUILD dxvk-9999.ebuild 6510 BLAKE2B b1a9aa080bc3d5248f79dada103bb2a95e2819dbe2cbd95f5d12491d5d042ad34199117181aee8f47fc50b1a24a217de6f5c09c78c4d76d29ddfdfe1a803067a SHA512 3896cfde2164f297a99cba69f7ea3bad3a068b53f88a944ad94421e571431ed900c85ec052a43b4ee912c7c7ba09157cab80cf92076a416f0c888076056e6232 +EBUILD dxvk-2.3.1-r1.ebuild 6667 BLAKE2B 95e1fae36421057feeaa3074dd7d366f27ba52dfd11ff418f26a162d6897abfed003a2da3c6babced0245af59935a96ff879b21dd5d31d629cc38514199e1a12 SHA512 2c2f5e4655b07abe4fa5d59aa52c7680eb45bbced21b5cc2e5e564690e20ddb2aec4081db12316594762b99a3df3cf861f7619b0679af7901ac856cd1933ac4b +EBUILD dxvk-9999.ebuild 6549 BLAKE2B 74770ccd2d92d397c94ce43096a778b9703a40909175a56ee7257e0c124559692fde5405cc90466f0ebd31feae7daab8e2a30c177831796a0df31f21173ff315 SHA512 475805c56371a98c86b17e3403de24f67554d2360e9a9b9251c5a8371743406d4708e6d1647eaf78a764efa2eb6c0f38954cc2cee7da39205ebef3db00466170 MISC metadata.xml 818 BLAKE2B 88081c074b99329c925174de4b7ff9b2c220ffc67eb64a5324f4eaf2a35f98f06c9978ddc0e929ba76b341a389a8eff025b7aa0a2414e3f7ae496c44a023c65c SHA512 90d76ac3df3abe003371cd25b9cf0e6570a53b371349fb2e048cae1818e51f0482e17b3d5490eb82c57d891bb43c4a7cd41530101b888591719c33c566788e3b diff --git a/app-emulation/dxvk/dxvk-2.2-r1.ebuild b/app-emulation/dxvk/dxvk-2.2-r1.ebuild deleted file mode 100644 index 1d3d3ded718f..000000000000 --- a/app-emulation/dxvk/dxvk-2.2-r1.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -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=0bcc624926a25a2a273d07877fd25a6ff5ba1cfb - HASH_VULKAN=98f440ce6868c94f5ec6e198cc1adda4760e8849 - HASH_DISPLAYINFO=d39344f466caae0495ebac4d49b03a886d83ba3a - 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 - -> ${PN}-spirv-headers-${HASH_SPIRV::10}.tar.gz - https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz - -> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz - https://gitlab.freedesktop.org/JoshuaAshton/libdisplay-info/-/archive/${HASH_DISPLAYINFO}/${PN}-libdisplay-info-${HASH_DISPLAYINFO::10}.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 +d3d9 +d3d10 +d3d11 debug +dxgi" -REQUIRED_USE=" - || ( d3d9 d3d10 d3d11 dxgi ) - 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 -) - -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} - $(meson_use {,enable_}d3d9) - $(meson_use {,enable_}d3d10) - $(meson_use {,enable_}d3d11) - $(meson_use {,enable_}dxgi) - $(usev !debug --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_preinst() { - [[ -e ${EROOT}/usr/$(get_libdir)/dxvk/d3d11.dll ]] && DXVK_HAD_OVERLAY= -} - -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." - elif [[ -v DXVK_HAD_OVERLAY ]]; then - # temporary warning until this version is more widely used - elog "Gentoo's main repo ebuild for ${PN} uses different paths than most overlays." - elog "If you were using symbolic links in wine prefixes it may be necessary to" - elog "refresh them by re-running the command:" - elog - elog " WINEPREFIX=/path/to/prefix setup_dxvk.sh install --symlink" - elog - elog "Also, if you were using /etc/${PN}.conf, ${PN} is no longer patched to load" - 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 - 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)" - elog "For details, see: https://github.com/doitsujin/dxvk/wiki/Driver-support" - fi -} diff --git a/app-emulation/dxvk/dxvk-2.3.1-r1.ebuild b/app-emulation/dxvk/dxvk-2.3.1-r1.ebuild index 71e43a8fd5eb..83b5127b668d 100644 --- a/app-emulation/dxvk/dxvk-2.3.1-r1.ebuild +++ b/app-emulation/dxvk/dxvk-2.3.1-r1.ebuild @@ -55,6 +55,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-1.10.3-wow64-setup.patch + "${FILESDIR}"/${PN}-2.3.1-gcc14.patch ) pkg_pretend() { diff --git a/app-emulation/dxvk/dxvk-2.3.ebuild b/app-emulation/dxvk/dxvk-2.3.ebuild deleted file mode 100644 index 2a0cdc34b1a0..000000000000 --- a/app-emulation/dxvk/dxvk-2.3.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -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=0bcc624926a25a2a273d07877fd25a6ff5ba1cfb - HASH_VULKAN=85c2334e92e215cce34e8e0ed8b2dce4700f4a50 - 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 - -> ${PN}-spirv-headers-${HASH_SPIRV::10}.tar.gz - https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz - -> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz - https://gitlab.freedesktop.org/JoshuaAshton/libdisplay-info/-/archive/${HASH_DISPLAYINFO}/${PN}-libdisplay-info-${HASH_DISPLAYINFO::10}.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 +d3d9 +d3d10 +d3d11 +dxgi +strip" -REQUIRED_USE=" - || ( d3d9 d3d10 d3d11 dxgi ) - 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 -) - -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} - $(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_preinst() { - [[ -e ${EROOT}/usr/$(get_libdir)/dxvk/d3d11.dll ]] && DXVK_HAD_OVERLAY= -} - -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." - elif [[ -v DXVK_HAD_OVERLAY ]]; then - # temporary warning until this version is more widely used - elog "Gentoo's main repo ebuild for ${PN} uses different paths than most overlays." - elog "If you were using symbolic links in wine prefixes it may be necessary to" - elog "refresh them by re-running the command:" - elog - elog " WINEPREFIX=/path/to/prefix setup_dxvk.sh install --symlink" - elog - elog "Also, if you were using /etc/${PN}.conf, ${PN} is no longer patched to load" - 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 - 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)" - elog "For details, see: https://github.com/doitsujin/dxvk/wiki/Driver-support" - fi -} diff --git a/app-emulation/dxvk/dxvk-9999.ebuild b/app-emulation/dxvk/dxvk-9999.ebuild index 210cfcc0e294..d5c49f045d48 100644 --- a/app-emulation/dxvk/dxvk-9999.ebuild +++ b/app-emulation/dxvk/dxvk-9999.ebuild @@ -55,6 +55,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-1.10.3-wow64-setup.patch + "${FILESDIR}"/${PN}-2.3.1-gcc14.patch ) pkg_pretend() { diff --git a/app-emulation/dxvk/files/dxvk-2.3.1-gcc14.patch b/app-emulation/dxvk/files/dxvk-2.3.1-gcc14.patch new file mode 100644 index 000000000000..957735b1909e --- /dev/null +++ b/app-emulation/dxvk/files/dxvk-2.3.1-gcc14.patch @@ -0,0 +1,7 @@ +for std::remove_if +--- a/src/d3d9/d3d9_mem.cpp ++++ b/src/d3d9/d3d9_mem.cpp +@@ -5,2 +5,3 @@ + #include "../util/util_likely.h" ++#include <algorithm> + #include <utility> diff --git a/app-emulation/vkd3d-proton/Manifest b/app-emulation/vkd3d-proton/Manifest index 3357d309c28b..e27301080a7f 100644 --- a/app-emulation/vkd3d-proton/Manifest +++ b/app-emulation/vkd3d-proton/Manifest @@ -1,21 +1,12 @@ AUX vkd3d-proton-2.6-wow64-setup.patch 595 BLAKE2B b476f6e9e278b78fc22a41807286ac39bb17bf31c8dc09556ecb2ad64d3bf79a93be6492f9437c10781d7a3302eda19f59bbc396520c52e75126df9c578a6b4f SHA512 e8e71f0da66944444b4ae0b8a9840542a11061cd4607e17debf33a233abb850eb4d4882c2821b8c72c4cbf80b37f0c0877953b3e68e05afd73e35edba31d8e1d DIST dxil-spirv-b03d68d6ed30e87a3bcef9a861fa3c6b4429e5cc.tar.gz 915224 BLAKE2B 137f4b187300261d922ecc66542c5b38e6fa825cbb4e9adb43a7ca15ea9b968e24111bcaf9142782a44a6a7abb342a4ccfbd863af3c01287936e47b6162b7139 SHA512 890c0a0e638b9bffc9ce2cee871c60a2a552d691e60ad6ffa087dfae988e559151b7025e025e4346d1389b7d8f39f8b9bf93e43c7427c883662c1d6c86ff9b1a DIST spirv-headers-8b246ff75c6615ba4532fe4fde20f1be090c3764.tar.gz 472513 BLAKE2B f1ad7e11c306c62509655eb41d74efc5fb88688780d006c6944844e964b339baa000f70e115c4df2947e882c9ac33186e301b31138c38fe5f997f7af7260f521 SHA512 fe1d9d70b217b194c92dd397bca386ce8452bc5ec3967d64a257b3a531386fe6a6ecb5e9ed8ab5bc5a2707c5378f02f05809d6d197dcfb3f87cd33304c3b1959 -DIST vkd3d-proton-2.10.tar.gz 1839493 BLAKE2B 0dd3716bd986a78d8616fdfbe80833379bc93778a8cd599b8874b4bd620a3d5fa2d7ac342305db6acf3bb6025ac7b4ff138b49a30f34fa86f7af3ebb09903100 SHA512 84e9ebf84ac5294baf6d03e1291d7f3c4a004d6dd9da0450319e785827a635b70377855092d750b6c26492d369018585d7ec3cf46ebefc603751e13578bfe333 -DIST vkd3d-proton-2.11.1.tar.gz 1978301 BLAKE2B ede48d1895d2e8bc7f6e5971e6f7c95cc0403a3dad0dc3bdc6e19ecf6f282cd02c8c81371af8499e40d6ef9c055acabd90c8e65cd8b1360bded223864ccc0502 SHA512 91abd9bb854fe701db6e0d8c0a28e630ca23829676e2f74fa1bcd52801c1afef91456355e30a1c8fe27ee282ddf45dab40f28134be1e07f2cb07557112d3fee6 DIST vkd3d-proton-2.12.tar.gz 2109289 BLAKE2B 805298efa2f49a82dcc4b989856fb24469a1de9a1d175d5844be3e72187d14f3454ced52bcd65f557ec6776fda00112f4b9849dd48679e10aadf277d82b928ca SHA512 fbd4102fc9917a8e7c28edcaa500c26352a0652a008da453108cd21325ef2c757b5c0842a50e2e5ea6efcacdabe86b2ce570647313d0036967a135b01850fbe8 DIST vkd3d-proton-2.6.tar.gz 1271948 BLAKE2B 02d2574a66614613748fe3471a6fd5aac2650fdae15a17b17ea2ed028fa53a0579b866e7240036a26108afc343395826474bb99e015b9299c2abec811bb872ab SHA512 6f27d213652e2380a9ba4534ac9ffe4b752b4608fbc2e8acd273fa151ab19ad0b132e3436384d2b8591cd1a59f0b69d342c893dc3a64be85188b5e3274bcf3f1 -DIST vkd3d-proton-dxil-spirv-9044a31d22.tar.gz 876292 BLAKE2B dd55bc2b8125c3ec4639dcb4daa1b17e64824e6abb1e7ca102b2332535a9e5ad5a5af8959cc89cfd11f839ba90ded4614eb22dd5bdbd9b60abd7340d633c1287 SHA512 26a51c9bf7d55e77191d72642d20e98ceee0ffcf359646771cd20de093c670eeff082b80dc868a3e60de0ffb2ec0e0cd1276a39c13238a18282d5cb5a2059602 DIST vkd3d-proton-dxil-spirv-b537bbb91b.tar.gz 631130 BLAKE2B 99f40c5efde87d0af86542b427e5b0429be68ca69ba0c2b6d10a821811756d8dadff4449f268ae404f8ace09a91b3e8aaa135e534a77c0239e58c1a970a044cc SHA512 3c20090b7a1b53c30fd4967622fc7384e1bcc504c30d8075068b87dad1bd2c6f4a12459bf42e61bf76b9dd454ec17a9d529f74ab0d5583627e966d94bb341dc3 -DIST vkd3d-proton-dxil-spirv-d6ffa30abf.tar.gz 783875 BLAKE2B 971a183c84142a4a00858d85c88f48d0c2dd6c4cc7576811c958c03d7f2e8cacb54cf518fa5f3dc0d2e0da681f3a15ab8e7d35ef7bb6df0e5b429e99ccdc9b75 SHA512 68452e28a88b8437ac81479ff2562322de759aafb1e6ac253f84fd43f1d4eb3c677e54da320e5cfc2f569fe15ca7578c0c4af8dc699f51baf597b4796fdd0167 -DIST vkd3d-proton-spirv-headers-1d31a10040.tar.gz 445679 BLAKE2B 3dac88269df92428fd93ca187eb417ec0156ff0b24200daf85526aaa92c30ba8743102764e20c47d783ed0704fa690c1bf60944ef81bbdd296890dde5fb9fcaa SHA512 2536619cd7854954892dbb5ab5cd97e4e95fe3f5c121c4b2022426ae734fc20c1ebadbae1da7689f5ca18397075c54e4f16ad525b8ee873c4b0ffdc07aaacc03 -DIST vkd3d-proton-spirv-headers-aa331ab0ff.tar.gz 448200 BLAKE2B 435e3ce169f44a00181a664a6cb2f3e45e22b3d4ec033d27fb2b54564b4fcc4274ac170f373daddf9ba0bd421b3d50fc87442c15345dae24ec131f4257b33f30 SHA512 1cd6043974daa4cd71138be629544d10944064af8e5b1a5a64e746922edd0d583050ec3b036ef304dd67a689c65541b5cb375d80f26ab3c9314653169cc5aac8 DIST vkd3d-proton-spirv-headers-ae217c1780.tar.gz 415130 BLAKE2B 0c6444c4c1cb43b9c69757d7c2257ce2fe1bc6be308341f3189766f120994e4920bc738b737d9eefc299359dab568fb8809782e3663dd589c0e4d13aecb8873a SHA512 02cf1d63b29e48ef0efe489eb32237ba2f9f4bf58a182b00dc96aab18faba94de79283398e9e945cd81130f83fff228c59b04e496716ea9ccc148a5f4465282c DIST vkd3d-proton-vulkan-headers-83e1a9ed8c.tar.gz 1299014 BLAKE2B 0b1e635aaa6eebec3525b13698a064e0e5b8a78829a772cbe9e1890148059bf396bc5c830e8d6ee3070a3343775991642565283994c65acfa0d82a91590b7d84 SHA512 ecb2158cad55edb4ba069383668f3b311a2f6aa6777b5b7ed94795d454622426ee34fee52b13c97d2f07b5b2f965815ee61a0203b76a0b0d2c708a4786d06b96 -DIST vkd3d-proton-vulkan-headers-a0c76b4ef7.tar.gz 2072604 BLAKE2B 324fe6cc9b803ba5dfa38a3c97d7573cb138f8e0619c0748a096f1a13eb8b608d5a780cb071f3727b0912005a0ab1bc5fd4f1a335ee74d00b44876dfe422f433 SHA512 6f447fef01946849c925634a7caf793e69f3aec52d8de2fa77fe8f5f7675c831fb54a1852cf3326e3909ce43a6f2970dd60c6976ac5d9459ef7bac62583b7ba9 DIST vulkan-headers-f030d9dd8ca297b84b10330cee87f72acc3b0aab.tar.gz 2255357 BLAKE2B 07cfa8ccdd26966116e7c35e0d350be94936469f2b9af77c84b8c61495b6ba76813047b5d26bba1fabd44a8f35396b32b6ad32c3b93b0b1a818ce9ed45f93db2 SHA512 6adf81d16d07710322b7c92a0e0436ee33be94d55116e3c460eabb4196a180f8c7b481c19a84a8bbea4e98dda6cf63ff2876f196348921a0c1d9c8c1005cd521 -EBUILD vkd3d-proton-2.10.ebuild 7966 BLAKE2B a76dd5b1aa26a5003dba7ce9443fe8a28ebd8a856df93ae8148e16b89adc5228848194e234927b87659123937131f9912b00f334de7a6cc99586108be0d477ae SHA512 27ee77843490867cc25256e2922969afd0672eac7d0198b4d78760a24ff81583f936af4338316e2a12ee5f2736b29d79ee81abdd6407fbb0f96ecc135f84b417 -EBUILD vkd3d-proton-2.11.1.ebuild 7661 BLAKE2B 0adfd4fe4e9695f4e91fdd77bff761ab291d82781cf9f073c9364f2d0ac1b997ed30a181dceea9ddd2e4e080d771ca615a6d687327ec2a9ce59452b26513fb18 SHA512 a2c40a23fd6d2d75c992b40960c121f6c9c8efcdba3c3851d30809b5aef89bdb3a811984c0dffbaf6654fda1c5b7cee9e470ca2b590f67ba6e9e5832832f5fe4 EBUILD vkd3d-proton-2.12.ebuild 7797 BLAKE2B 244c709c7dddf6457dad446186c248ed8cb1f7e8fb8061048c9a3a5f096d4f743156534274d6da157a8128a48fb4df260bc71d9c46f038aec3c1fca5d1493a05 SHA512 c46beceb54d66e33dafd95302a3388b2b1ef652742678abbdcfad7493eba475a03dfcb152556a2878d90f8bb02b4db7b0506a9ee9f9db0399f3abb5cdb5aa450 EBUILD vkd3d-proton-2.6-r1.ebuild 6898 BLAKE2B d65133bfa465040c0f8a2c5d148d907ebe063589f5ef3916c39d9441a409d759127561ee006454b75d8eecb36c6a083eefbc0739a2fee06b63f9c0bf7a2a34d8 SHA512 92f849054d2f4e26a5533b8db9417e7baebaaad99fd4393915503b2edc6c25caa7ed99720bf6bc17bd9bc3b065cca8fb61fbb0c77bd2f2036fbd1a4d0ddb19c3 EBUILD vkd3d-proton-9999.ebuild 7599 BLAKE2B 914e57c539f829bdc09b41c38e676e297be8aa8edd83772cb9a9faf0daaa4a7213e36460691b240560b34a1228bd9f1adb2ebc8f6ad1d30fed9885b9bc73c521 SHA512 c5929ab80d96c636e82b03ec4da2d43be30c6b08898e6c03e0f2aad1b388eea5727d8fc3597c4b08167ced0057d915dfe6727eeceea365a34efd68537731ee70 diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-2.10.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-2.10.ebuild deleted file mode 100644 index a8a7ca34700f..000000000000 --- a/app-emulation/vkd3d-proton/vkd3d-proton-2.10.ebuild +++ /dev/null @@ -1,207 +0,0 @@ -# Copyright 2022-2024 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 - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/HansKristian-Work/vkd3d-proton.git" - EGIT_SUBMODULES=( - # uses hacks / recent features and easily breaks, keep bundled headers - # (also cross-compiled and -I/usr/include is troublesome) - subprojects/{SPIRV,Vulkan}-Headers - subprojects/dxil-spirv - subprojects/dxil-spirv/third_party/spirv-headers # skip cross/tools - ) -else - HASH_VKD3D=88e4f300cc0b5b6f0880c1233d562cf506b546fb # match tag on bumps - HASH_DXIL=d6ffa30abfc0fd3dd569af4a4efc9bc9df918d2a - HASH_SPIRV=1d31a100405cf8783ca7a31e31cdd727c9fc54c3 - HASH_SPIRV_DXIL=aa331ab0ffcb3a67021caa1a0c1c9017712f2f31 - HASH_VULKAN=a0c76b4ef76e219483755ff61dce6b67ff79f24b - SRC_URI=" - https://github.com/HansKristian-Work/vkd3d-proton/archive/refs/tags/v${PV}.tar.gz - -> ${P}.tar.gz - https://github.com/HansKristian-Work/dxil-spirv/archive/${HASH_DXIL}.tar.gz - -> ${PN}-dxil-spirv-${HASH_DXIL::10}.tar.gz - https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz - -> ${PN}-spirv-headers-${HASH_SPIRV::10}.tar.gz - https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV_DXIL}.tar.gz - -> ${PN}-spirv-headers-${HASH_SPIRV_DXIL::10}.tar.gz - https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz - -> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz" - KEYWORDS="-* amd64 x86" -fi - -DESCRIPTION="Fork of VKD3D, development branches for Proton's Direct3D 12 implementation" -HOMEPAGE="https://github.com/HansKristian-Work/vkd3d-proton/" - -LICENSE="LGPL-2.1+ Apache-2.0 MIT" -SLOT="0" -IUSE="+abi_x86_32 crossdev-mingw debug extras +strip" - -BDEPEND=" - dev-util/glslang - !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )" - -PATCHES=( - "${FILESDIR}"/${PN}-2.6-wow64-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 enabled, 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 enabled, but ${tool} does not use POSIX threads" - fi - done - tool=-w64-mingw32-widl - for tool in $(usev abi_x86_64 x86_64${tool}) $(usev abi_x86_32 i686${tool}); do - if ! type -P widl >/dev/null && ! type -P ${tool} >/dev/null; then - eerror "With USE=crossdev-mingw, you need to provide the widl compiler by either" - eerror "building crossdev mingw64-runtime with USE=tools or installing wine." - die "USE=crossdev-mingw is set but neither widl nor ${tool} were found" - fi - done - fi -} - -src_prepare() { - if [[ ${PV} != 9999 ]]; then - rmdir subprojects/{{SPIRV,Vulkan}-Headers,dxil-spirv} || die - mv ../dxil-spirv-${HASH_DXIL} subprojects/dxil-spirv || die - mv ../SPIRV-Headers-${HASH_SPIRV} subprojects/SPIRV-Headers || die - mv ../Vulkan-Headers-${HASH_VULKAN} subprojects/Vulkan-Headers || die - - # dxil and vkd3d's spirv headers currently mismatch and incompatible - rmdir subprojects/dxil-spirv/third_party/spirv-headers || die - mv ../SPIRV-Headers-${HASH_SPIRV_DXIL} \ - subprojects/dxil-spirv/third_party/spirv-headers || die -# ln -s ../../../SPIRV-Headers/include \ -# subprojects/dxil-spirv/third_party/spirv-headers || die - fi - - default - - sed -i "/^basedir=/s|=.*|=${EPREFIX}/usr/lib/${PN}|" setup_vkd3d_proton.sh || die - - if [[ ${PV} != 9999 ]]; then - # without .git, meson sets vkd3d_build as 0x${PV} leading to failure - sed -i "s/@VCS_TAG@/${HASH_VKD3D::15}/" vkd3d_build.h.in || die - sed -i "s/@VCS_TAG@/${HASH_VKD3D::7}/" vkd3d_version.h.in || die - fi -} - -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 WIDL - 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}) - - # preferring meson eclass' cross file over upstream's but, unlike - # dxvk, we lose static options in the process (from build-win*.txt) - append-ldflags -static -static-libgcc -static-libstdc++ - - 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 STRIP WIDL - - # prefer ${CHOST}'s widl (mingw) over wine's as used by upstream if - # possible, but eclasses don't handle that so setup machine files - local widl=$(tc-getPROG WIDL widl) - use amd64 && [[ ${widl} == widl && ${ABI} == x86 ]] && widl="widl','-m32" - printf "[binaries]\nwidl = ['${widl}']\n" > "${T}"/widl.${ABI}.ini || die - - local emesonargs=( - --prefix="${EPREFIX}"/usr/lib/${PN} - --{bin,lib}dir=x${ABI: -2} - --{cross,native}-file="${T}"/widl.${ABI}.ini - $(meson_use {,enable_}extras) - $(meson_use debug enable_trace) - $(usev strip --strip) # portage won't strip .dll, so allow it here - -Denable_tests=false # needs wine/vulkan and is intended for manual use - ) - - meson_src_configure -} - -multilib_src_install_all() { - dobin setup_vkd3d_proton.sh - einstalldocs - - 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_vkd3d_proton.sh install --symlink" - elog - elog "Should also ensure that >=app-emulation/dxvk-2.1's dxgi.dll is available" - 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 - - 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 - fi -} diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-2.11.1.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-2.11.1.ebuild deleted file mode 100644 index 9665ed5de725..000000000000 --- a/app-emulation/vkd3d-proton/vkd3d-proton-2.11.1.ebuild +++ /dev/null @@ -1,201 +0,0 @@ -# Copyright 2022-2024 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 - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/HansKristian-Work/vkd3d-proton.git" - EGIT_SUBMODULES=( - # uses hacks / recent features and easily breaks, keep bundled headers - # (also cross-compiled and -I/usr/include is troublesome) - khronos/{SPIRV,Vulkan}-Headers - subprojects/dxil-spirv - subprojects/dxil-spirv/third_party/spirv-headers # skip cross/tools - ) -else - HASH_VKD3D=105b5b77c9a34fd336b5c604e3c7a6cc48f39c3a # match tag on bumps - HASH_DXIL=9044a31d22afff1d75d07886e5096daf5f1ebed8 - HASH_SPIRV=1d31a100405cf8783ca7a31e31cdd727c9fc54c3 - HASH_SPIRV_DXIL=aa331ab0ffcb3a67021caa1a0c1c9017712f2f31 - HASH_VULKAN=a0c76b4ef76e219483755ff61dce6b67ff79f24b - SRC_URI=" - https://github.com/HansKristian-Work/vkd3d-proton/archive/refs/tags/v${PV}.tar.gz - -> ${P}.tar.gz - https://github.com/HansKristian-Work/dxil-spirv/archive/${HASH_DXIL}.tar.gz - -> ${PN}-dxil-spirv-${HASH_DXIL::10}.tar.gz - https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz - -> ${PN}-spirv-headers-${HASH_SPIRV::10}.tar.gz - https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV_DXIL}.tar.gz - -> ${PN}-spirv-headers-${HASH_SPIRV_DXIL::10}.tar.gz - https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz - -> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz" - KEYWORDS="-* amd64 x86" -fi - -DESCRIPTION="Fork of VKD3D, development branches for Proton's Direct3D 12 implementation" -HOMEPAGE="https://github.com/HansKristian-Work/vkd3d-proton/" - -LICENSE="LGPL-2.1+ Apache-2.0 MIT" -SLOT="0" -IUSE="+abi_x86_32 crossdev-mingw debug extras +strip" - -BDEPEND=" - dev-util/glslang - !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )" - -PATCHES=( - "${FILESDIR}"/${PN}-2.6-wow64-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 enabled, 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 enabled, but ${tool} does not use POSIX threads" - fi - done - tool=-w64-mingw32-widl - for tool in $(usev abi_x86_64 x86_64${tool}) $(usev abi_x86_32 i686${tool}); do - if ! type -P widl >/dev/null && ! type -P ${tool} >/dev/null; then - eerror "With USE=crossdev-mingw, you need to provide the widl compiler by either" - eerror "building crossdev mingw64-runtime with USE=tools or installing wine." - die "USE=crossdev-mingw is set but neither widl nor ${tool} were found" - fi - done - fi -} - -src_prepare() { - if [[ ${PV} != 9999 ]]; then - rmdir khronos/{SPIRV,Vulkan}-Headers subprojects/dxil-spirv || die - mv ../dxil-spirv-${HASH_DXIL} subprojects/dxil-spirv || die - mv ../SPIRV-Headers-${HASH_SPIRV} khronos/SPIRV-Headers || die - mv ../Vulkan-Headers-${HASH_VULKAN} khronos/Vulkan-Headers || die - - # dxil and vkd3d's spirv headers currently mismatch and incompatible - rmdir subprojects/dxil-spirv/third_party/spirv-headers || die - mv ../SPIRV-Headers-${HASH_SPIRV_DXIL} \ - subprojects/dxil-spirv/third_party/spirv-headers || die - fi - - default - - sed -i "/^basedir=/s|=.*|=${EPREFIX}/usr/lib/${PN}|" setup_vkd3d_proton.sh || die - - if [[ ${PV} != 9999 ]]; then - # without .git, meson sets vkd3d_build as 0x${PV} leading to failure - sed -i "s/@VCS_TAG@/${HASH_VKD3D::15}/" vkd3d_build.h.in || die - sed -i "s/@VCS_TAG@/${HASH_VKD3D::7}/" vkd3d_version.h.in || die - fi -} - -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 WIDL - 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 STRIP WIDL - - # prefer ${CHOST}'s widl (mingw) over wine's as used by upstream if - # possible, but eclasses don't handle that so setup machine files - local widl=$(tc-getPROG WIDL widl) - use amd64 && [[ ${widl} == widl && ${ABI} == x86 ]] && widl="widl','-m32" - printf "[binaries]\nwidl = ['${widl}']\n" > "${T}"/widl.${ABI}.ini || die - - local emesonargs=( - --prefix="${EPREFIX}"/usr/lib/${PN} - --{bin,lib}dir=x${ABI: -2} - --{cross,native}-file="${T}"/widl.${ABI}.ini - $(meson_use {,enable_}extras) - $(meson_use debug enable_trace) - $(usev strip --strip) # portage won't strip .dll, so allow it here - -Denable_tests=false # needs wine/vulkan and is intended for manual use - ) - - meson_src_configure -} - -multilib_src_install_all() { - dobin setup_vkd3d_proton.sh - einstalldocs - - 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_vkd3d_proton.sh install --symlink" - elog - elog "Should also ensure that >=app-emulation/dxvk-2.1's dxgi.dll is available" - 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 - - 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 - fi -} diff --git a/app-emulation/wine-proton/Manifest b/app-emulation/wine-proton/Manifest index 1d457c92e8de..802e8f6f16ee 100644 --- a/app-emulation/wine-proton/Manifest +++ b/app-emulation/wine-proton/Manifest @@ -10,8 +10,8 @@ AUX wine-proton-9.0-rpath.patch 356 BLAKE2B f988fefb9590d1c8735f480349172b7c7634 DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B f140fcfdd1a47904c34a49d0795fa3326d7cf0d3fac8d6c2ef2a4926181a46223f43a2d1ca96c543e800c8c46b2a3cc51ae306a029d68a42608876e869e177d5 SHA512 793bbe2b23042301a1b518717d78cfff01eaffa0388883d010659a45779b9136d33cfac63f0c3fbb1e458953a954b423eb70ac4fa87633352267db890ceb2fef DIST proton-wine-8.0-5c.tar.gz 48710071 BLAKE2B 99627baea6fb3d51231aa1e75a2734c3c1baba88326baf15b3d421d57a00472d25ba51c2140b51152c8aeae7dd240d3d77bb0d8835aa7eb3b745a51be120f8bb SHA512 0cf98d4e67866e55cc8cd5ea8da0d76aee8e37b130b3cbca604083c913e98ddf9038ecd6f9761d2e11443e282b372977400e251456c6d40e1365210c7578234d DIST proton-wine-9.0-1.tar.gz 49048661 BLAKE2B cf237c314e8b222bb36f52f316baae2351a30d22995d610c7977accc9588c474d0e598702000aa81b34fc2f3daeccd09f54ef53b7a2250c0b012ca47d69628eb SHA512 d7d3e4725a86ca120d059e5b8f9760bce45a5db0ae814cd76aa51dc361bb67af9c2834917ddad3858fc324a1d048acdd9942492c77d0f396aae7d537c70e3ca1 -EBUILD wine-proton-7.0.6.ebuild 12133 BLAKE2B accaf50d5d50dbb88ef35e063d731f4e8e66804b9a61996a3a5095b27964fcada1ae4b63adf49fc6a28fab482cd938a59bbe35c14a8aad4ad9fe102e07b50d6e SHA512 f38d002a1efed7729ec12ace2de7ae8e65fe0936f6af589cbd2fe3cf35e711d4835838a0ae20494fadf98daf372842928b0fad995343fe552820848fc350f4ec -EBUILD wine-proton-8.0.5c.ebuild 12747 BLAKE2B e71830e53abeaed3c0c9edfa59783fe8138a55e302c559118cdc218eb62c0d616a6f1ab3ee47f47a5443aa49fe8a802cb0a7931eef70c7b1a99872bfd934c3a5 SHA512 acb393036cad1d16fbeda81d9ebb9134aa176aa22b4565f008d77a881d080e552c240793dab77ed48ac6ef450e09bf745053c88ddd234fdbf07ee12819834d27 -EBUILD wine-proton-9.0.1.ebuild 13708 BLAKE2B a470253e3fcf8956b2a4688bf72cfdeaf94db4c0605ae44613e1fc9cfe8d0cc016ee06b971ca69d2198178e991e0c260a6daf09c34207a691b80ba69d59409d6 SHA512 9a83f047c498f33b5a7141c30b682519f4c5c5e26ade08b4082c57d1e149ae6a3b3c791a794c32c554e72dfa737424d9cd1b1157454bf9f0432e2b5e393a8cab -EBUILD wine-proton-9.0.9999.ebuild 13708 BLAKE2B d758a1b23ee5da6fd9bef21fa49f8345a702c7cc6d397ebf3bc54ff1af8e7031e4cb7d02a40d6a908733b193d91ba64fd92d51533a000cca3ee0a84b782e10a3 SHA512 9231dddf5b5be29096d8fc85ad976867a67f3d09fd0d03b39ec0cce82086efd2f0044730845f4007adeb060ae27e66d52e84a631477d3c52d0db1b9a3b349a88 +EBUILD wine-proton-7.0.6.ebuild 12196 BLAKE2B 68f2110a567890274e45d188fef0c71b2afd1721cc61d89c915adc163e87c5a305b313a402ad4309ba963c4b51cb58e4f49d1e3750d8de3c4afec1d79da08d45 SHA512 212cdf16f1d20fb2a3bf8c555c6e5648c4dc81d988b8809a27ea0f8d45e76bc0d6e6bcd43acd0ccb83c4d2651fd41464e370b140b47396a1c3603b859e435d99 +EBUILD wine-proton-8.0.5c.ebuild 12810 BLAKE2B 4eaedde2a762a780167edf0d6ed3072c6ecf52d47a96b905c2a4074d3746c9892bbe59787ba48a620bf80b6fdeb7be6c9df71f485deda272efc81f7f91f588b4 SHA512 697cb7f3593ce80709327e0fd0396f8c8cb503b4a5d0775be3c017af773c5cfafe1941db9181b5f0761fdfb573ab9d916503565d9802b24be9fe2f7f7747a3e8 +EBUILD wine-proton-9.0.1.ebuild 13711 BLAKE2B e0b0526054fd7a345ea20c45b39b357b28e60cfe7e358cfeb3f81890f038cbacd3d90a738162d3a7c7ac1cfcf8a5602eb8d4fc1083b21b81adc94dab566e9007 SHA512 b16ad2c35689982552e3c04d8e59db125bffd3ab525be9cc9064480d24aa592b989f2884bf64175acc33dcf68aebce5b4b07abf2c28253b7ca97dc02f52b3e59 +EBUILD wine-proton-9.0.9999.ebuild 13771 BLAKE2B 55b8f441d2f27fb6a6438aac114f39266445802a85ec93cc9e6a773ca3816b17034369dd40fcc5fe6a5d194ad6d0feb12b972f376157352ed4ad71488afba696 SHA512 ee33b3cd7d17eb4a2de9e932d6676c8a8b5c273368e200ecc2fe6ac0900d0ced39fdb9b967db410f2ced93766bc2a22d65a5d2c2c777c27cbb60bb8c645dd296 MISC metadata.xml 1593 BLAKE2B 2e07980ce479dbb737394a5b74576925da936ca2ef5c0767b036cad7f56460ae0a6c73e8a416679f512a5195d037329ce9d3ace9808f68e024baf8640f462d94 SHA512 9f99896328a6337e7a2228977a3b7d853e78aef50a19ee40c43d18f657ead529553d7ea788bae1d408bd074f240cb555ba42558a54cd3ff8ab530b167e813d55 diff --git a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild index 25ee6175708f..4820984ae397 100644 --- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild +++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild @@ -242,6 +242,7 @@ src_configure() { 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} 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 9d8a60b340e9..a68574673402 100644 --- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild +++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild @@ -246,6 +246,7 @@ src_configure() { 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} diff --git a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild index 5971fb4a6f56..3826048c0fcc 100644 --- a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild +++ b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild @@ -264,11 +264,10 @@ src_configure() { $(use_with v4l v4l2) $(use_with xcomposite) $(use_with xinerama) - - --without-vosk # unpackaged, file a bug if you need this ) 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 # wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097) diff --git a/app-emulation/wine-proton/wine-proton-9.0.9999.ebuild b/app-emulation/wine-proton/wine-proton-9.0.9999.ebuild index fda342d879f2..4cabfe3111be 100644 --- a/app-emulation/wine-proton/wine-proton-9.0.9999.ebuild +++ b/app-emulation/wine-proton/wine-proton-9.0.9999.ebuild @@ -269,6 +269,7 @@ src_configure() { ) 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 # wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097) diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest index 0755d469d080..ddd1dd5e92ec 100644 --- a/app-emulation/wine-staging/Manifest +++ b/app-emulation/wine-staging/Manifest @@ -1,6 +1,7 @@ AUX wine-staging-7.17-noexecstack.patch 223 BLAKE2B 6e6cfc208f11c2c2b7bbc392e3703c50669ba9abf088dac0dd7aa8d6e59fcdd6656f5ad6955e4ef87c25d6f4082d83af71a09b2928934222b25847b8b2b5089f SHA512 43fc5c50c33e09f028c2369a660499fbb6c240931c6b7d44c4e838deee1df0390706967b375d36ee8eea339e86a5af1c7a49a76d884860c045c3476d8c8d2a5f AUX wine-staging-7.20-unwind.patch 1450 BLAKE2B 80e9222c95393aaa4b95e05597a4181030fc988d95e416d2f92631f29f640b9abb3dd0853d005de4725b41c09224e478741902075259d48a30830a923790579f SHA512 e1a72f1463be32975daa02064acb96189cd79cb41ff98f89b58e46c97100a3ac46405b1b9982378c9de275acbdb74168853e47b932e06398cdd2981b23f483ce AUX wine-staging-8.13-rpath.patch 554 BLAKE2B 209d8c581a9178242ee622338c5252f79b798cf5574f72b3984d71b7933e011b488060502715aa75630fbc3d10fcb03743ac31ed31664cacfc22b725253a117b SHA512 bbb25e02d19bd7c1a1f2d7db331d93cfcd5ce9172206ad9e19a44c52e5ece865d474eac024c2a5791dfa006c6efe0f68cd783ffc925ac793bf447d56090bdd02 +AUX wine-staging-9.8-musl-ioctls-header.patch 938 BLAKE2B a101f1fc7a6bcd6e8c22ce7f79f66b16be194732b7c354ba7f23aa33e9b0a938913449906b42580cf1fd8089e412cb6d049899d9f5a7d3ddb248901533e966e6 SHA512 f05cc3c37dc955e44aaa60366c945778567dd4bad6cc33e54af9debc1d35b0c27181deddbb6b951cb894707294a47b711042430cce8be794fcba6aa6994788df DIST wine-9.0.tar.xz 30007216 BLAKE2B cf53177201a2f7eeb35d0d8ce220f80808d979099a928ad60652d1dee92620c433cc105dffab4e9309f41766087ad1544ef49d2922538bb420d62f6dd64117a1 SHA512 838daf2c4581f83f8573b988036f517d57b84894b090a2a17433255d6d044dfa880e6724cdb83082a36c333df9d2083ab68ae53927622a620edd59f33462ada4 DIST wine-9.5.tar.xz 30371420 BLAKE2B c14ebf02f0f5b91bc2b2517ff3630f22c6af7fdc827c5d024d809a383a65446284a5349c8109835112f5353f361088f4f32de1a3d04299fbf39deacbc0e8e8bf SHA512 8ccad8f6e6b1428886dee9fae771796e2021b4122cd96464350352bede25421406e6a6a0fdd63d8b99b896db8dc529aa6e05d6ac7966bee49ce3055b18a8af91 DIST wine-9.6.tar.xz 30261488 BLAKE2B 53115a8a80593856679718b2055340860221701bc82a784a111a992f5e67b031d7407a16f6df6d4da67f382f30c35d2dd82af2a671a058a76b621c91199e426e SHA512 cc2ea5597636da8d392d1d63b9c135679eff69ea671dc6b53b6f2d44a890aee0e17275174485f6e8dd99c7db737eb82a800a2b05c4966f15e28167c5a6098922 @@ -11,10 +12,10 @@ DIST wine-staging-9.5.tar.gz 9526239 BLAKE2B a6f5a351a3979fc81a0d8c6325da4f08021 DIST wine-staging-9.6.tar.gz 9522775 BLAKE2B 5598d408774e3142d6de5ccddccb68d8e1e4544c43b5691751599e6b86df6b8899f6113b8b58d75fb8e032a6c7aed9ffbb3ecb1553aa2d7593d69513e9a0177a SHA512 83691eb560c860d40669a524196a522007c76420b5b5076da4f446a4180fee7558ef228cf1f4179eb78a6d36c8ab78fd2784ffc879b0aacbef7c72a7f88e7ed2 DIST wine-staging-9.7.tar.gz 9573710 BLAKE2B 34eee97f51268c07d649f0ed498b5e92bbc8bb1d8cee860040ee660d968307a7d9d3b59305567c50338d2ce97b3071f615b8782ca74716b42904ae4514404316 SHA512 3c5f100f715c6b3399c356b304b8eca1e51706e03782f2f834965474a7efeca4174ae806dff85080cded93501e9cfcd097eca43230d9425c78ae73a6f4485c76 DIST wine-staging-9.8.tar.gz 9580231 BLAKE2B 74d0b7d4eb49b5cb16abf17a2aae52bad9db04d3e207762f1d37a9f18870683c0115ce41b29e24edad827557de4a07235980588115b61fa86eeaaa5573460535 SHA512 8132c1fd98b55ef04993e894e11063e43ac1cae059f80e0dc3b2a4c6bf08a6ab80f7bdd02b97f62733f31850b41e5d2d6c5085b22bf873fc03ab67b79bdd3c1d -EBUILD wine-staging-9.0.ebuild 15140 BLAKE2B 9cf2b75ba5e6bb5e848b4613efe79e648811b7dde47101c6127b51feaf6aa9e8e265eeec6c52a1936526e1802aeebbd46d1209f535f00bfb4189e6afb62f61eb SHA512 9e5daf00b51c77d63678b335ceb3f83bd0a855cf9c3e04fdd8922edd833795f084a25fb75eebee708a94278f41ad6b45258ebce10d302d1e2d8a27227a01478f -EBUILD wine-staging-9.5.ebuild 15270 BLAKE2B 42149c5410f49fcdd3b7ba420c31cedb1b2f5ef0250304a519231d45ba34de1fb46046c8306ba751f5a24e8b472203533de950adb98d1b8b94ab28a6c59389f5 SHA512 85260163a4e5198662fc7a14760a123fb5307a6f05eb7350462733f7df97b22f351ab9fc8c34a1f4291e1e524dffcefe47fbb205fefb1b4e1b8fadc1fd6f0cbb -EBUILD wine-staging-9.6.ebuild 15088 BLAKE2B 4d1c0dd32324c5f627712c6804ac09d625337b862a807eb7b51a3ae67c9ba6f86816a258881f07470263f505d1269b0c70f4791669691425c959d9136288d9ef SHA512 8bfcdf1450ff8b7b36b1245d9056482f455404bd56c5e4dc9589e08a1a69654a3bb30d041741faedfe9ae94928269b8ea7027f0d20e584ba67c4bc27f69a489b -EBUILD wine-staging-9.7.ebuild 15088 BLAKE2B 4d1c0dd32324c5f627712c6804ac09d625337b862a807eb7b51a3ae67c9ba6f86816a258881f07470263f505d1269b0c70f4791669691425c959d9136288d9ef SHA512 8bfcdf1450ff8b7b36b1245d9056482f455404bd56c5e4dc9589e08a1a69654a3bb30d041741faedfe9ae94928269b8ea7027f0d20e584ba67c4bc27f69a489b -EBUILD wine-staging-9.8.ebuild 15088 BLAKE2B 16b1ae3566de27f2dd20952230ace5c8ec1bf1b929ae44443907b312ca676ace0e37937885027677ed347e6b5f48265d79dc90ac0d14d85e97d583bd6bb671ba SHA512 96ed03f1a75616129ae32a235662945ad5d3376ba12960b479a2a79caf16e94fa1717d1488edc8c1dc86023916a400dedc4795434a4610ad36f9162b7f20daa4 -EBUILD wine-staging-9999.ebuild 15088 BLAKE2B 16b1ae3566de27f2dd20952230ace5c8ec1bf1b929ae44443907b312ca676ace0e37937885027677ed347e6b5f48265d79dc90ac0d14d85e97d583bd6bb671ba SHA512 96ed03f1a75616129ae32a235662945ad5d3376ba12960b479a2a79caf16e94fa1717d1488edc8c1dc86023916a400dedc4795434a4610ad36f9162b7f20daa4 +EBUILD wine-staging-9.0.ebuild 15203 BLAKE2B ab543044224b88e09dbec6563bb3e55b92d8ff336b88e612a48a541d8431ae887fd795bec803a6dfe29a7d9deb5cc452861e1e226dd0a854be463dda3f8a261e SHA512 e4236a6e50635f36056061d3085b9c6adf548f37ab535735fab1c1b9660262c964c351ef9803f04d7a05f04665ccb18638744efadfc82c77d4c210107417f776 +EBUILD wine-staging-9.5.ebuild 15333 BLAKE2B 5e3c6de2b94c062fb5d2b09bc2075aebbf43fa2ad34ff390c7fd1455b7cacc0ebfd950d0419a79c2ffde691764881785a906959facde8984cbe718575b0ef116 SHA512 fcecea87be0777864db343caf2218cb71db93f490fe7ac39fce8d2f6c2c4755a56a98948fa50b9e4ca328b6ceeb3d677ca546bfe115119f8887fe3ab32e435cf +EBUILD wine-staging-9.6.ebuild 15151 BLAKE2B 8a95266c25196c7c6ba30ab59a40eac66542e5bb0a6bd2f7f22b490005538d41ab4b8cc085ef505f2f5221f0785cd8ca7923839043be909997cf2586b38a9430 SHA512 a2e9e7ab2dbf81b5495d0b0de3efccda109157a5bb2701b8b03f7b6274dc821002448f787d539ca3fdb578d423231cdcf47066573d99da5b3d808b00a2d8e2ca +EBUILD wine-staging-9.7.ebuild 15151 BLAKE2B 8a95266c25196c7c6ba30ab59a40eac66542e5bb0a6bd2f7f22b490005538d41ab4b8cc085ef505f2f5221f0785cd8ca7923839043be909997cf2586b38a9430 SHA512 a2e9e7ab2dbf81b5495d0b0de3efccda109157a5bb2701b8b03f7b6274dc821002448f787d539ca3fdb578d423231cdcf47066573d99da5b3d808b00a2d8e2ca +EBUILD wine-staging-9.8.ebuild 15196 BLAKE2B 438b05bcc05584d104d94881859bf5b3960562b95e4a5388aa580502b91550352e339c74df3ab970aca7b78012903a67f295a24e83cca354a55d8e8147f8a698 SHA512 0ca4b3f5375cf020080bfc27de9cc3dcd8a51ed9159274c5b92987521433a83aaf1afb7af8b5cc2ba2f5c172a617f4448daf537a72067134f743f6f99b2bf8b0 +EBUILD wine-staging-9999.ebuild 15151 BLAKE2B 9d417a3a467e4e6f217f47fe02c6ed76ceecd76c03ddf6d91a000bfeedd27047b784f6a8557cfd889b64f5fc03bbcfc39bcd61e9d676af75776abd3987856a86 SHA512 ffdcb33f7b6fac64d938644f52aee18154625337fbcaf959e821627028d09d8fe1cbdbc5b04a72766704f44f59d0e9922ff691b78518b15ad07cb0b4906ea7c0 MISC metadata.xml 2659 BLAKE2B 8a80b12643e82b98b71bc408e2fd79736da01c8f7d914c7a592cb685893ea3896bc44fecf0160faec803b284d3f6bb38cf36fb4745d9d43e0e1ced8702fcaf9d SHA512 a271e537318a4e90236c195f1f8c24c3255b5465345246627797d37238e2b6292d0734a9ab19542ee34fc1e9312dc4418694992f5ce3c53310228cc6bf14ef90 diff --git a/app-emulation/wine-staging/files/wine-staging-9.8-musl-ioctls-header.patch b/app-emulation/wine-staging/files/wine-staging-9.8-musl-ioctls-header.patch new file mode 100644 index 000000000000..7aa1a4c00587 --- /dev/null +++ b/app-emulation/wine-staging/files/wine-staging-9.8-musl-ioctls-header.patch @@ -0,0 +1,30 @@ +https://bugs.gentoo.org/931341 +https://gitlab.winehq.org/wine/wine/-/commit/24ca848c568d5a2786abd26f2e7314b2e3f509f3 +From: Fotios Valasiadis <fvalasiad@gmail.com> +Date: Sun, 5 May 2024 03:34:57 +0300 +Subject: [PATCH] ntdll/unix: Fix building on musl by explicitly including + asm/ioctls.h. + +After commit 898ab8dab19d498c17859f39a55e317ee7e367a5 wine would no longer +build on musl. + +Issue is that apparently TCSETS2 isn't defined when including sys/ioctl.h. + +A little digging shows that glibc goes ahead and includes asm/ioctls.h in +sys/ioctl.h, providing said macro. Musl on the other hand doesn't and relies +on bits/ioctl.h, which lacks said macro. + +Signed-off-by: Fotios Valasiadis <fvalasiad@gmail.com> +--- a/dlls/ntdll/unix/serial.c ++++ b/dlls/ntdll/unix/serial.c +@@ -33,6 +33,7 @@ + #include <stdio.h> + #ifdef HAVE_ASM_TERMBITS_H + # include <asm/termbits.h> ++# include <asm/ioctls.h> + #else + # include <termios.h> + #endif +-- +GitLab + diff --git a/app-emulation/wine-staging/wine-staging-9.0.ebuild b/app-emulation/wine-staging/wine-staging-9.0.ebuild index 537675f10ba0..d2133a1ead43 100644 --- a/app-emulation/wine-staging/wine-staging-9.0.ebuild +++ b/app-emulation/wine-staging/wine-staging-9.0.ebuild @@ -325,6 +325,7 @@ src_configure() { ) 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 # wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097) diff --git a/app-emulation/wine-staging/wine-staging-9.5.ebuild b/app-emulation/wine-staging/wine-staging-9.5.ebuild index 08b56968b3ac..ca1f794f201c 100644 --- a/app-emulation/wine-staging/wine-staging-9.5.ebuild +++ b/app-emulation/wine-staging/wine-staging-9.5.ebuild @@ -325,6 +325,7 @@ src_configure() { ) 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 # wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097) diff --git a/app-emulation/wine-staging/wine-staging-9.6.ebuild b/app-emulation/wine-staging/wine-staging-9.6.ebuild index 2c9f8fc4ef2a..3c4de14f4d45 100644 --- a/app-emulation/wine-staging/wine-staging-9.6.ebuild +++ b/app-emulation/wine-staging/wine-staging-9.6.ebuild @@ -320,6 +320,7 @@ src_configure() { ) 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 # wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097) diff --git a/app-emulation/wine-staging/wine-staging-9.7.ebuild b/app-emulation/wine-staging/wine-staging-9.7.ebuild index 2c9f8fc4ef2a..3c4de14f4d45 100644 --- a/app-emulation/wine-staging/wine-staging-9.7.ebuild +++ b/app-emulation/wine-staging/wine-staging-9.7.ebuild @@ -320,6 +320,7 @@ src_configure() { ) 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 # wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097) diff --git a/app-emulation/wine-staging/wine-staging-9.8.ebuild b/app-emulation/wine-staging/wine-staging-9.8.ebuild index f4a2a5ce7f73..5bf74a8b36bc 100644 --- a/app-emulation/wine-staging/wine-staging-9.8.ebuild +++ b/app-emulation/wine-staging/wine-staging-9.8.ebuild @@ -177,6 +177,7 @@ PATCHES=( "${FILESDIR}"/${PN}-7.17-noexecstack.patch "${FILESDIR}"/${PN}-7.20-unwind.patch "${FILESDIR}"/${PN}-8.13-rpath.patch + "${FILESDIR}"/${P}-musl-ioctls-header.patch ) pkg_pretend() { @@ -320,6 +321,7 @@ src_configure() { ) 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 # wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097) diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index f4a2a5ce7f73..f0ed10e52b22 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -320,6 +320,7 @@ src_configure() { ) 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 # wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097) diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest index ff2a2e2606dd..94087430c92f 100644 --- a/app-emulation/wine-vanilla/Manifest +++ b/app-emulation/wine-vanilla/Manifest @@ -2,6 +2,7 @@ AUX wine-vanilla-7.0-noexecstack.patch 223 BLAKE2B dff1867e2977bd14fcfab9dfa2c2f 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 +AUX wine-vanilla-9.8-musl-ioctls-header.patch 938 BLAKE2B a101f1fc7a6bcd6e8c22ce7f79f66b16be194732b7c354ba7f23aa33e9b0a938913449906b42580cf1fd8089e412cb6d049899d9f5a7d3ddb248901533e966e6 SHA512 f05cc3c37dc955e44aaa60366c945778567dd4bad6cc33e54af9debc1d35b0c27181deddbb6b951cb894707294a47b711042430cce8be794fcba6aa6994788df 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 @@ -9,12 +10,12 @@ DIST wine-9.5.tar.xz 30371420 BLAKE2B c14ebf02f0f5b91bc2b2517ff3630f22c6af7fdc82 DIST wine-9.6.tar.xz 30261488 BLAKE2B 53115a8a80593856679718b2055340860221701bc82a784a111a992f5e67b031d7407a16f6df6d4da67f382f30c35d2dd82af2a671a058a76b621c91199e426e SHA512 cc2ea5597636da8d392d1d63b9c135679eff69ea671dc6b53b6f2d44a890aee0e17275174485f6e8dd99c7db737eb82a800a2b05c4966f15e28167c5a6098922 DIST wine-9.7.tar.xz 30281616 BLAKE2B 4d27f6f2dfd088a0590bfce7228c7eca25b66a9a04706ddecb25af6364e83100c15a78c8d46f3294a42dc7f3503756506f752a02d7058a72ce16716994b334bc SHA512 0c15c3a0901162a386126f2dc987b276b379cc027fc72d9e31cf3122614742f876f30a5f24a495f546cd9c5bd5efce096bd9ca190d0f378fea3d42a298a06e80 DIST wine-9.8.tar.xz 30297460 BLAKE2B 689d1b4e55f7d66b8fad8432ad35a52e2fad303e8a9382b8893222c696697efa5de5b56cc2b933bed96d6382f9fdc919fa15e6517ffdb50105cdaea904a7d77f SHA512 3d1b0e6b7b633a0b45ba6b23e741e808dec29355721baf4489c3ad34c67d714b40897ef510c4a84f31be390d7f8b86b93a725787d733eaf77df5c82b322d2662 -EBUILD wine-vanilla-7.0.2.ebuild 12259 BLAKE2B ef6935304df1cf45bbdc4c2e53c2206999d2fa077196a72d32428a246b743b40cf08894cc22c11f803c44eae82119c7494091ea2a02e101309f8e966c67cba36 SHA512 0807bc326a4d8c3d09f65908cdd0074cfbba119d9119d47f1d6b075a00f7aec6689b9c2dd34984bff877cdaf3e2670e83e061abafebb986383525debe150ee5f -EBUILD wine-vanilla-8.0.2.ebuild 12347 BLAKE2B d05c298ebde69ccd30ca0f95d3650fda262a85d283655220dc62911b7b5e9472d8b92b7155c48737ed0c1d459b41a49e5fed1d877d982d9e34ed3adc9fc6d0f6 SHA512 0edf660e07380c61402e23a5b09f230c0d9872be915e12edf3bc40a10b1a894245f2a3208b01babeaa6251fe45e7add8c94ab294935b1a1d9eaae259a0f7ea2d -EBUILD wine-vanilla-9.0.ebuild 13624 BLAKE2B 30440f86b3ac4249110cbaaeb87857c1ab887b238934433194f3adf6de1ad7d5bfe4c50d7d7acb5d22362c2b0b23c0e8a3ce0bf62252e15c847eb3826398b23d SHA512 7f75b451702d86706e0fdecb4ef2395c5873d254892a94c616a6a9812dd9d5c751cebc255e2d5bdde852468af3dfa55f873e563316f609b5d8afea2fcec1b6e8 -EBUILD wine-vanilla-9.5.ebuild 13756 BLAKE2B 90a043c49e5687f218489eafda64b7da0366716df7cc13ef5505835814eb3aa2092137e285402f04b28a8adacc21a4c8e233cbfccbcd88da326b9fbeac140246 SHA512 1e847fd8d35aa7a91e6567c9990d4a5acd1bff549e492079526299c7924309966b8558747d516c2ee708a4cc5615b7accce69a94a5d4fa047b95a4149670fa3e -EBUILD wine-vanilla-9.6.ebuild 13756 BLAKE2B 90a043c49e5687f218489eafda64b7da0366716df7cc13ef5505835814eb3aa2092137e285402f04b28a8adacc21a4c8e233cbfccbcd88da326b9fbeac140246 SHA512 1e847fd8d35aa7a91e6567c9990d4a5acd1bff549e492079526299c7924309966b8558747d516c2ee708a4cc5615b7accce69a94a5d4fa047b95a4149670fa3e -EBUILD wine-vanilla-9.7.ebuild 13756 BLAKE2B 90a043c49e5687f218489eafda64b7da0366716df7cc13ef5505835814eb3aa2092137e285402f04b28a8adacc21a4c8e233cbfccbcd88da326b9fbeac140246 SHA512 1e847fd8d35aa7a91e6567c9990d4a5acd1bff549e492079526299c7924309966b8558747d516c2ee708a4cc5615b7accce69a94a5d4fa047b95a4149670fa3e -EBUILD wine-vanilla-9.8.ebuild 13756 BLAKE2B 96dc89f3afee5c696d933c9cba9e997cecad742b0ff29596179907685c65cd6280267f9f04e4f2e88e2b78d5d8c8a8bed7db99cd449b4bfd2fb903cb99877273 SHA512 7e76432dcf5e726b9a9c19e21c7b41e6733f34eb49e8adc456c5bedbb650f820533a03b6c08cc4c15b101072088720c9cfdfb19f0a31b96842389550ad04ff11 -EBUILD wine-vanilla-9999.ebuild 13756 BLAKE2B 96dc89f3afee5c696d933c9cba9e997cecad742b0ff29596179907685c65cd6280267f9f04e4f2e88e2b78d5d8c8a8bed7db99cd449b4bfd2fb903cb99877273 SHA512 7e76432dcf5e726b9a9c19e21c7b41e6733f34eb49e8adc456c5bedbb650f820533a03b6c08cc4c15b101072088720c9cfdfb19f0a31b96842389550ad04ff11 +EBUILD wine-vanilla-7.0.2.ebuild 12322 BLAKE2B 764435cd9c532ae8fc64557103086dc068ba62efd6f98e14c0d5043cd21b305b59998916abecb04dbff1c0968a24f03908a236f49a27ed775ceeea63d93ea913 SHA512 285604899a9554660069479afdd91ddf2b310fc2281544f8c8691a8d50a2a2e0ba8f2624496b439e83be74d104d9f45b2cec1f25b10c357700e9e44ab2bc0655 +EBUILD wine-vanilla-8.0.2.ebuild 12410 BLAKE2B 4b98a14f4fc3676b6716ad43c53b4f9e2afe799200be8e5cf529b071273e1efd2530e03e92a7f4652d7249b771d3bbf2ebfe4afdcd68f4bf6fc70affe65300f4 SHA512 4e843ee0aae81c966095063f0350da599620a8b00a429c4fc2d20eada04b4c4c545675d670bd314de95fe2a75381f8f660b5b77437cd2accbe2c053fe3e794ca +EBUILD wine-vanilla-9.0.ebuild 13687 BLAKE2B 29ed04e9b3655463b32a146f3586f1f39bc45bd249933ef4b15530477f588850f97c04d2640e76bb6dd695c23267f6715347cc8e9c2e985800a7a8de5d04d66d SHA512 d3e13b460001b4793e92b886d021e7b8368c1963b11d479da35dbe48d20280aa2bf501ea4d649e21586869b31df0c363cf5784caa118dcc0ea5f8d54e59104e6 +EBUILD wine-vanilla-9.5.ebuild 13819 BLAKE2B f477e1fcbd73bc019e3828ca4236e4275be6b428b6c6eeded8254e6608d4a02d062ecddb90b2c0417c4df4dd34bb638d6a8a7982edafaf8f9ed5399626b65ffa SHA512 5cccc54e4335cd0e0447da4e5746a8aa7e3574176f082f288eee73afb723acd3df9f34d08a8ab816075dd205d99f20e4d695b23fa7e8b619363a1c1cb97095dc +EBUILD wine-vanilla-9.6.ebuild 13819 BLAKE2B f477e1fcbd73bc019e3828ca4236e4275be6b428b6c6eeded8254e6608d4a02d062ecddb90b2c0417c4df4dd34bb638d6a8a7982edafaf8f9ed5399626b65ffa SHA512 5cccc54e4335cd0e0447da4e5746a8aa7e3574176f082f288eee73afb723acd3df9f34d08a8ab816075dd205d99f20e4d695b23fa7e8b619363a1c1cb97095dc +EBUILD wine-vanilla-9.7.ebuild 13819 BLAKE2B f477e1fcbd73bc019e3828ca4236e4275be6b428b6c6eeded8254e6608d4a02d062ecddb90b2c0417c4df4dd34bb638d6a8a7982edafaf8f9ed5399626b65ffa SHA512 5cccc54e4335cd0e0447da4e5746a8aa7e3574176f082f288eee73afb723acd3df9f34d08a8ab816075dd205d99f20e4d695b23fa7e8b619363a1c1cb97095dc +EBUILD wine-vanilla-9.8.ebuild 13864 BLAKE2B b6a72239026a77893502065b23b11e25e0088859236b5f719c3dc69ffafec80efbd8adfb18444c2449759d7591a49603cd73964ee6f99e1a0ed4566dd2e0c71f SHA512 6fe9173b3490ecf89d2891cc8e4733178c25c0ffddbb0c657f1d79a9e2e3cbfc94ed4584d471206575d4a07e9c4e4c6152cd5cab7ef8f227dcbb2d534a42d0bc +EBUILD wine-vanilla-9999.ebuild 13819 BLAKE2B e2eb8d18951fc020a99d5b29fdebdd5b867a04ccd675ecaaf622486660bf7e8427890b12956b85dc6948ef989352020f0707d33f937ca0c4b2b6a0fba6818f20 SHA512 9bfca4195e50e52bdd9d83e432a8cac7a6fe0c7f59138d6374398e5f8c6888582f5d3fa9801ba6b858ec095b41869ee8d961b0bbfa2688547fe2afb2283465cd MISC metadata.xml 2726 BLAKE2B 7dc7490fabcda06a27061726225890ee203fe7d22209697c3997f0ccdb4699bfaa09f983c22c4919ce75d2eab6ebdb1add9d9af04f24aee63bae81116fc04094 SHA512 5cdbb062462ae791ff9727d184935af3af147c0bd1e49846731941513301b720313b3356f56a8295780ab822e3117146c9a669d2d96efba6f072d84adba770e6 diff --git a/app-emulation/wine-vanilla/files/wine-vanilla-9.8-musl-ioctls-header.patch b/app-emulation/wine-vanilla/files/wine-vanilla-9.8-musl-ioctls-header.patch new file mode 100644 index 000000000000..7aa1a4c00587 --- /dev/null +++ b/app-emulation/wine-vanilla/files/wine-vanilla-9.8-musl-ioctls-header.patch @@ -0,0 +1,30 @@ +https://bugs.gentoo.org/931341 +https://gitlab.winehq.org/wine/wine/-/commit/24ca848c568d5a2786abd26f2e7314b2e3f509f3 +From: Fotios Valasiadis <fvalasiad@gmail.com> +Date: Sun, 5 May 2024 03:34:57 +0300 +Subject: [PATCH] ntdll/unix: Fix building on musl by explicitly including + asm/ioctls.h. + +After commit 898ab8dab19d498c17859f39a55e317ee7e367a5 wine would no longer +build on musl. + +Issue is that apparently TCSETS2 isn't defined when including sys/ioctl.h. + +A little digging shows that glibc goes ahead and includes asm/ioctls.h in +sys/ioctl.h, providing said macro. Musl on the other hand doesn't and relies +on bits/ioctl.h, which lacks said macro. + +Signed-off-by: Fotios Valasiadis <fvalasiad@gmail.com> +--- a/dlls/ntdll/unix/serial.c ++++ b/dlls/ntdll/unix/serial.c +@@ -33,6 +33,7 @@ + #include <stdio.h> + #ifdef HAVE_ASM_TERMBITS_H + # include <asm/termbits.h> ++# include <asm/ioctls.h> + #else + # include <termios.h> + #endif +-- +GitLab + diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild index 88eaa6f3c226..583683c9685c 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild @@ -257,6 +257,7 @@ src_configure() { 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} 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 f0641aa921fe..d9243957dadb 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild @@ -251,6 +251,7 @@ src_configure() { 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} diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild index 7326ea74dd64..d17683e5dff0 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild @@ -278,6 +278,7 @@ src_configure() { ) 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 # wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097) diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.5.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.5.ebuild index 162e8b9a993c..bb8117b3b1b3 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9.5.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9.5.ebuild @@ -278,6 +278,7 @@ src_configure() { ) 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 # wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097) diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.6.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.6.ebuild index 162e8b9a993c..bb8117b3b1b3 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9.6.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9.6.ebuild @@ -278,6 +278,7 @@ src_configure() { ) 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 # wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097) diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild index 162e8b9a993c..bb8117b3b1b3 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild @@ -278,6 +278,7 @@ src_configure() { ) 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 # wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097) diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild index 61e41c9d9b98..7a5546bbfd70 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild @@ -161,6 +161,7 @@ PATCHES=( "${FILESDIR}"/${PN}-7.0-noexecstack.patch "${FILESDIR}"/${PN}-7.20-unwind.patch "${FILESDIR}"/${PN}-8.13-rpath.patch + "${FILESDIR}"/${P}-musl-ioctls-header.patch ) pkg_pretend() { @@ -278,6 +279,7 @@ src_configure() { ) 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 # wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097) diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index 61e41c9d9b98..13bbfdc159ea 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -278,6 +278,7 @@ src_configure() { ) 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 # wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097) |