diff options
author | Ionen Wolkens <ionen@gentoo.org> | 2023-05-19 21:45:14 -0400 |
---|---|---|
committer | Ionen Wolkens <ionen@gentoo.org> | 2023-05-19 21:51:25 -0400 |
commit | ba60101ff0a143f0e3162933e74a5fbaadeaaea1 (patch) | |
tree | c6d923aef0f5336fbd0fbf47575d6b32fd5da27a /app-emulation/vkd3d-proton | |
parent | app-emulation/vkd3d-proton: add 2.9 (diff) | |
download | gentoo-ba60101ff0a143f0e3162933e74a5fbaadeaaea1.tar.gz gentoo-ba60101ff0a143f0e3162933e74a5fbaadeaaea1.tar.bz2 gentoo-ba60101ff0a143f0e3162933e74a5fbaadeaaea1.zip |
app-emulation/vkd3d-proton: drop 2.8_p20230510
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'app-emulation/vkd3d-proton')
-rw-r--r-- | app-emulation/vkd3d-proton/Manifest | 2 | ||||
-rw-r--r-- | app-emulation/vkd3d-proton/vkd3d-proton-2.8_p20230510.ebuild | 189 |
2 files changed, 0 insertions, 191 deletions
diff --git a/app-emulation/vkd3d-proton/Manifest b/app-emulation/vkd3d-proton/Manifest index 90643bb79a09..9dffeb452562 100644 --- a/app-emulation/vkd3d-proton/Manifest +++ b/app-emulation/vkd3d-proton/Manifest @@ -1,8 +1,6 @@ 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-2.9.tar.gz 1534562 BLAKE2B c2fd0d7ede7eae9192c32d2756abb7601324a220391a85e6fad2b8c2786d2bf4870cefb5f1bdec5fe7197d941fd25296a283fad49ab7c95bad37a457118f9d47 SHA512 65cab81045d151a2ee8ff755d02138daf6581c491d273773d61847efa2520d4c456de0c564eb4fe4dfbdd1f7b5b2a0177766497815d04f03845dadd0857fb483 -DIST vkd3d-proton-dxil-spirv-830106bc23.tar.gz 726639 BLAKE2B b3e4ce85f1b2ccde52f88a73ed26efff612348c14552a00cb9524ebfe538eb9b5adb04bf1fd82bb9610fe55235a48373a1ac6393fec1a8f2b3aecc1276a556dd SHA512 e2767a20bdeff4e04f137ba67b10d415e81a71e2e5de815ca08e0fb219b52df996a22bc3362dcae9f4a4c2272eaa5b2b63503502132e45510df904b895df63f7 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 diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-2.8_p20230510.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-2.8_p20230510.ebuild deleted file mode 100644 index 6ea8230b8f3d..000000000000 --- a/app-emulation/vkd3d-proton/vkd3d-proton-2.8_p20230510.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_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 -} |