From a06bc35316df919f1329c1d893649b3ef0f59f5e Mon Sep 17 00:00:00 2001 From: Username404-59 Date: Fri, 11 Oct 2024 20:41:52 +0200 Subject: [PATCH 1/4] dev-util/DirectXShaderCompiler: Allow python3_12 Signed-off-by: Username404-59 --- .../DirectXShaderCompiler/DirectXShaderCompiler-1.8.2407.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.8.2407.ebuild b/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.8.2407.ebuild index f04499d858..2e67f78d79 100644 --- a/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.8.2407.ebuild +++ b/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.8.2407.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit cmake check-reqs python-any-r1 DESCRIPTION="Microsoft DirectX Shader Compiler which is based on LLVM/Clang" From 367d5965d95e37c3bb88b8d3fb49ca311f3f8d83 Mon Sep 17 00:00:00 2001 From: Username404-59 Date: Fri, 11 Oct 2024 21:24:17 +0200 Subject: [PATCH 2/4] media-libs/amdvlk: add 2024.3.3, drop 2024.3.1 Signed-off-by: Username404-59 --- media-libs/amdvlk/Manifest | 12 ++++++------ ...lk-2024.3.1.ebuild => amdvlk-2024.3.3.ebuild} | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) rename media-libs/amdvlk/{amdvlk-2024.3.1.ebuild => amdvlk-2024.3.3.ebuild} (92%) diff --git a/media-libs/amdvlk/Manifest b/media-libs/amdvlk/Manifest index 031d3acbe9..000ec0fa7f 100644 --- a/media-libs/amdvlk/Manifest +++ b/media-libs/amdvlk/Manifest @@ -1,8 +1,8 @@ DIST amdvlk-CWPack-4f8cf0584442a91d829d269158567d7ed926f026.tar.gz 39633 BLAKE2B d5b2a88f0d563eef5beb42a8304cf6cdd825e75242c22acc360c5bb9cbd1d02a4f891b6b2f3a4803e1e6b48a4d176aad40f8bdeca92847f2fbf53674dedeaff3 SHA512 06d56baaba1f1224a5266f4a63c1abf70edba7cc16cc4e62f2f5b1ec94fc2c1cfc4c6f11a9c6ef42c23b29be8d07921caad5e919357c0bd82cf714783eee0bcc -DIST amdvlk-LLVM-dialects-6ff7d39046e280e446fd69aa08c6c6524c68c728.tar.gz 106772 BLAKE2B f00991a1d984bdca1b15ef803d0cf5b75a299c294a0e6ea9bd656ad669426f055cace518950833b35a17c18faafd0318a80f18f5b8e7b3c7fa27f4bec0d65239 SHA512 64e5dbb60fd0d863a58e39dc214c6393a1393cac7aa89ac95c4c285c4daed5f8d40069462081dbcf84043a6478cc471ee9d6e7b74215ba5199a60a2e338f508a +DIST amdvlk-LLVM-dialects-bdfb113d8d765bdf4554a2b30ae909b93f26aeea.tar.gz 106775 BLAKE2B 0fe96213e62ac0e90b7c4a62a43909bdc6f047901f5b338773739146fe56cef86d92e3af90ae1188358f3af836f5c09566ea61cfd634eafe46ae5c2c07d4623f SHA512 d5eda9ade2d94cc2ff8ddda546cbb0b5992aa8138eda27dca31c706af42e99bcdda85527ca768a421b06328e879a2ef3ceaeb89611caf38c85043da79d2a99d4 DIST amdvlk-MetroHash-18893fb28601bb9af1154cd1a671a121fff6d8d3.tar.gz 11729 BLAKE2B b0e3de885e50c317141d62c885b421c7fd2e1ac783733704342bbed3109bff36a9209ab276f534a2231531483539221bbb1014bd39528a91124161bafc5646eb SHA512 8f12f95e80d594c8bd87a852c67a2d6777ce89d1a13e1a87ee17bbb876a0702c14ffe7a7fd65a244620f2043ad5d22ae8eb863d69f1dc5494d985733bbfb7bf9 -DIST amdvlk-gpurt-c5b10793bd96432609de2d5945a03ed54b7ebbe8.tar.gz 347915 BLAKE2B 16f770105ac58127eb7da4bc19f55d4e4119190f0be9d39e93d225bffb0a66883d3c06e0cda5b32afad2a218ea09941603a0eba2448bd61f7afda11f065ea069 SHA512 35806ebfc30b7e57ff3a6defeb87e6b049329ea02765264bb7e77ea84f53965b20593570b402730390a23c3284543a180c64dac40139dbcc0ceadf0dac7e2cb2 -DIST amdvlk-llpc-5278a3ff4f184ac76060892671c88d539be084c8.tar.gz 2768765 BLAKE2B 376618d3d63aaf5cd7fa8c2c37e667e9f1add40d3019c6c5cf6ef9e997eea665300bff1d7b665c44808bd1b0abc5735adf8f7ed4be902ed675d003718b0644ed SHA512 3165a854b28df064bf98289eb71f2deb5be5b8dafb22691983d4b085916a3349776445db3b39c3fd89bcea2e19a04d515fa372b25b8d5af60a27f81f70a85ef1 -DIST amdvlk-llvm-project-eb619c26c273559f0512aea704a4b0821c80b318.tar.gz 216601046 BLAKE2B 0b328679c71759a653e6ffd91d7ba0813053d6e5e7339256a735195ccef71a78b71342f5ffe75d9545845bfe368dfb35bc4fc72d56db4500edab9b389ffb6284 SHA512 48b46afeba7d1a020ddc72f559c29ffbfedb291df612ecb16bf237a4e3f1ddd055cb2802e9ee0dff727b71c70138c64645d2fe00b6d01db462bd6ea20b2a055e -DIST amdvlk-pal-d3bfe509cd335b06d1276a5bb3ceb8dce622ca34.tar.gz 9245270 BLAKE2B 9bd315742e8b12e2f88e5046e30a95e31c313a3f2752bcfc76e88153289949994c426a59155eda1ed6342bbd67aeb4f6a24caa1177e5a2c77122ae5a4f97134e SHA512 19daf28a2702681df9470d95106125359382c97c049216f6e7801204638c29b6353ca330e6c76b3f02137da2d4b6f0ff3bb34b8fa3b1e93f1d62f175f58cfe00 -DIST amdvlk-xgl-8bf20dd1ca8b6b773ff0a773c09a845a9be42a96.tar.gz 1350996 BLAKE2B 1521504663a8976371398f91869d14515855a0a1cd1851d4e80ef1d94bd2aa6f4f163ce17e3f6ecc1df727985ca17bc4f2ddc468424c985c640ee3baaedc5c2f SHA512 e91ed1eb5b2d97e99ebebbead7859dd9380c405be3256ce4ed3365c7e4d468fef6749d6cc8221870994f8259955c2d74a6f708458aaf7e819d6da5b8364fd208 +DIST amdvlk-gpurt-95c27c4031b112daaa231b76dee07f7ff05357d0.tar.gz 351839 BLAKE2B b2e4c4cdb4f2532cf22316ceb8cb6a949a2128bd1fd0276bf515793291bc63a84e0d0205fb195259f87eaf036dd0323e9d6a931b95d21bd66bc09f3c81654cd4 SHA512 f698157c7cfdbc25524230a949cef4c8b3d682825c6efe3f68b93d5b8c48b66f1c27826adb9e2d7b6670e5bea16eeec3e085dfecb39d29a37a2198c8b46ab74c +DIST amdvlk-llpc-872ddfdeecfd1e56ddbc0db2012b96788129fee9.tar.gz 2860471 BLAKE2B f2496e90238796dccd584d539bc210e14f68731fb92f74ba6353ad6464e4eec228cccfeca54d05effd4e2913ccf43ed640175cad71afa3b610546e16760b970d SHA512 d09072aa89a8a593f76e09d8c8d3166663ce8bcbb379793f96509f2248112541207cc5fb1fa0a2df1a40a7a35b51c28d382e77d83996e70d961b92e8338209da +DIST amdvlk-llvm-project-8abfff872ebbb1f57ebe83149f8166fb5dd487dc.tar.gz 217893483 BLAKE2B 53a543629a2392b6cb496a4c0c852516e516c315c9e2742555e44b4998eef2d59455f3ac8f1cb206c857e819e5f17fcf20a5878d2224679aa1fa7695cf80826c SHA512 04f4bff33be025ff6ae9591312ea9aa9a5e600268ac25186e36b401f27333bf75a83d4c784e289325def995254d54bede9b02484cc3152cebbdf39a32dc31f2a +DIST amdvlk-pal-31f6a70d0e9ee22894daab5305dd91b3ebb599a5.tar.gz 10376369 BLAKE2B d9f8e3c1e27cca738b08bd55e9e7c7b9fe139fafe60e4ff35f43f99b38e6100b92b47d826cc90be93cdc5eb68db03537e127e4cdd6d10073848fbc4a3d826aaf SHA512 bf420c9e4fc5454b84ddb9bdbe843ede4af77e79298fc7b2b3dc7bc5af8391f97d8c9e71487c9ed97219a554f103af65a1f9687f51843e27fcad95d1a1fee85e +DIST amdvlk-xgl-c4ca1f6077c7fecc8df2ad2ed8719fb943b4e4b1.tar.gz 1365942 BLAKE2B 5b65a21e9a8181ddd78cdb8dabe9b7ba85961757f220bbdf844da0222ab2af14a01b8adac2eae1f4dd61be326b753cbc03c6f5433717d10d645fe9fa8e3a3f6a SHA512 832fbd90689196a8989e43f9cf696e2c8384e4bd48f0caa3869ff68830693683375a1ce4553043ab40e3fc097763955094f903a8580eac533735d32f102d099a diff --git a/media-libs/amdvlk/amdvlk-2024.3.1.ebuild b/media-libs/amdvlk/amdvlk-2024.3.3.ebuild similarity index 92% rename from media-libs/amdvlk/amdvlk-2024.3.1.ebuild rename to media-libs/amdvlk/amdvlk-2024.3.3.ebuild index 0e36163b7e..e36d4bb204 100644 --- a/media-libs/amdvlk/amdvlk-2024.3.1.ebuild +++ b/media-libs/amdvlk/amdvlk-2024.3.3.ebuild @@ -4,7 +4,7 @@ EAPI=8 MULTILIB_COMPAT=( abi_x86_{32,64} ) -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit check-reqs python-any-r1 cmake-multilib @@ -18,16 +18,16 @@ FETCH_URI="https://github.com/GPUOpen-Drivers" ## and place commits in the desired variables ## EXAMPLE: XGL_COMMIT="80e5a4b11ad2058097e77746772ddc9ab2118e07" ## SRC_URI="... ${FETCH_URI}/$PART/archive/$COMMIT.zip -> $PART-$COMMIT.zip ..." -XGL_COMMIT="8bf20dd1ca8b6b773ff0a773c09a845a9be42a96" -PAL_COMMIT="d3bfe509cd335b06d1276a5bb3ceb8dce622ca34" -LLPC_COMMIT="5278a3ff4f184ac76060892671c88d539be084c8" -GPURT_COMMIT="c5b10793bd96432609de2d5945a03ed54b7ebbe8" -LLVM_PROJECT_COMMIT="eb619c26c273559f0512aea704a4b0821c80b318" +XGL_COMMIT="c4ca1f6077c7fecc8df2ad2ed8719fb943b4e4b1" +PAL_COMMIT="31f6a70d0e9ee22894daab5305dd91b3ebb599a5" +LLPC_COMMIT="872ddfdeecfd1e56ddbc0db2012b96788129fee9" +GPURT_COMMIT="95c27c4031b112daaa231b76dee07f7ff05357d0" +LLVM_PROJECT_COMMIT="8abfff872ebbb1f57ebe83149f8166fb5dd487dc" METROHASH_COMMIT="18893fb28601bb9af1154cd1a671a121fff6d8d3" CWPACK_COMMIT="4f8cf0584442a91d829d269158567d7ed926f026" # Submodule of LLPC, also updates often. Grab commit version from # https://github.com/GPUOpen-Drivers/llpc/tree/${LLPC_COMMIT}/imported -LLVM_DIALECTS_COMMIT="6ff7d39046e280e446fd69aa08c6c6524c68c728" +LLVM_DIALECTS_COMMIT="bdfb113d8d765bdf4554a2b30ae909b93f26aeea" ### end of variables SRC_URI="${FETCH_URI}/xgl/archive/${XGL_COMMIT}.tar.gz -> amdvlk-xgl-${XGL_COMMIT}.tar.gz ${FETCH_URI}/pal/archive/${PAL_COMMIT}.tar.gz -> amdvlk-pal-${PAL_COMMIT}.tar.gz @@ -61,7 +61,7 @@ RDEPEND=" ${DEPEND} x11-libs/libXrandr[${MULTILIB_USEDEP}] x11-libs/libxcb[${MULTILIB_USEDEP}] x11-libs/libxshmfence[${MULTILIB_USEDEP}] - >=media-libs/vulkan-loader-1.3.283[${MULTILIB_USEDEP}] + >=media-libs/vulkan-loader-1.3.290[${MULTILIB_USEDEP}] dev-util/glslang[${MULTILIB_USEDEP}] dev-libs/openssl[${MULTILIB_USEDEP}]" #890449 From 9d313a3aa4727f315368f3deec5bcec07b2e930e Mon Sep 17 00:00:00 2001 From: Username404-59 Date: Fri, 11 Oct 2024 21:25:38 +0200 Subject: [PATCH 3/4] media-libs/amdvlk: add patch to fix possible build failure Signed-off-by: Username404-59 --- media-libs/amdvlk/amdvlk-2024.3.3.ebuild | 1 + .../amdvlk/files/amdvlk-2024.3.3-fix-build.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 media-libs/amdvlk/files/amdvlk-2024.3.3-fix-build.patch diff --git a/media-libs/amdvlk/amdvlk-2024.3.3.ebuild b/media-libs/amdvlk/amdvlk-2024.3.3.ebuild index e36d4bb204..7d5fc13e0c 100644 --- a/media-libs/amdvlk/amdvlk-2024.3.3.ebuild +++ b/media-libs/amdvlk/amdvlk-2024.3.3.ebuild @@ -77,6 +77,7 @@ PATCHES=( #"${FILESDIR}/amdvlk-2022.4.2-reduced-llvm-installations.patch" #"${FILESDIR}/amdvlk-2022.4.2-reduced-llvm-installations-part2.patch" "${FILESDIR}/amdvlk-2024.3.1-disable-Werror.patch" + "${FILESDIR}/amdvlk-2024.3.3-fix-build.patch" ) pkg_pretend(){ diff --git a/media-libs/amdvlk/files/amdvlk-2024.3.3-fix-build.patch b/media-libs/amdvlk/files/amdvlk-2024.3.3-fix-build.patch new file mode 100644 index 0000000000..9aa3b4d5ca --- /dev/null +++ b/media-libs/amdvlk/files/amdvlk-2024.3.3-fix-build.patch @@ -0,0 +1,13 @@ +diff --git a/pal/shared/devdriver/shared/legacy/inc/util/queue.h b/pal/shared/devdriver/shared/legacy/inc/util/queue.h +index 95421760..926e6c89 100644 +--- a/pal/shared/devdriver/shared/legacy/inc/util/queue.h ++++ b/pal/shared/devdriver/shared/legacy/inc/util/queue.h +@@ -368,7 +368,7 @@ namespace DevDriver + + // Private copy constructor to prevent implicit copies + Queue(const Queue& rhs) +- : Queue(rhs.allocCb) ++ : Queue(rhs.m_allocCb) + { + GrowBlocks(rhs.m_numBlocks); + for (int i = 0; i < rhs.m_size; i++) From 3e5931246ef4e8ca7055fea3d4f2f633063bd4fd Mon Sep 17 00:00:00 2001 From: Username404-59 Date: Fri, 11 Oct 2024 23:46:52 +0200 Subject: [PATCH 4/4] dev-util/DirectXShaderCompiler: drop old versions Signed-off-by: Username404-59 --- .../DirectXShaderCompiler-1.7.2207-r1.ebuild | 62 ------- .../DirectXShaderCompiler-1.7.2212-r1.ebuild | 74 --------- .../DirectXShaderCompiler-1.8.2405.ebuild | 71 -------- dev-util/DirectXShaderCompiler/Manifest | 9 -- ...ompiler-1.7.2212-fix-changes-meaning.patch | 152 ------------------ 5 files changed, 368 deletions(-) delete mode 100644 dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.7.2207-r1.ebuild delete mode 100644 dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.7.2212-r1.ebuild delete mode 100644 dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.8.2405.ebuild delete mode 100644 dev-util/DirectXShaderCompiler/files/DirectXShaderCompiler-1.7.2212-fix-changes-meaning.patch diff --git a/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.7.2207-r1.ebuild b/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.7.2207-r1.ebuild deleted file mode 100644 index dab40c6d80..0000000000 --- a/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.7.2207-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) -inherit cmake check-reqs python-any-r1 - -DESCRIPTION="Microsoft DirectX Shader Compiler which is based on LLVM/Clang" -HOMEPAGE="https://github.com/microsoft/DirectXShaderCompiler" -# ToDo: unbundle spirv headers/tools -SPIRV_HEADERS_COMMIT_MAGIC="0bcc624926a25a2a273d07877fd25a6ff5ba1cfb" -SPIRV_TOOLS_COMMIT_MAGIC="71b2aee6c868a673ec82d1385f97593aa2881316" -SRC_URI="https://github.com/microsoft/DirectXShaderCompiler/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz -https://github.com/KhronosGroup/SPIRV-Headers/archive/${SPIRV_HEADERS_COMMIT_MAGIC}.tar.gz -> DirectXShaderCompiler-headers-${SPIRV_HEADERS_COMMIT_MAGIC}.tar.gz -https://github.com/KhronosGroup/SPIRV-Tools/archive/${SPIRV_TOOLS_COMMIT_MAGIC}.tar.gz -> DirectXShaderCompiler-tools-${SPIRV_TOOLS_COMMIT_MAGIC}.tar.gz" - -LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="${PYTHON_DEPS}" -RDEPEND=" - sys-libs/zlib:0= - >=dev-libs/libffi-3.4.2-r1:0= -" -BDEPEND="sys-devel/gnuconfig" - -CHECKREQS_MEMORY="4G" -CHECKREQS_DISK_BUILD="4G" -CMAKE_EXTRA_CACHE_FILE="${S}/cmake/caches/PredefinedParams.cmake" - -src_prepare() { - rm -d "${S}"/external/SPIRV* - mv "${WORKDIR}/SPIRV-Headers-${SPIRV_HEADERS_COMMIT_MAGIC}" "${S}/external/SPIRV-Headers" || die "can't move headers" - mv "${WORKDIR}/SPIRV-Tools-${SPIRV_TOOLS_COMMIT_MAGIC}" "${S}/external/SPIRV-Tools"|| die "can't move tools" - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -Wno-dev - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/dxc" - -DLLVM_BUILD_DOCS=0 - -DLLVM_BUILD_TOOLS=0 - -DSPIRV_BUILD_TESTS=0 - -DLLVM_ENABLE_WERROR=0 - -DSPIRV_WERROR=0 - -DSPIRV_WARN_EVERYTHING=0 - -DBUILD_SHARED_LIBS=OFF - -DLLVM_VERSION_SUFFIX=dxc - ) - cmake_src_configure -} -src_install() { - cmake_src_install - cat > "99${PN}" <<-EOF - LDPATH="${EPREFIX}/usr/lib/llvm/dxc/lib" - EOF - doenvd "99${PN}" - dosym -r /usr/lib/llvm/dxc/bin/dxc /usr/bin/dxc -} diff --git a/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.7.2212-r1.ebuild b/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.7.2212-r1.ebuild deleted file mode 100644 index 42f1100fa0..0000000000 --- a/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.7.2212-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) -inherit cmake check-reqs python-any-r1 - -DESCRIPTION="Microsoft DirectX Shader Compiler which is based on LLVM/Clang" -HOMEPAGE="https://github.com/microsoft/DirectXShaderCompiler" -# ToDo: unbundle spirv headers/tools and directx headers -SPIRV_HEADERS_COMMIT_MAGIC="d13b52222c39a7e9a401b44646f0ca3a640fbd47" -SPIRV_TOOLS_COMMIT_MAGIC="f36a8d47f738cc612c7dd89f145a15465ab437cd" -DIRECTX_HEADERS_COMMIT_MAGIC="980971e835876dc0cde415e8f9bc646e64667bf7" -SRC_URI="https://github.com/microsoft/DirectXShaderCompiler/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz -https://github.com/KhronosGroup/SPIRV-Headers/archive/${SPIRV_HEADERS_COMMIT_MAGIC}.tar.gz -> DirectXShaderCompiler-headers-${SPIRV_HEADERS_COMMIT_MAGIC}.tar.gz -https://github.com/KhronosGroup/SPIRV-Tools/archive/${SPIRV_TOOLS_COMMIT_MAGIC}.tar.gz -> DirectXShaderCompiler-tools-${SPIRV_TOOLS_COMMIT_MAGIC}.tar.gz -https://github.com/microsoft/DirectX-Headers/archive/${DIRECTX_HEADERS_COMMIT_MAGIC}.tar.gz -> DirectXShaderCompiler-directxheaders-${DIRECTX_HEADERS_COMMIT_MAGIC}.tar.gz" - -LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="${PYTHON_DEPS}" -# Todo: unbundle -# dev-util/directx-headers -# dev-util/spirv-headers -# dev-util/spirv-tools -RDEPEND=" - sys-libs/zlib:0= - >=dev-libs/libffi-3.4.2-r1:0= -" -BDEPEND="sys-devel/gnuconfig" - -CHECKREQS_MEMORY="4G" -CHECKREQS_DISK_BUILD="4G" -CMAKE_EXTRA_CACHE_FILE="${S}/cmake/caches/PredefinedParams.cmake" - -PATCHES=( - "${FILESDIR}"/${P}-fix-changes-meaning.patch # bgo #905173 -) -src_prepare() { - rm -d "${S}"/external/SPIRV* || die - rm -d "${S}"/external/DirectX* || die - mv "${WORKDIR}/SPIRV-Headers-${SPIRV_HEADERS_COMMIT_MAGIC}" "${S}/external/SPIRV-Headers" || die "can't move headers" - mv "${WORKDIR}/SPIRV-Tools-${SPIRV_TOOLS_COMMIT_MAGIC}" "${S}/external/SPIRV-Tools"|| die "can't move tools" - mv "${WORKDIR}/DirectX-Headers-${DIRECTX_HEADERS_COMMIT_MAGIC}" "${S}/external/DirectX-Headers"|| die "can't move DXH" - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -Wno-dev - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/dxc" - -DLLVM_BUILD_DOCS=0 - -DLLVM_BUILD_TOOLS=0 - -DSPIRV_BUILD_TESTS=0 - -DLLVM_ENABLE_WERROR=0 - -DSPIRV_WERROR=0 - -DSPIRV_WARN_EVERYTHING=0 - -DBUILD_SHARED_LIBS=OFF - -DLLVM_VERSION_SUFFIX=dxc - ) - cmake_src_configure -} -src_install() { - cmake_src_install - cat > "99${PN}" <<-EOF - LDPATH="${EPREFIX}/usr/lib/llvm/dxc/lib" - EOF - doenvd "99${PN}" - dosym -r /usr/lib/llvm/dxc/bin/dxc /usr/bin/dxc -} diff --git a/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.8.2405.ebuild b/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.8.2405.ebuild deleted file mode 100644 index d31d0f3f1e..0000000000 --- a/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.8.2405.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) -inherit cmake check-reqs python-any-r1 - -DESCRIPTION="Microsoft DirectX Shader Compiler which is based on LLVM/Clang" -HOMEPAGE="https://github.com/microsoft/DirectXShaderCompiler" -# ToDo: unbundle spirv headers/tools and directx headers -SPIRV_HEADERS_COMMIT_MAGIC="4f7b471f1a66b6d06462cd4ba57628cc0cd087d7" -SPIRV_TOOLS_COMMIT_MAGIC="dd4b663e13c07fea4fbb3f70c1c91c86731099f7" -DIRECTX_HEADERS_COMMIT_MAGIC="980971e835876dc0cde415e8f9bc646e64667bf7" -SRC_URI="https://github.com/microsoft/DirectXShaderCompiler/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz -https://github.com/KhronosGroup/SPIRV-Headers/archive/${SPIRV_HEADERS_COMMIT_MAGIC}.tar.gz -> DirectXShaderCompiler-headers-${SPIRV_HEADERS_COMMIT_MAGIC}.tar.gz -https://github.com/KhronosGroup/SPIRV-Tools/archive/${SPIRV_TOOLS_COMMIT_MAGIC}.tar.gz -> DirectXShaderCompiler-tools-${SPIRV_TOOLS_COMMIT_MAGIC}.tar.gz -https://github.com/microsoft/DirectX-Headers/archive/${DIRECTX_HEADERS_COMMIT_MAGIC}.tar.gz -> DirectXShaderCompiler-directxheaders-${DIRECTX_HEADERS_COMMIT_MAGIC}.tar.gz" - -LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="${PYTHON_DEPS}" -# Todo: unbundle -# dev-util/directx-headers -# dev-util/spirv-headers -# dev-util/spirv-tools -RDEPEND=" - sys-libs/zlib:0= - >=dev-libs/libffi-3.4.2-r1:0= -" -BDEPEND="sys-devel/gnuconfig" - -CHECKREQS_MEMORY="4G" -CHECKREQS_DISK_BUILD="4G" -CMAKE_EXTRA_CACHE_FILE="${S}/cmake/caches/PredefinedParams.cmake" - -src_prepare() { - rm -d "${S}"/external/SPIRV* || die - rm -d "${S}"/external/DirectX* || die - mv "${WORKDIR}/SPIRV-Headers-${SPIRV_HEADERS_COMMIT_MAGIC}" "${S}/external/SPIRV-Headers" || die "can't move headers" - mv "${WORKDIR}/SPIRV-Tools-${SPIRV_TOOLS_COMMIT_MAGIC}" "${S}/external/SPIRV-Tools"|| die "can't move tools" - mv "${WORKDIR}/DirectX-Headers-${DIRECTX_HEADERS_COMMIT_MAGIC}" "${S}/external/DirectX-Headers"|| die "can't move DXH" - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -Wno-dev - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/dxc" - -DLLVM_BUILD_DOCS=0 - -DLLVM_BUILD_TOOLS=0 - -DSPIRV_BUILD_TESTS=0 - -DLLVM_ENABLE_WERROR=0 - -DSPIRV_WERROR=0 - -DSPIRV_WARN_EVERYTHING=0 - -DBUILD_SHARED_LIBS=OFF - -DLLVM_VERSION_SUFFIX=dxc - ) - cmake_src_configure -} -src_install() { - cmake_src_install - cat > "99${PN}" <<-EOF - LDPATH="${EPREFIX}/usr/lib/llvm/dxc/lib" - EOF - doenvd "99${PN}" - dosym -r /usr/lib/llvm/dxc/bin/dxc /usr/bin/dxc -} diff --git a/dev-util/DirectXShaderCompiler/Manifest b/dev-util/DirectXShaderCompiler/Manifest index dfb1a348f0..e5be85c5a2 100644 --- a/dev-util/DirectXShaderCompiler/Manifest +++ b/dev-util/DirectXShaderCompiler/Manifest @@ -1,13 +1,4 @@ -DIST DirectXShaderCompiler-1.7.2207.tar.gz 23764105 BLAKE2B 4b3bab8a961cdec96fd31da85386cf61af304d5ed1f6dcb40530bb2b084bc454f42ecfcbf9bcb228ecd2870c13b7b211509e05e3b7ed08ee3c2ed264505d162d SHA512 4faa6b53f2f694c9593ebf4ac02ce771fe1cb1822595799dc3a6c85752de701afe546b5fbdfedcc0ba466b0081bc679fca1fd7fb5fc05167c7449fb378a1c651 -DIST DirectXShaderCompiler-1.7.2212.tar.gz 23855402 BLAKE2B 0a6ffd8f9b4e716b5c5d8eb9708f79c95397f6c0d76e6b7769b5d47f1ea650941440f9eeb530654bdec84f02be8ed272278b19f00826f7d3d088d2d7170c7531 SHA512 54eb737c56948a46182158141ca8d0bd908a9fec122d93fcee53f8abfe707f0075de7ec6bd86ac5d58a3472110ba29f5849c9ad75f570c540c1a22c403ecb3b5 -DIST DirectXShaderCompiler-1.8.2405.tar.gz 24354504 BLAKE2B 0f84bc2182ef34b0e9a21a24c7a0a811fcdd8dba2683212385f4384064a49ae84b370acb3629dcd1bbbab291b415ab5480181514b4b26c81f67d3fbda20545aa SHA512 62ebc51df8beabb0c64376c2f5fbb170501bbfb360cabc8d4ade037b5a842bcb936140f55120221d4ff020378c728cdf037666698c7a12d5dea1ef42f849a75a DIST DirectXShaderCompiler-1.8.2407.tar.gz 24397154 BLAKE2B 533f2e7a15abb2cfda05d7c437030d761cb6127f1c5fc3db851608d3b157eedbbb0fb4059ea3402156d97aebe6da8fde398024d3c94c421ad2dcc5604db24a2c SHA512 7b7a829fd8766942bb526cd0bbda71ebd081c54c6ce83b1266bc8c0340776d1d40f9d0fdb73946d713ee2d21b103ffee5d47110ee72f37b16ade56d3be984990 DIST DirectXShaderCompiler-directxheaders-980971e835876dc0cde415e8f9bc646e64667bf7.tar.gz 326310 BLAKE2B 8ea4bbae290926c08d02d1a1262e813bb188c62a6deb81ed03954c500473581dc2430d09ca0742c42c5d8bfc2e232c999531ec5ad139aa791b7e8b06dfacd61d SHA512 a570068d3c25c68eba34a2653108e2019f888a7392a803f97da9a401713b14bf4235520f0adc37c2f6ffb27cfb118ca7bb0fc8e446b342a7393c9c64afd84ed8 -DIST DirectXShaderCompiler-headers-0bcc624926a25a2a273d07877fd25a6ff5ba1cfb.tar.gz 437771 BLAKE2B 08815e36ad99b84777e38ad0c5616b6608a552f993e7f67433f2b8e20de81e9bce41420ac5998f5b67bca70a92ce70aed91b238990bd431c7b97070dfb0c5a60 SHA512 5995cf75d5605d41e9643bca81c195ef5aaa17d596e0282807f6fa8f8c494f7b63a41d611c535ae43dc3d609436aabef1e0d89626f37e6f20bad17b5e122e32c DIST DirectXShaderCompiler-headers-2acb319af38d43be3ea76bfabf3998e5281d8d12.tar.gz 522013 BLAKE2B fa3ab292fbdc0b219e23f3919014b7e2f891dee3fab4a1c21829013ff93cb445c920fa30358b6162a4bdbb28ddf9babe56286f0e8e96a51825add2b3ee3e8a04 SHA512 364ab8ea4a81b3589bd9e58d50c89d21859cb4a324b224f74ec7c371631f127c0e7f36d074436b6cba8a1919e83d3a3790baa94268b47862c28a2d3ca55fccfa -DIST DirectXShaderCompiler-headers-4f7b471f1a66b6d06462cd4ba57628cc0cd087d7.tar.gz 472655 BLAKE2B 5021f997445539ecaf825460f7e675a1e8d9be7457245a3db31f6fdc63956b8b4987da63f813ece3b8158a8eec4e56760693d1d2dfc49be37ee09a29e299ba82 SHA512 adfdf80baf8c8e83595dfbd9245b821b00918f342174d2ff643b426c0da16a9c79877131a697b39b579a2ec691daeae24f846517eac017e41ba6209098f25eab -DIST DirectXShaderCompiler-headers-d13b52222c39a7e9a401b44646f0ca3a640fbd47.tar.gz 446718 BLAKE2B 39162460b730cc495a1c2cdd2c9f8e173ad1f88c1f9f5070155347ff455275b33fb043f4ab85b47131cb5014a8adc07d3066f99fc5442ce661f0f388fb1396f0 SHA512 390078d26976e7e95fdda10816bff4946dbae8d7e92d8bdd88501725bf7683ba48b47ca5cbc5491e47539a39bfb9eb5c423e24f2f03dba2e4fe1923bf8e4dd9b DIST DirectXShaderCompiler-tools-0cfe9e7219148716dfd30b37f4d21753f098707a.tar.gz 3173510 BLAKE2B 66717fe54b26d1fdc758e179574e228c5723ef769578708376ab4098b0ca7670a9a1ec81cd3caa2f234879ac2c49cbe3e7c2ca82000448d393e1e0394e7dd4ed SHA512 fd6beea7307add32c1d0f0b317e1707822cf806b02cc09519d6ec05f432ab2f7c38725de10bbe34c8e701b8a32c95f9a93b0fcadcfb227d4dfab2e365b476944 -DIST DirectXShaderCompiler-tools-71b2aee6c868a673ec82d1385f97593aa2881316.tar.gz 3042018 BLAKE2B e9d62559fc270c4140f2638a51b8d14120d84a868a35c488f30bff1b098a98fa1683e85b0778208de61a0b5c0b3f0996071e655a8fa64cc7c3c791527ff9441a SHA512 68f80e4a3395ba7c87ab08f515d265f0c106f39770e043cc8eba5e62f2762405e05e4b5b187e33702ce0a2204fc9d42cbf7ce27a6268daf59f4ab4c04b73d462 -DIST DirectXShaderCompiler-tools-dd4b663e13c07fea4fbb3f70c1c91c86731099f7.tar.gz 3180686 BLAKE2B 21d54c528ceeea3de6d32e071e2fdf9749aabf9381dd3259797d9e6607a047703a5b138a6d7fb24ac4121fa76a557521fddf718f2f6b6ff0cebc16a865250616 SHA512 4f1f16904aecfcf6eef9fbebe99654381405e1ed61e2b61a6c42e9ec7f73208448440c1f87f069859f16f69ee6362ccc89438ef0e11dcc77d5b2a5594bde442a -DIST DirectXShaderCompiler-tools-f36a8d47f738cc612c7dd89f145a15465ab437cd.tar.gz 3092790 BLAKE2B 2e1978cb7d92f9556650696136f7e68f0aae46ebbca6caf9bd1d22ad42b5d2fad75dcc9aa2504e61e140e6c0a44e807d7aa94b28a25cd131a8fb239f6003bc21 SHA512 53c9c973f79fd321fa3a3d1f305e8674ccd7a02ceaf779aae7650c68b3d0d8d820fbe380b0450892402a1835f8205c8a7e6efb155929bce217d1b39bd4a34eef diff --git a/dev-util/DirectXShaderCompiler/files/DirectXShaderCompiler-1.7.2212-fix-changes-meaning.patch b/dev-util/DirectXShaderCompiler/files/DirectXShaderCompiler-1.7.2212-fix-changes-meaning.patch deleted file mode 100644 index 6a6e4f8bb4..0000000000 --- a/dev-util/DirectXShaderCompiler/files/DirectXShaderCompiler-1.7.2212-fix-changes-meaning.patch +++ /dev/null @@ -1,152 +0,0 @@ -# related: -# https://bugs.gentoo.org/905173 -# https://github.com/microsoft/DirectXShaderCompiler/pull/5179 - -diff --git a/include/llvm/Analysis/DxilValueCache.h b/include/llvm/Analysis/DxilValueCache.h -index 2622bb19..37124255 100644 ---- a/include/llvm/Analysis/DxilValueCache.h -+++ b/include/llvm/Analysis/DxilValueCache.h -@@ -52,7 +52,7 @@ struct DxilValueCache : public ImmutablePass { - - private: - -- WeakValueMap ValueMap; -+ WeakValueMap Map; - bool (*ShouldSkipCallback)(Value *V) = nullptr; - - void MarkUnreachable(BasicBlock *BB); -@@ -77,8 +77,8 @@ public: - Value *GetValue(Value *V, DominatorTree *DT=nullptr); - Constant *GetConstValue(Value *V, DominatorTree *DT = nullptr); - ConstantInt *GetConstInt(Value *V, DominatorTree *DT = nullptr); -- void ResetUnknowns() { ValueMap.ResetUnknowns(); } -- void ResetAll() { ValueMap.ResetAll(); } -+ void ResetUnknowns() { Map.ResetUnknowns(); } -+ void ResetAll() { Map.ResetAll(); } - bool IsUnreachable(BasicBlock *BB, DominatorTree *DT=nullptr); - void SetShouldSkipCallback(bool (*Callback)(Value *V)) { ShouldSkipCallback = Callback; }; - }; -diff --git a/lib/Analysis/DxilValueCache.cpp b/lib/Analysis/DxilValueCache.cpp -index dbd82a39..f5266927 100644 ---- a/lib/Analysis/DxilValueCache.cpp -+++ b/lib/Analysis/DxilValueCache.cpp -@@ -57,7 +57,7 @@ bool IsEntryBlock(const BasicBlock *BB) { - } - - void DxilValueCache::MarkUnreachable(BasicBlock *BB) { -- ValueMap.Set(BB, ConstantInt::get(Type::getInt1Ty(BB->getContext()), 0)); -+ Map.Set(BB, ConstantInt::get(Type::getInt1Ty(BB->getContext()), 0)); - } - - bool DxilValueCache::MayBranchTo(BasicBlock *A, BasicBlock *B) { -@@ -93,7 +93,7 @@ bool DxilValueCache::MayBranchTo(BasicBlock *A, BasicBlock *B) { - } - - bool DxilValueCache::IsUnreachable_(BasicBlock *BB) { -- if (Value *V = ValueMap.Get(BB)) -+ if (Value *V = Map.Get(BB)) - if (IsConstantFalse(V)) - return true; - return false; -@@ -155,7 +155,7 @@ Value *DxilValueCache::ProcessAndSimplify_PHI(Instruction *I, DominatorTree *DT) - // that were computed previously. - if (!Simplified) { - if (SimplifiedNotDominating) -- if (Value *CachedV = ValueMap.Get(SimplifiedNotDominating)) -+ if (Value *CachedV = Map.Get(SimplifiedNotDominating)) - Simplified = CachedV; - } - -@@ -379,7 +379,7 @@ Value *DxilValueCache::SimplifyAndCacheResult(Instruction *I, DominatorTree *DT) - } - - if (Simplified && isa(Simplified)) -- ValueMap.Set(I, Simplified); -+ Map.Set(I, Simplified); - - return Simplified; - } -@@ -500,7 +500,7 @@ void DxilValueCache::WeakValueMap::Set(Value *Key, Value *V) { - // If there's a cached value, return it. Otherwise, return - // the value itself. - Value *DxilValueCache::TryGetCachedValue(Value *V) { -- if (Value *Simplified = ValueMap.Get(V)) -+ if (Value *Simplified = Map.Get(V)) - return Simplified; - return V; - } -@@ -516,7 +516,7 @@ StringRef DxilValueCache::getPassName() const { - Value *DxilValueCache::GetValue(Value *V, DominatorTree *DT) { - if (dyn_cast(V)) - return V; -- if (Value *NewV = ValueMap.Get(V)) -+ if (Value *NewV = Map.Get(V)) - return NewV; - - return ProcessValue(V, DT); -@@ -541,7 +541,7 @@ bool DxilValueCache::IsUnreachable(BasicBlock *BB, DominatorTree *DT) { - - LLVM_DUMP_METHOD - void DxilValueCache::dump() const { -- ValueMap.dump(); -+ Map.dump(); - } - - void DxilValueCache::getAnalysisUsage(AnalysisUsage &AU) const { -@@ -580,15 +580,15 @@ Value *DxilValueCache::ProcessValue(Value *NewV, DominatorTree *DT) { - - // If we haven't seen this value, go in and push things it depends on - // into the worklist. -- if (!ValueMap.Seen(V)) { -- ValueMap.SetSentinel(V); -+ if (!Map.Seen(V)) { -+ Map.SetSentinel(V); - if (Instruction *I = dyn_cast(V)) { - - for (Use &U : I->operands()) { - Instruction *UseI = dyn_cast(U.get()); - if (!UseI) - continue; -- if (!ValueMap.Seen(UseI)) -+ if (!Map.Seen(UseI)) - WorkList.push_back(UseI); - } - -@@ -596,9 +596,9 @@ Value *DxilValueCache::ProcessValue(Value *NewV, DominatorTree *DT) { - for (unsigned i = 0; i < PN->getNumIncomingValues(); i++) { - BasicBlock *BB = PN->getIncomingBlock(i); - TerminatorInst *Term = BB->getTerminator(); -- if (!ValueMap.Seen(Term)) -+ if (!Map.Seen(Term)) - WorkList.push_back(Term); -- if (!ValueMap.Seen(BB)) -+ if (!Map.Seen(BB)) - WorkList.push_back(BB); - } - } -@@ -607,9 +607,9 @@ Value *DxilValueCache::ProcessValue(Value *NewV, DominatorTree *DT) { - for (pred_iterator PI = pred_begin(BB), E = pred_end(BB); PI != E; PI++) { - BasicBlock *PredBB = *PI; - TerminatorInst *Term = PredBB->getTerminator(); -- if (!ValueMap.Seen(Term)) -+ if (!Map.Seen(Term)) - WorkList.push_back(Term); -- if (!ValueMap.Seen(PredBB)) -+ if (!Map.Seen(PredBB)) - WorkList.push_back(PredBB); - } - } -diff --git a/tools/clang/include/clang/Basic/Version.h b/tools/clang/include/clang/Basic/Version.h -index d3a3b4f4..19fa889c 100644 ---- a/tools/clang/include/clang/Basic/Version.h -+++ b/tools/clang/include/clang/Basic/Version.h -@@ -18,7 +18,8 @@ - - #include "clang/Basic/Version.inc" - #include "llvm/ADT/StringRef.h" -- -+// HLSL Change - for uint32_t. -+#include - /// \brief Helper macro for CLANG_VERSION_STRING. - #define CLANG_MAKE_VERSION_STRING2(X) #X -