commit: e4456bd60656bd8d6ef1686b6de7cf9ae69c3f15 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Fri May 12 11:12:00 2023 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Fri May 12 11:58:09 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4456bd6
app-emulation/vkd3d-proton: add 2.8_p20230510 Trying a new snapshot, hopefully it works better than the last. Done because a newer one is needed for d3d11on12 when using >=dxvk-2.2. Note that this adds a new dx12core.dll and requires re-running the setup script on old prefixes that were relying on symlinks to install it (there is a postinst note about it as well). Power users of dx12 are welcome to suggest better snapshots until get an actual release (can experiment with -9999), mostly only doing basic tests here. Not to say 2.8 or original vkd3d may not be the only one that works with some games. Bug: https://bugs.gentoo.org/904660 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> app-emulation/vkd3d-proton/Manifest | 4 + .../vkd3d-proton/vkd3d-proton-2.8_p20230510.ebuild | 189 +++++++++++++++++++++ 2 files changed, 193 insertions(+) diff --git a/app-emulation/vkd3d-proton/Manifest b/app-emulation/vkd3d-proton/Manifest index ff20d740ee09..071fbda3ebc6 100644 --- a/app-emulation/vkd3d-proton/Manifest +++ b/app-emulation/vkd3d-proton/Manifest @@ -1,12 +1,16 @@ DIST vkd3d-proton-08909d9856.tar.gz 1424776 BLAKE2B cb29a927b28980283c96d9a1ac99ef98570b72edbec147314b2884e2d8c78c23b8b7cdab4530b9098e55a25801a9fad3e5a8ae48695b994c226d05fd380c905b SHA512 ca79dfccf638f65546f8654bbb3819b6b72e8a6fd2cf9c5d697444b91244e96d55d059c971afc6b0709c762575a27024862a482dc0159a58804f7d4072746660 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.8_p20230510.tar.gz 1530900 BLAKE2B ae9ac7d46da117a09cf6e44411474e5de3dca2d7529f1c99ace55cd7566d41706b69ae5c0143d8f5b8b6b36a635cad03009f0c5fc4bed68a492a87dbb3eb7657 SHA512 0f11d1fdc8e87417e8a7adad6da6ce6c46dada2b333b3ff8c0b2289fb6eae4b0f8cf233f610e49d3a71106f5b77a51771ad2089fa2d9863744ddc03f1b07a42f +DIST vkd3d-proton-dxil-spirv-830106bc23.tar.gz 726639 BLAKE2B b3e4ce85f1b2ccde52f88a73ed26efff612348c14552a00cb9524ebfe538eb9b5adb04bf1fd82bb9610fe55235a48373a1ac6393fec1a8f2b3aecc1276a556dd SHA512 e2767a20bdeff4e04f137ba67b10d415e81a71e2e5de815ca08e0fb219b52df996a22bc3362dcae9f4a4c2272eaa5b2b63503502132e45510df904b895df63f7 DIST vkd3d-proton-dxil-spirv-9e2c26d15c.tar.gz 698285 BLAKE2B 034627322183771c67ac7f927f3883bb186ee1f17657e825f542331dcc4d907d65c764dd6e01603ac77d1205c92500be016a6f0df1e742b6e71f9a189d8287da SHA512 42e385f33b97444bf02a6f662094c256b5f92d5fd444fd3545a52b55aa30e23db2d794a62543de97baaf59cc4b6a1e8429d10b88c01c4bd0d71f5e086319b2d1 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-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-9f93cbe76a.tar.gz 1811251 BLAKE2B 6993e6e7301925a949a8ee18d7d0dec48adc8d4c66bb759929891241b64dd8f4bf4e563e86b40020123d5eced74b3ab02b86f3488b7d782c3cd4536079a3ddec SHA512 d0a157a560b58b676bbef115097423a4ab22928cd08a1010d2f3695bbf5fe3af79653b8db6ec00fa061ff46010749dc13526488f53cac6860af2a1918d873a19 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 diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-2.8_p20230510.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-2.8_p20230510.ebuild new file mode 100644 index 000000000000..6ea8230b8f3d --- /dev/null +++ b/app-emulation/vkd3d-proton/vkd3d-proton-2.8_p20230510.ebuild @@ -0,0 +1,189 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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 + # snapshot used for d3d11on12 for use with >=dxvk-2.2, scarcely tested + HASH_VKD3D=f125062ee1278ac8508ab5561e289ec4ce0f406e + HASH_DXIL=830106bc2393ba7e7af67863e1c7cfa856432ec5 + HASH_SPIRV=1d31a100405cf8783ca7a31e31cdd727c9fc54c3 + HASH_SPIRV_DXIL=aa331ab0ffcb3a67021caa1a0c1c9017712f2f31 + HASH_VULKAN=bd6443d28f2ebecedfb839b52d612011ba623d14 + SRC_URI=" + https://github.com/HansKristian-Work/vkd3d-proton/archive/${HASH_VKD3D}.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" + S="${WORKDIR}/${PN}-${HASH_VKD3D}" + 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} + + 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}) + + # 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 !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." + 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.8_p20230510; then + elog + elog ">=${PN}-2.8_p20230510 has a new file to install (d3d12core.dll), old" + elog "Wine prefixes that relied on '--symlink' may need updates by using the" + elog "setup_vkd3d_proton.sh script again." + fi + fi +}
