From 643a5121202a0a33fb4d77fbf1c4dde26de3224c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 16 Aug 2023 03:28:34 +0100 Subject: gentoo auto-resync : 16:08:2023 - 03:28:34 --- app-emulation/Manifest.gz | Bin 15340 -> 15333 bytes app-emulation/dxvk/Manifest | 11 +- app-emulation/dxvk/dxvk-1.10.3-r1.ebuild | 148 +++++++++++++++ app-emulation/dxvk/dxvk-1.10.3.ebuild | 147 --------------- app-emulation/dxvk/dxvk-2.0.ebuild | 171 ----------------- app-emulation/dxvk/dxvk-2.1.ebuild | 181 ------------------ app-emulation/dxvk/dxvk-2.2-r1.ebuild | 181 ++++++++++++++++++ app-emulation/dxvk/dxvk-2.2.ebuild | 177 ------------------ app-emulation/dxvk/dxvk-9999.ebuild | 8 +- .../dxvk/files/dxvk-1.10.3-wow64-setup.patch | 14 ++ app-emulation/vkd3d-proton/Manifest | 12 +- .../files/vkd3d-proton-2.6-wow64-setup.patch | 14 ++ .../vkd3d-proton/vkd3d-proton-2.6-r1.ebuild | 182 ++++++++++++++++++ app-emulation/vkd3d-proton/vkd3d-proton-2.6.ebuild | 178 ------------------ app-emulation/vkd3d-proton/vkd3d-proton-2.8.ebuild | 189 ------------------- .../vkd3d-proton/vkd3d-proton-2.9-r1.ebuild | 203 +++++++++++++++++++++ app-emulation/vkd3d-proton/vkd3d-proton-2.9.ebuild | 199 -------------------- .../vkd3d-proton/vkd3d-proton-9999.ebuild | 4 + 18 files changed, 760 insertions(+), 1259 deletions(-) create mode 100644 app-emulation/dxvk/dxvk-1.10.3-r1.ebuild delete mode 100644 app-emulation/dxvk/dxvk-1.10.3.ebuild delete mode 100644 app-emulation/dxvk/dxvk-2.0.ebuild delete mode 100644 app-emulation/dxvk/dxvk-2.1.ebuild create mode 100644 app-emulation/dxvk/dxvk-2.2-r1.ebuild delete mode 100644 app-emulation/dxvk/dxvk-2.2.ebuild create mode 100644 app-emulation/dxvk/files/dxvk-1.10.3-wow64-setup.patch create mode 100644 app-emulation/vkd3d-proton/files/vkd3d-proton-2.6-wow64-setup.patch create mode 100644 app-emulation/vkd3d-proton/vkd3d-proton-2.6-r1.ebuild delete mode 100644 app-emulation/vkd3d-proton/vkd3d-proton-2.6.ebuild delete mode 100644 app-emulation/vkd3d-proton/vkd3d-proton-2.8.ebuild create mode 100644 app-emulation/vkd3d-proton/vkd3d-proton-2.9-r1.ebuild delete mode 100644 app-emulation/vkd3d-proton/vkd3d-proton-2.9.ebuild (limited to 'app-emulation') diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz index cbffde7a3609..2bc4cc723f68 100644 Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest index 5ad9574fec6b..f062d153bc5d 100644 --- a/app-emulation/dxvk/Manifest +++ b/app-emulation/dxvk/Manifest @@ -1,15 +1,12 @@ 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 DIST dxvk-1.10.3.tar.gz 1204407 BLAKE2B 3507ffe4abf9c45f2a138b05e7cf706322a6bf3d2e9ae86a9d6216b206c09f79eac696ee7dfe33d0bef55e727f51301c36eb89bfa3b3f429d7d5fafc1eebdcb4 SHA512 8995b231b3f3650beda04c01f30186d10a373075a4774b4ecbfb3bbeb4de99c57555f1db0611e5c61c6a411a7215e0faf228f9861f6b7adae6fc365e8056f7e3 -DIST dxvk-2.0.tar.gz 943397 BLAKE2B 7d59050e8ac3f9be311d11323cc0057d84c3b730360fe9e064ff4a5e2db5bffea5bae3214da366c60295ec5f1577ab08e2776274c9aaff7a7de1b9f2cefa836a SHA512 98537bdec2b5e4f2ead5b93ab49db717e0706fe771a82a6ef1e5b5792c1bdd3f417cd6b6b2deadb1397b8a0740445fa88b9fb6c1f73510cc5c0e7ae35d65bcac -DIST dxvk-2.1.tar.gz 960078 BLAKE2B ad8ea7eb000237914d9116a8fbfde13fde3dc00d428ebfe41aacb9373c6509112545ef1942b4cbc96a18338c3d07c2c494d0454236721e220ee5f5731a5c27b9 SHA512 10d919ba2612f665a20f7c72605967adeea94d8414bee45878f9df42ad263fa5ebfc7a76319173dce054ffe9b9cdc919ff7a136042f3f4e64142844c943bdef7 DIST dxvk-2.2.tar.gz 976671 BLAKE2B 537fb8d8adb69562f8e759c6f68e5ed38a62e6ebcf05d7ed1ea32fef518af30cd53d3ffec0e3dba175d449d80de980585f91bfcf8c3904a08385b17b55b9b63b SHA512 02d066093855c3ecae7123fcaeaa32212e03fcda9556c5b70ff23eadc07240199003b8e4673f5b492487fa6e240d70a36f5b4e60b0f389f422cf4474b7197e2f 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-98f440ce68.tar.gz 1691979 BLAKE2B bf6fd288f16df7adcb5cebeb6e13713db1c26a0b833dead2fb522227861abc60b2d0cda8e3f46f8e89cccb629e01081ba27763989ad6fd336c60a475b198c1c8 SHA512 69238d37d0af0162e0fd68094cd2fa9baa320497d34a9de491dea086c23291d0815b51e89218b1f0ee2b3314cbc8ac1809d6edb15ca51fcb282fe1e2b39a1a77 DIST setup_dxvk.sh 4631 BLAKE2B 25270e1f6dfd446b1d124eac3bd19da8bc770527d02d987949fc3ae0bead07866dafa25f77a90b9a408413a724354a29a4a156ff5c9dc75e26b66e079824ec86 SHA512 257fd84e29a7037f04a1a2a506502c71d527af58f8c84d8c3dfb64597ebdc41c3dca362eaf20ab4bc1982b76428c1f843815d56a6e1369d072e0009e270cb121 -EBUILD dxvk-1.10.3.ebuild 4749 BLAKE2B fd9cd430c1ba8a26c651d2f48b80bcf342f8f6e29b7e4ef482f040ca6b3e5dec929c5231f261ef19c7b834b4388f9d0ca04326f5a540aa36f9f5c919300739a9 SHA512 39c20df5745c0d900fa203e8c08b4e65843c01f981cbd05bce5526ac9495f97d146b44bebcf64893fd24d4f1305e0bdaf46d48606313ad460c6606dceea8e484 -EBUILD dxvk-2.0.ebuild 5626 BLAKE2B 6b5e635decab96c3f80e28a982d812fc709159cc606ad4c45b4a236e8839dd1bf55481fdf2e4ea38dd3d62e40d7cb627e298513690db86e713b1b04cfa63e05b SHA512 18437696864b04f5ce8869499123976152d7645c51e7a03dae7cb155452a957b90bdeddccaa13ce1cc995ec02052b74bb26dca9bb7eb7fc706561da4f942185a -EBUILD dxvk-2.1.ebuild 6373 BLAKE2B 5fcc8d2d344c62095b6a0fc6378d0c156ffd116f59b9f6d3377c0efedeb4ee18dcaa8918cb992f9b046601f8db0d4cf56cecc6da0c1c5e0664d2d0d1fee471ac SHA512 53e8a705da21c70cef86053c02af443fac029ebc10c093ad23f2b0be6839c35f72f12fb3d13988049a851160debc0071b65d493a16c77c7748e294fd81100e91 -EBUILD dxvk-2.2.ebuild 6320 BLAKE2B 57a49436331be13f9c45299ebb923e95e4106738580ab80b30a288a91ad339b2d59b926d845cd6e2b249669e1d284407c81a446ee0e5ac708007e1143307ed5e SHA512 6426a28d8add392481d5c0d1f60711ecd075f2f10f57b6fd7ea993425471db45da0dd44c27fef6d547fe51fc8d7affc67ba7b3c1270131189de08efd6759c8e4 -EBUILD dxvk-9999.ebuild 6322 BLAKE2B 6982d08a5bc5bcb78dcfacc95c557218f530331fc1e0a78c4df71f55f41f1492049cff14be5298b08bcd13c3bdc327705a33415560f8ecf03e8d104bdd94ebdd SHA512 7c564b73df8d9a75fd09e4b010caebdbd81d5581712cbcb2e28927e6a2ddd253f7b8e210215da25e0e411d9557ae295276e54d10f65cdc0d914c49ed8073fc60 +EBUILD dxvk-1.10.3-r1.ebuild 4795 BLAKE2B 625a38411040ac49cb8545516e2296b92f6a4e78ea2390bd17d48bea9fd15cf0d7ef86fcb81d04fdc93e6df5f9e0eb7f787496db441cabee6607e7b1a93646fb SHA512 54399cf3cac6c57ea602a4a0d19ec9a6a146032a38a3c6402986bef38345557b44906c16637b1b5a94739a8b03cbafe1c8c49c58f1ab4b4ab5912e074720999f +EBUILD dxvk-2.2-r1.ebuild 6395 BLAKE2B 415138de1fb0b958e08dad9fc749ada1aafc195954e46da660699445c8074740d108f45f110e62926b4dcaa8a12f2dc21a37598fa2528e70f5acd80dd95fc6ec SHA512 93831a0628b0bbb82ddfb80b93e1e04ade79bd3d38022ac99423435172c8acf55eead6a3dacc1b514fa9c65305a509d869692ae3933b8f85d320fcdc25298047 +EBUILD dxvk-9999.ebuild 6397 BLAKE2B 281f77caa2434051ccb7fe7b5cc3d55727ef55e04309cc0d3652fca6067bf5464528ab517c4943b84a181a508d857ff83dcf46afd4c948138f7522b19fb845a4 SHA512 19b196bbee397a221f2a9561c6a627cfccaa4b50e1125b478f4ca94665c1beb69d6f1633f5135e9ffd013934d87e08b327ded946e6c7a4408b77367531155eee MISC metadata.xml 818 BLAKE2B 88081c074b99329c925174de4b7ff9b2c220ffc67eb64a5324f4eaf2a35f98f06c9978ddc0e929ba76b341a389a8eff025b7aa0a2414e3f7ae496c44a023c65c SHA512 90d76ac3df3abe003371cd25b9cf0e6570a53b371349fb2e048cae1818e51f0482e17b3d5490eb82c57d891bb43c4a7cd41530101b888591719c33c566788e3b diff --git a/app-emulation/dxvk/dxvk-1.10.3-r1.ebuild b/app-emulation/dxvk/dxvk-1.10.3-r1.ebuild new file mode 100644 index 000000000000..3a56e2fdd338 --- /dev/null +++ b/app-emulation/dxvk/dxvk-1.10.3-r1.ebuild @@ -0,0 +1,148 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# note: version <2.0 should be kept for longer given it's the +# last version to support /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() { + 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} + + # -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 + if has_version '/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() { - 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} - - # -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 - if has_version '/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} || die - mv ../SPIRV-Headers-${HASH_SPIRV} include/spirv || die - mv ../Vulkan-Headers-${HASH_VULKAN} include/vulkan || die - fi - - 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} - - # -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 - if has_version '=${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.1.ebuild b/app-emulation/dxvk/dxvk-2.1.ebuild deleted file mode 100644 index b39f6fe9f3c9..000000000000 --- a/app-emulation/dxvk/dxvk-2.1.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 2022-2023 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 -# 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" - -DESCRIPTION="Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux / Wine" -HOMEPAGE="https://github.com/doitsujin/dxvk/" - -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-gcc13.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 - - default - - sed "/^basedir=/s|=.*|=${EPREFIX}/usr/lib/${PN}|" \ - "${DISTDIR}"/setup_dxvk.sh > setup_dxvk.sh || die -} - -src_configure() { - use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} - - # -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 - if has_version '=${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.2-r1.ebuild b/app-emulation/dxvk/dxvk-2.2-r1.ebuild new file mode 100644 index 000000000000..21905a3981fb --- /dev/null +++ b/app-emulation/dxvk/dxvk-2.2-r1.ebuild @@ -0,0 +1,181 @@ +# Copyright 2022-2023 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 +# 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" + +DESCRIPTION="Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux / Wine" +HOMEPAGE="https://github.com/doitsujin/dxvk/" + +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 -p -- "${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} + + # -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 + if has_version '=${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.2.ebuild b/app-emulation/dxvk/dxvk-2.2.ebuild deleted file mode 100644 index cc5675a641c1..000000000000 --- a/app-emulation/dxvk/dxvk-2.2.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 2022-2023 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 -# 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" - -DESCRIPTION="Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux / Wine" -HOMEPAGE="https://github.com/doitsujin/dxvk/" - -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}] )" - -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 - - default - - sed "/^basedir=/s|=.*|=${EPREFIX}/usr/lib/${PN}|" \ - "${DISTDIR}"/setup_dxvk.sh > setup_dxvk.sh || die -} - -src_configure() { - use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} - - # -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 - if has_version '=${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 062d70604759..b4b07947ffeb 100644 --- a/app-emulation/dxvk/dxvk-9999.ebuild +++ b/app-emulation/dxvk/dxvk-9999.ebuild @@ -49,6 +49,10 @@ BDEPEND=" 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 @@ -77,11 +81,11 @@ src_prepare() { mv ../Vulkan-Headers-${HASH_VULKAN} include/vulkan || die mv ../libdisplay-info-${HASH_DISPLAYINFO} subprojects/libdisplay-info || die fi + cp -p -- "${DISTDIR}"/setup_dxvk.sh . || die default - sed "/^basedir=/s|=.*|=${EPREFIX}/usr/lib/${PN}|" \ - "${DISTDIR}"/setup_dxvk.sh > setup_dxvk.sh || die + sed -i "/^basedir=/s|=.*|=${EPREFIX}/usr/lib/${PN}|" setup_dxvk.sh || die } src_configure() { diff --git a/app-emulation/dxvk/files/dxvk-1.10.3-wow64-setup.patch b/app-emulation/dxvk/files/dxvk-1.10.3-wow64-setup.patch new file mode 100644 index 000000000000..707eba19b24b --- /dev/null +++ b/app-emulation/dxvk/files/dxvk-1.10.3-wow64-setup.patch @@ -0,0 +1,14 @@ +Dirty workaround to try syswow64 if paths are the same. This can happen +with USE=wow64 on wine where wine64 is a symlink to wine. + +TODO: dxvk's and vkd3d-proton's setup script should be rewritten and packaged +separately (shared) as upstream hardly support these (dxvk dropped altogether). +--- a/setup_dxvk.sh ++++ b/setup_dxvk.sh +@@ -89,2 +89,6 @@ + win32_sys_path="${win32_sys_path/$'\r'/}" ++ if [ "$win32_sys_path" = "$win64_sys_path" ]; then ++ win32_sys_path=$($wine winepath -u 'C:\windows\syswow64' 2> /dev/null) ++ win32_sys_path="${win32_sys_path/$'\r'/}" ++ fi + fi diff --git a/app-emulation/vkd3d-proton/Manifest b/app-emulation/vkd3d-proton/Manifest index 337f7522b247..4b87d793daff 100644 --- a/app-emulation/vkd3d-proton/Manifest +++ b/app-emulation/vkd3d-proton/Manifest @@ -1,18 +1,14 @@ +AUX vkd3d-proton-2.6-wow64-setup.patch 595 BLAKE2B b476f6e9e278b78fc22a41807286ac39bb17bf31c8dc09556ecb2ad64d3bf79a93be6492f9437c10781d7a3302eda19f59bbc396520c52e75126df9c578a6b4f SHA512 e8e71f0da66944444b4ae0b8a9840542a11061cd4607e17debf33a233abb850eb4d4882c2821b8c72c4cbf80b37f0c0877953b3e68e05afd73e35edba31d8e1d DIST vkd3d-proton-2.6.tar.gz 1271948 BLAKE2B 02d2574a66614613748fe3471a6fd5aac2650fdae15a17b17ea2ed028fa53a0579b866e7240036a26108afc343395826474bb99e015b9299c2abec811bb872ab SHA512 6f27d213652e2380a9ba4534ac9ffe4b752b4608fbc2e8acd273fa151ab19ad0b132e3436384d2b8591cd1a59f0b69d342c893dc3a64be85188b5e3274bcf3f1 -DIST vkd3d-proton-2.8.tar.gz 1435183 BLAKE2B 8b265e6dac1dd0ed6377ea6bc0ecffa7eccb8360f890bf2c996395b9db90e132ede9bddf6e889a9302466cccdcd2000f1e7ad9ece740b797c44f081b7ca1bb98 SHA512 d708fe62d64487b4430862b93913ba45f2889268c5efb9b1dc69fd48a665fcffc06a7bb91afc13b06a35fd82005a3115dc85f1de74d65f6958fd6f0c02a54007 DIST vkd3d-proton-2.9.tar.gz 1534562 BLAKE2B c2fd0d7ede7eae9192c32d2756abb7601324a220391a85e6fad2b8c2786d2bf4870cefb5f1bdec5fe7197d941fd25296a283fad49ab7c95bad37a457118f9d47 SHA512 65cab81045d151a2ee8ff755d02138daf6581c491d273773d61847efa2520d4c456de0c564eb4fe4dfbdd1f7b5b2a0177766497815d04f03845dadd0857fb483 DIST vkd3d-proton-dxil-spirv-b537bbb91b.tar.gz 631130 BLAKE2B 99f40c5efde87d0af86542b427e5b0429be68ca69ba0c2b6d10a821811756d8dadff4449f268ae404f8ace09a91b3e8aaa135e534a77c0239e58c1a970a044cc SHA512 3c20090b7a1b53c30fd4967622fc7384e1bcc504c30d8075068b87dad1bd2c6f4a12459bf42e61bf76b9dd454ec17a9d529f74ab0d5583627e966d94bb341dc3 -DIST vkd3d-proton-dxil-spirv-babf511d4c.tar.gz 695011 BLAKE2B 49e13065037edec80815b19907664d9681bc191303032db2e1678fbff5e144846c2ee267fdf5c1d4c31a1a30f2c14275f8e276a771253fabb8bbea8936be4eb4 SHA512 b310e4e856b4571ce13cce8539bd1640c7578b132558c009fcc04c24b4b10a86b620542891442dd81feaa8f6ad63d2d05021ca228d1c5f46eebe384fdb30f77e DIST vkd3d-proton-dxil-spirv-f20a0fb4e9.tar.gz 727867 BLAKE2B cad4db07fc8d92d2d33ff534483b809abe0a85b98184ceae850331b1287b5c4fa86a233a68faa55e6a05fbb05741ea0d9a20250d27312a2e83175b0c5dd76dad SHA512 76d181d7326902d5eceb21d0d971cac7fccf9541b367a00ad72c2e7645262aff3d5cc707994f6ed1c75b9dc8ace240d3c4861f9f08fa622851c6be0a4b144f93 DIST vkd3d-proton-spirv-headers-1d31a10040.tar.gz 445679 BLAKE2B 3dac88269df92428fd93ca187eb417ec0156ff0b24200daf85526aaa92c30ba8743102764e20c47d783ed0704fa690c1bf60944ef81bbdd296890dde5fb9fcaa SHA512 2536619cd7854954892dbb5ab5cd97e4e95fe3f5c121c4b2022426ae734fc20c1ebadbae1da7689f5ca18397075c54e4f16ad525b8ee873c4b0ffdc07aaacc03 -DIST vkd3d-proton-spirv-headers-87d5b782be.tar.gz 439180 BLAKE2B 9c64a1b7aa408172bb57b38ca0e3d31221c7dfecfcd9afc77449c14e76f60f7436f1a54a794bf4959f4575f177e1024621c6ff696f7fb19b545877e0a527031c SHA512 d6ce02e53c259e508d1d72d81cc6aa6b3019e7ecd6a8878d81d8681d9734756f66c762ebd4b8b1d0f9fbb7a8f1f18d72aeb27c56822d810aca5a3e53c51c1ef6 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-b7a86d3b2b.tar.gz 1753074 BLAKE2B a2588e84edd09a04c3622a95310acc781432d6a962c69c1f5a709b65e2bfeb5196d9d217b0d261532c4b5c1424f13ff64d33728303c989fdbce3048741add486 SHA512 377ada7a9721c225067c6548475109cf4ad1f3d677b835fbe7a4bc7520621acd816cc59d4b75b23bc28f25891b556792cf853b98c0dfb915856774ff27eb6aba DIST vkd3d-proton-vulkan-headers-bd6443d28f.tar.gz 1827419 BLAKE2B 911ef9d8039c052742a26784f800826af3f3da0d24026198540eceebb798990089eddefb518bf92ae50b039fa04477dc3256367593ed77852d90a332f9c4d0d5 SHA512 20e722bc5918af6c5ebeb6599d0f7f09821a3045d014f1c178ba8e038bdb4ace11a6ae261c75b38a0098cffff9bbfe4a518a541699575fbf642f13a73ca0faca -EBUILD vkd3d-proton-2.6.ebuild 6649 BLAKE2B a1c4fad8bc4dac02544610c116f25f74493a1e1f279f1440cb56606c97b8f99e96d729318e2b0712caa0bf81cade60c4a9ce1e8c974637df72a9de4b44c38e47 SHA512 3c20099e9539d9eff975507a309b633363dc802caeddd48f7379c8281fde131fc63608510d466ca6a9ec1b17d84d8ae52c8b22420a14db9b3983672c603d64df -EBUILD vkd3d-proton-2.8.ebuild 7125 BLAKE2B deb01348dbd8f4bd3da0e49d64a14a7f642a5ef7331cf1e498d6c5d99ccf3cba7961c4febd8be539fe9a419ef8e841b5f8a68f80dcba54e75b2eb3143b588b3d SHA512 2592cffd0ce8d32cec26bc4ef549cc98db755f3155adc95656c562b0e69431ece4e342fc6b72c9c01e5f4ccf602b911d3f93dee02edb305e18b4af38d3304328 -EBUILD vkd3d-proton-2.9.ebuild 7711 BLAKE2B c520bd7ae16ba345c0c3c332efe3ae272482e90b32f787a8d1f8407b018ec50040e14d077d5d4a2e57fad742d88cbaa38af4d7204988697d3329af56dd3d9354 SHA512 c721e2160361557dc14647b1e1f2debeea8db33b88611fb6b4f420bab6409fec73945f4a5304efb95fe3b541a522d4da1755b2a157f630f5f3acb1d4419d7b38 -EBUILD vkd3d-proton-9999.ebuild 7719 BLAKE2B 252edb291a8c788e46b4bc025c395d9b5a80bc72ab5170046345d0d1a93a1d8d533a60edb5a2ea77eb6dbce8f4c470885c79bc1dd8ac62c094dc753c4e32ff3f SHA512 c91b8cd543be510e2b4ae8f927ef9fa0337915421b1a8471bb1ab8e207d9b6018c8835c5ee0c04abefd5375971bfd9da9187cd4a6b2f4b99886e178ce7caf4d5 +EBUILD vkd3d-proton-2.6-r1.ebuild 6705 BLAKE2B 7bc31d31014915550cccc86f56d516f984ee3651fc999e0e39d82cce8b6c975b7118458651e6e62df7d3f4369abd72700344c6d2f7f9a0f9499897097e5e855b SHA512 c854e28b36f89ab206e7fb2a6d5daaf8d4b2683ed6feab3398ebc5a75418dbc9fea9270171315ed8d4f2980ecc68f969a38826864405ced03c400ea7c201fd9f +EBUILD vkd3d-proton-2.9-r1.ebuild 7767 BLAKE2B da1b0698573ff306c86dfb7cba001e36e3eb8ec0c38832fcf20cadaff1673f7c52e5b61620fe316d7a64d7c7e016089babadfd09ead348f211d173580d14de38 SHA512 3f865c2fafe78d90480456e58e06afb1ba77701287a5dd3ff6a654a9076796e935591ba79702f8ba85126a0e5d0785b2856ebc79c2609cb79e3c9731ffacbc9f +EBUILD vkd3d-proton-9999.ebuild 7775 BLAKE2B 02fd6fe93a3928e1afedfc97d86f0e20c2da75581bf1fbce52924c0fc2cf099b2a21349188efb81acd779e7de08d7525eaf51c0477e6e7fe22859581e1f96701 SHA512 223f2b7d87811cadcad3b03b82cd75e09430e624e20453796e27cbd78604e9ddfe499da44db1be1e2789af6b9328934fb313e6dee50fe5e139d9ac3b71f96e95 MISC metadata.xml 618 BLAKE2B 4382557118c0ea56972d05a10c9cc1f94a4fbcc58a414f1cd5e4354ce6ed1de15c95377f167ed5627231c2887ecce3c00756908720458fedddea5ed6732771ff SHA512 b5cc86b412c30ee5d54868a87c9f4892337c83988b738806532cd9e2cc295a2326e776030c19cae9a2e9dd4f5f615b1d962ec48a4b310fd8a94ec4024dde99ab diff --git a/app-emulation/vkd3d-proton/files/vkd3d-proton-2.6-wow64-setup.patch b/app-emulation/vkd3d-proton/files/vkd3d-proton-2.6-wow64-setup.patch new file mode 100644 index 000000000000..413852460d54 --- /dev/null +++ b/app-emulation/vkd3d-proton/files/vkd3d-proton-2.6-wow64-setup.patch @@ -0,0 +1,14 @@ +Dirty workaround to try syswow64 if paths are the same. This can happen +with USE=wow64 on wine where wine64 is a symlink to wine. + +TODO: dxvk's and vkd3d-proton's setup script should be rewritten and packaged +separately (shared) as upstream hardly support these (dxvk dropped altogether). +--- a/setup_vkd3d_proton.sh ++++ b/setup_vkd3d_proton.sh +@@ -81,2 +81,6 @@ + win32_sys_path="${win32_sys_path/$'\r'/}" ++ if [ "$win32_sys_path" = "$win64_sys_path" ]; then ++ win32_sys_path=$($wine winepath -u 'C:\windows\syswow64' 2> /dev/null) ++ win32_sys_path="${win32_sys_path/$'\r'/}" ++ fi + fi diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-2.6-r1.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-2.6-r1.ebuild new file mode 100644 index 000000000000..b728f3d9a94f --- /dev/null +++ b/app-emulation/vkd3d-proton/vkd3d-proton-2.6-r1.ebuild @@ -0,0 +1,182 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# note: version 2.6 should be kept for longer given it's the +# last version to support /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 + 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} + + # -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 + if has_version ' "${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 !debug --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 + + # unnecesasry files, see package-release.sh + rm "${ED}"/usr/lib/${PN}/x*/libvkd3d-proton-utils-3.dll || die + 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 "See ${EROOT}/usr/share/doc/${PF}/README.md* for details." + fi +} diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-2.6.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-2.6.ebuild deleted file mode 100644 index b2963d7ca105..000000000000 --- a/app-emulation/vkd3d-proton/vkd3d-proton-2.6.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# note: version 2.6 should be kept for longer given it's the -# last version to support /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 - 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} - - # -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 - if has_version ' "${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 !debug --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 - - # unnecesasry files, see package-release.sh - rm "${ED}"/usr/lib/${PN}/x*/libvkd3d-proton-utils-3.dll || die - 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 "See ${EROOT}/usr/share/doc/${PF}/README.md* for details." - fi -} diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-2.8.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-2.8.ebuild deleted file mode 100644 index d9c77a55fbc2..000000000000 --- a/app-emulation/vkd3d-proton/vkd3d-proton-2.8.ebuild +++ /dev/null @@ -1,189 +0,0 @@ -# Copyright 2022-2023 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=a0013b78db6271b5be3fa55ae0b30222d2fbf7c9 # match tag on bumps - HASH_DXIL=babf511d4cc7466b970dec82db35b5cacf6acfec - HASH_SPIRV=1d31a100405cf8783ca7a31e31cdd727c9fc54c3 - HASH_SPIRV_DXIL=87d5b782bec60822aa878941e6b13c0a9a954c9b - HASH_VULKAN=b7a86d3b2bf8fbe73fcd40df9ec62a5966e9db89 - 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" - -BDEPEND=" - dev-util/glslang - !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )" - -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} - - # -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 - if has_version ' "${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 !debug --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 "See ${EROOT}/usr/share/doc/${PF}/README.md* for details." - fi - - if [[ ! ${REPLACING_VERSIONS##* } ]] || - 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 -} diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-2.9-r1.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-2.9-r1.ebuild new file mode 100644 index 000000000000..cf5467c6fde5 --- /dev/null +++ b/app-emulation/vkd3d-proton/vkd3d-proton-2.9-r1.ebuild @@ -0,0 +1,203 @@ +# Copyright 2022-2023 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=6365efeba253807beecaed0eaa963295522c6b70 # match tag on bumps + HASH_DXIL=f20a0fb4e984a83743baa9d863eb7b26228bcca3 + HASH_SPIRV=1d31a100405cf8783ca7a31e31cdd727c9fc54c3 + HASH_SPIRV_DXIL=aa331ab0ffcb3a67021caa1a0c1c9017712f2f31 + HASH_VULKAN=bd6443d28f2ebecedfb839b52d612011ba623d14 + 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" + +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} + + # -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 + if has_version ' "${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 !debug --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.9.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-2.9.ebuild deleted file mode 100644 index 025dbe03397b..000000000000 --- a/app-emulation/vkd3d-proton/vkd3d-proton-2.9.ebuild +++ /dev/null @@ -1,199 +0,0 @@ -# Copyright 2022-2023 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=6365efeba253807beecaed0eaa963295522c6b70 # match tag on bumps - HASH_DXIL=f20a0fb4e984a83743baa9d863eb7b26228bcca3 - HASH_SPIRV=1d31a100405cf8783ca7a31e31cdd727c9fc54c3 - HASH_SPIRV_DXIL=aa331ab0ffcb3a67021caa1a0c1c9017712f2f31 - HASH_VULKAN=bd6443d28f2ebecedfb839b52d612011ba623d14 - 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" - -BDEPEND=" - dev-util/glslang - !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )" - -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} - - # -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 - if has_version ' "${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 !debug --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-9999.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild index 5c521dc6e224..490163e3132b 100644 --- a/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild +++ b/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild @@ -48,6 +48,10 @@ 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 -- cgit v1.2.3