From 27cf8f197a427c1c71255f86149344e3bf1be47d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 17 Nov 2023 10:58:21 +0000 Subject: gentoo auto-resync : 17:11:2023 - 10:58:21 --- app-emulation/vkd3d-proton/Manifest | 2 +- app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) (limited to 'app-emulation/vkd3d-proton') diff --git a/app-emulation/vkd3d-proton/Manifest b/app-emulation/vkd3d-proton/Manifest index 0c98dfcc60a4..3996ae253b82 100644 --- a/app-emulation/vkd3d-proton/Manifest +++ b/app-emulation/vkd3d-proton/Manifest @@ -14,5 +14,5 @@ DIST vkd3d-proton-vulkan-headers-bd6443d28f.tar.gz 1827419 BLAKE2B 911ef9d8039c0 EBUILD vkd3d-proton-2.10.ebuild 7773 BLAKE2B f45540c0e8eae58a48ace76e23e431b8e0ff075909b41492cd4e335262c430acff0e12ddf08cbd2888e3e3336b0e73958511c07d7021802ebdc02908d06728e8 SHA512 0b75c8773d470c6c257da9bdd72f09ce8ce2a5d204d92803442d13f4a2d903480c396ed30ffaaf34ad2202f4a045cc764328d667ab91437c360f71f2331794ac 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 +EBUILD vkd3d-proton-9999.ebuild 7464 BLAKE2B 2ed244ed5080290f7818d4ccf874b7629053deea7d897c0475867dba8473b243add1e2d784d5bb1ececc72fd8df5319e784fbdc52c9ccb8aff905cecc31439f4 SHA512 2290f08086671690a548ba1b925e8a215ca93d10fdbb315bab15619f2052324c6c1e10c043aaa4b02f207411c683e16748053d7917c8b85de65a8bf35654babc MISC metadata.xml 618 BLAKE2B 4382557118c0ea56972d05a10c9cc1f94a4fbcc58a414f1cd5e4354ce6ed1de15c95377f167ed5627231c2887ecce3c00756908720458fedddea5ed6732771ff SHA512 b5cc86b412c30ee5d54868a87c9f4892337c83988b738806532cd9e2cc295a2326e776030c19cae9a2e9dd4f5f615b1d962ec48a4b310fd8a94ec4024dde99ab diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild index 490163e3132b..573700be0e89 100644 --- a/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild +++ b/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then 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 + khronos/{SPIRV,Vulkan}-Headers subprojects/dxil-spirv subprojects/dxil-spirv/third_party/spirv-headers # skip cross/tools ) @@ -85,15 +85,13 @@ 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 + 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 -# ln -s ../../../SPIRV-Headers/include \ -# subprojects/dxil-spirv/third_party/spirv-headers || die fi default @@ -133,10 +131,6 @@ src_configure() { 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 -- cgit v1.2.3