diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-11-24 22:37:36 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-11-24 22:37:36 +0000 |
commit | 6d6af4d900ce1eac4475ff4125a400acbbef3f22 (patch) | |
tree | a92271f0b1f5e3ea840610695338d0356a484c47 /app-emulation/vkd3d-proton | |
parent | faddeff65d652bda3291eba255955adb17f1aa19 (diff) |
gentoo auto-resync : 24:11:2023 - 22:37:36
Diffstat (limited to 'app-emulation/vkd3d-proton')
-rw-r--r-- | app-emulation/vkd3d-proton/Manifest | 5 | ||||
-rw-r--r-- | app-emulation/vkd3d-proton/vkd3d-proton-2.11.ebuild | 197 | ||||
-rw-r--r-- | app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild | 8 |
3 files changed, 205 insertions, 5 deletions
diff --git a/app-emulation/vkd3d-proton/Manifest b/app-emulation/vkd3d-proton/Manifest index 3996ae253b82..dd12a3287c76 100644 --- a/app-emulation/vkd3d-proton/Manifest +++ b/app-emulation/vkd3d-proton/Manifest @@ -1,10 +1,12 @@ AUX vkd3d-proton-2.6-wow64-setup.patch 595 BLAKE2B b476f6e9e278b78fc22a41807286ac39bb17bf31c8dc09556ecb2ad64d3bf79a93be6492f9437c10781d7a3302eda19f59bbc396520c52e75126df9c578a6b4f SHA512 e8e71f0da66944444b4ae0b8a9840542a11061cd4607e17debf33a233abb850eb4d4882c2821b8c72c4cbf80b37f0c0877953b3e68e05afd73e35edba31d8e1d DIST vkd3d-proton-2.10.tar.gz 1839493 BLAKE2B 0dd3716bd986a78d8616fdfbe80833379bc93778a8cd599b8874b4bd620a3d5fa2d7ac342305db6acf3bb6025ac7b4ff138b49a30f34fa86f7af3ebb09903100 SHA512 84e9ebf84ac5294baf6d03e1291d7f3c4a004d6dd9da0450319e785827a635b70377855092d750b6c26492d369018585d7ec3cf46ebefc603751e13578bfe333 +DIST vkd3d-proton-2.11.tar.gz 1963984 BLAKE2B 30832bc58f37827444fac96e6801dde49f40ce9c474298868659eea03fd72a64fcbc6f679af9203868057fdc17ccf909289fc4e8c8cdd15b7d95ed559ecd08d1 SHA512 43ff2b0d551d70185b9a0b7e6a377432c01a794699a0810cc397379a260f746134cc0d74b1a938038834d5d0cdd48a54251db7b26f50ca4fcd1b4dfbf101217e DIST vkd3d-proton-2.6.tar.gz 1271948 BLAKE2B 02d2574a66614613748fe3471a6fd5aac2650fdae15a17b17ea2ed028fa53a0579b866e7240036a26108afc343395826474bb99e015b9299c2abec811bb872ab SHA512 6f27d213652e2380a9ba4534ac9ffe4b752b4608fbc2e8acd273fa151ab19ad0b132e3436384d2b8591cd1a59f0b69d342c893dc3a64be85188b5e3274bcf3f1 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-d6ffa30abf.tar.gz 783875 BLAKE2B 971a183c84142a4a00858d85c88f48d0c2dd6c4cc7576811c958c03d7f2e8cacb54cf518fa5f3dc0d2e0da681f3a15ab8e7d35ef7bb6df0e5b429e99ccdc9b75 SHA512 68452e28a88b8437ac81479ff2562322de759aafb1e6ac253f84fd43f1d4eb3c677e54da320e5cfc2f569fe15ca7578c0c4af8dc699f51baf597b4796fdd0167 DIST vkd3d-proton-dxil-spirv-f20a0fb4e9.tar.gz 727867 BLAKE2B cad4db07fc8d92d2d33ff534483b809abe0a85b98184ceae850331b1287b5c4fa86a233a68faa55e6a05fbb05741ea0d9a20250d27312a2e83175b0c5dd76dad SHA512 76d181d7326902d5eceb21d0d971cac7fccf9541b367a00ad72c2e7645262aff3d5cc707994f6ed1c75b9dc8ace240d3c4861f9f08fa622851c6be0a4b144f93 +DIST vkd3d-proton-dxil-spirv-fc4df6ce3a.tar.gz 874759 BLAKE2B c5126336850e9869bf185c59d809c3142c7aa83dab363c966c3126c5d69487d58c07e89d5bd34194838455fa3b7929fe4b1f483019733f0e79c3c623cdc82b93 SHA512 0bd8865a5fad63e59b32b63a738b9b7b03075f36c7812fc40cd459ca9d57427b17972ebfb4f8fd0e0aa0e3054e2777e25b9b2965c454708931d7fb43d643b75f 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 @@ -12,7 +14,8 @@ DIST vkd3d-proton-vulkan-headers-83e1a9ed8c.tar.gz 1299014 BLAKE2B 0b1e635aaa6ee DIST vkd3d-proton-vulkan-headers-a0c76b4ef7.tar.gz 2072604 BLAKE2B 324fe6cc9b803ba5dfa38a3c97d7573cb138f8e0619c0748a096f1a13eb8b608d5a780cb071f3727b0912005a0ab1bc5fd4f1a335ee74d00b44876dfe422f433 SHA512 6f447fef01946849c925634a7caf793e69f3aec52d8de2fa77fe8f5f7675c831fb54a1852cf3326e3909ce43a6f2970dd60c6976ac5d9459ef7bac62583b7ba9 DIST vkd3d-proton-vulkan-headers-bd6443d28f.tar.gz 1827419 BLAKE2B 911ef9d8039c052742a26784f800826af3f3da0d24026198540eceebb798990089eddefb518bf92ae50b039fa04477dc3256367593ed77852d90a332f9c4d0d5 SHA512 20e722bc5918af6c5ebeb6599d0f7f09821a3045d014f1c178ba8e038bdb4ace11a6ae261c75b38a0098cffff9bbfe4a518a541699575fbf642f13a73ca0faca EBUILD vkd3d-proton-2.10.ebuild 7773 BLAKE2B f45540c0e8eae58a48ace76e23e431b8e0ff075909b41492cd4e335262c430acff0e12ddf08cbd2888e3e3336b0e73958511c07d7021802ebdc02908d06728e8 SHA512 0b75c8773d470c6c257da9bdd72f09ce8ce2a5d204d92803442d13f4a2d903480c396ed30ffaaf34ad2202f4a045cc764328d667ab91437c360f71f2331794ac +EBUILD vkd3d-proton-2.11.ebuild 7470 BLAKE2B 71d9c4bbc4c4725890dc59b41e43a339d676c6f23d43e7855e52fb2df620b2ab127249dbdb3d8b06012445d601ff7fab615658217cf3543cf9df0b2b1113d75b SHA512 b5afde09728042c1fc576bd11ee878fd17034c30e05be3996b50d6e55e9033063279bcad31ee8daf65d932207fc3352265eeed5105317f06208a26eac7ba23e1 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 7464 BLAKE2B 2ed244ed5080290f7818d4ccf874b7629053deea7d897c0475867dba8473b243add1e2d784d5bb1ececc72fd8df5319e784fbdc52c9ccb8aff905cecc31439f4 SHA512 2290f08086671690a548ba1b925e8a215ca93d10fdbb315bab15619f2052324c6c1e10c043aaa4b02f207411c683e16748053d7917c8b85de65a8bf35654babc +EBUILD vkd3d-proton-9999.ebuild 7470 BLAKE2B 71d9c4bbc4c4725890dc59b41e43a339d676c6f23d43e7855e52fb2df620b2ab127249dbdb3d8b06012445d601ff7fab615658217cf3543cf9df0b2b1113d75b SHA512 b5afde09728042c1fc576bd11ee878fd17034c30e05be3996b50d6e55e9033063279bcad31ee8daf65d932207fc3352265eeed5105317f06208a26eac7ba23e1 MISC metadata.xml 618 BLAKE2B 4382557118c0ea56972d05a10c9cc1f94a4fbcc58a414f1cd5e4354ce6ed1de15c95377f167ed5627231c2887ecce3c00756908720458fedddea5ed6732771ff SHA512 b5cc86b412c30ee5d54868a87c9f4892337c83988b738806532cd9e2cc295a2326e776030c19cae9a2e9dd4f5f615b1d962ec48a4b310fd8a94ec4024dde99ab diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-2.11.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-2.11.ebuild new file mode 100644 index 000000000000..ac8d07ab3508 --- /dev/null +++ b/app-emulation/vkd3d-proton/vkd3d-proton-2.11.ebuild @@ -0,0 +1,197 @@ +# 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) + khronos/{SPIRV,Vulkan}-Headers + subprojects/dxil-spirv + subprojects/dxil-spirv/third_party/spirv-headers # skip cross/tools + ) +else + HASH_VKD3D=eb4b411734f8de04912c4a950f407f25a92f35ab # match tag on bumps + HASH_DXIL=fc4df6ce3aa7deffa764847c6e59f8df63c7b4b6 + 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} + + # -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 '<dev-util/mingw64-toolchain-11' || + { use crossdev-mingw && + has_version "<cross-$(usex x86 i686 x86_64)-w64-mingw32/mingw64-runtime-11"; } + then + filter-flags '-fstack-protector*' #870136 + fi + 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/vkd3d-proton/vkd3d-proton-9999.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild index 573700be0e89..ac8d07ab3508 100644 --- a/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild +++ b/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild @@ -18,11 +18,11 @@ if [[ ${PV} == 9999 ]]; then subprojects/dxil-spirv/third_party/spirv-headers # skip cross/tools ) else - HASH_VKD3D=6365efeba253807beecaed0eaa963295522c6b70 # match tag on bumps - HASH_DXIL=f20a0fb4e984a83743baa9d863eb7b26228bcca3 + HASH_VKD3D=eb4b411734f8de04912c4a950f407f25a92f35ab # match tag on bumps + HASH_DXIL=fc4df6ce3aa7deffa764847c6e59f8df63c7b4b6 HASH_SPIRV=1d31a100405cf8783ca7a31e31cdd727c9fc54c3 HASH_SPIRV_DXIL=aa331ab0ffcb3a67021caa1a0c1c9017712f2f31 - HASH_VULKAN=bd6443d28f2ebecedfb839b52d612011ba623d14 + HASH_VULKAN=a0c76b4ef76e219483755ff61dce6b67ff79f24b SRC_URI=" https://github.com/HansKristian-Work/vkd3d-proton/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz @@ -83,7 +83,7 @@ pkg_pretend() { src_prepare() { if [[ ${PV} != 9999 ]]; then - rmdir subprojects/{{SPIRV,Vulkan}-Headers,dxil-spirv} || die + 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 |