commit: 4b51b5d62874e2fc727024c1d2240072de6df75d
Author: Charlie Quinet <w.iron.zombie <AT> gmail <DOT> com>
AuthorDate: Wed Apr 30 20:57:21 2025 +0000
Commit: Quinet Charlie <w.iron.zombie <AT> gmail <DOT> com>
CommitDate: Wed Apr 30 20:57:21 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4b51b5d6
media-libs/amdvlk: add 2025.2.1, drop 2025.1.3
Signed-off-by: Charlie Quinet <w.iron.zombie <AT> gmail.com>
media-libs/amdvlk/Manifest | 16 ++++++++--------
.../{amdvlk-2025.1.3.ebuild => amdvlk-2025.2.1.ebuild} | 18 ++++++++++--------
.../amdvlk/files/amdvlk-2025.2.1-gpurt-path.patch | 13 +++++++++++++
.../amdvlk/files/amdvlk-2025.2.1-rapidjson-fix.patch | 13 +++++++++++++
4 files changed, 44 insertions(+), 16 deletions(-)
diff --git a/media-libs/amdvlk/Manifest b/media-libs/amdvlk/Manifest
index 3223adb61..d5b055092 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-50260f8bdd9ce47b388f5009546a438aba8b9d16.tar.gz
108208 BLAKE2B
02a9512129e83f8788bfcb3b080b4fca98056a0378aa593d9dfc7f055fe0001faff0e1d09084e43837df964ec94357737a28c6deae9097b3d3728883ca1607ef
SHA512
2da460aa6eb3f5e50b2c3a810ff48ec583e35ea2df9326700597c32183615bf0bbdb7d0f2dc59c3fdaa31737608cc237e6ece62e29a1d77003c24e77dc76775c
-DIST amdvlk-MetroHash-18893fb28601bb9af1154cd1a671a121fff6d8d3.tar.gz 11729
BLAKE2B
b0e3de885e50c317141d62c885b421c7fd2e1ac783733704342bbed3109bff36a9209ab276f534a2231531483539221bbb1014bd39528a91124161bafc5646eb
SHA512
8f12f95e80d594c8bd87a852c67a2d6777ce89d1a13e1a87ee17bbb876a0702c14ffe7a7fd65a244620f2043ad5d22ae8eb863d69f1dc5494d985733bbfb7bf9
-DIST amdvlk-gpurt-f734985ebc31f471c376ed0cb217f43bdd40ee17.tar.gz 521225
BLAKE2B
6ca35f9f70b3e44c672e1300d6ccc4257406b2c9b3e4ff7e2e77bef988c94e69161d5a3f1d9c5a0eea59d75901e9e814ba6a6fd3dfb4b8c3035fc65e0986366c
SHA512
f5b45a60b28c1ecf0262ae27fb5f886d5c86cebf535acd7635688c147ac4d5922b37cadc7b1df53cf22d4df2807cdcd5a3a3d540deb23c71bb825494582965ad
-DIST amdvlk-llpc-188bbf6a5b9403813e51d39f6fc8429550dbf267.tar.gz 2859434
BLAKE2B
b8f80a0caa594f0a1b44ed21eb9bf2c427cb34012d02822766a7fb5af1e4fe42a185a644e3560036c76d1df43e8de21e8e32c195f6d5cd028b7f3c8299ef034e
SHA512
5d05e26b9d8a5488e71bf369a6f0c91bd2f582294f03c8c26d88f86ff1c7e5e08672596c251e7333ab63c7e90cbc69a73d3a97fd06faf127a5692648a84471a3
-DIST amdvlk-llvm-project-cf4271cbb7c60a6517c45e9fc9fa09a9f420f512.tar.gz
227348402 BLAKE2B
5900e3cec63d28b59063de66cf0d5a89d1c03787e6e557250a51d6a3259ab38069fc8f3b66b59189475d7c50bdf4828ed287023dbaac485f9e5efc892c6a3694
SHA512
ac849f5f652e5dbdee48224e836e2d9ee40c90e1462b5dc6c6a92ad1d6cdf146d167c1adf4b5cc8ca2bdcf50f2af7d58e36de38bcd6e07d4434660459b3e7bfb
-DIST amdvlk-pal-04bc1e796dd15fc90fff8fa826d32e431d8722f6.tar.gz 10511185
BLAKE2B
524709686ac1d85fab5053e0ef88b970253e7e60dfab18342a8d01a8f311f00cec2045bb2f90c0089fd8447663b56f53eeabfdd06f30dc9a809c76b95e2dcf31
SHA512
3a6bcfac396d5fb8206a9f8d84477cc0fea498173071b9b15f8f07a950d5005928c202c50010b980a9dc2c2dade77f4681ab8ec0b00698b652425b0e2a070915
-DIST amdvlk-xgl-ba24064a9c93e76d0cafb0196996e779fbe70bf4.tar.gz 1425276
BLAKE2B
ec2ac35c014ba7714b2c3591acf36078568d19f45ca285fdcf20d0d341d85c27a6b9ca50851962dad339821435f9b10e6ed8cc2b8db804c83720c6fda7287e2f
SHA512
de8f9f1682cd984ea5cbb6ac2a771137062238720c12521d2b0111f02680eae539aaef3ac31ae1b2f47cba7f6114b42944fee6b501f74a7d7355e2a79a23781e
+DIST amdvlk-CWPack-73d612971b3a73341f241b021e5cbda220eef7f2.tar.gz 39648
BLAKE2B
106ff9d5a40560142260f32c849296ea611c360d9d8143ae5f02e45663bba807b0482e62ba5d67132a7c196120ccdc2777de960673b5450941eecbc98b982a18
SHA512
e4998b87f5fb6f4f8f69f069933fd36fe268b863a8c4357f3c8daf0dacf87c92911e4d513cea78ade5a31104a58b3a6215b0d9c3a8b7939915b2054b1d64c764
+DIST amdvlk-LLVM-dialects-b249d1d3285696bd2a6a5729f5dfb7f69150047e.tar.gz
109865 BLAKE2B
9f5bc2259369d8ce7251faf8cc50c4b69ad37c9454f6ad2b1e47f82d25467af201c05db6b9c3a73254e4f5fd389bc785bbe170ad397964ec5f7cfe5239701594
SHA512
8630cb184cfdec519863eca5421e2bc4058afbdef4478a9dfcdbb21dab3ea1f880d553689fd2f9c54ea1bb61ecc040fe22645f4dfd70b3ff2e1f4fb00ec60564
+DIST amdvlk-MetroHash-6ab6ee5d31d001ba73feb5e7f13dbc75da96b620.tar.gz 11732
BLAKE2B
ba16c103947f73f2f178509a571eb49678fddf354d619c1881a51185b67e84c96ce7743b8cb347ded64d2ec5e9ddd5e113168b5173fcbf671a57584e33f2feb8
SHA512
ead0ef0b09835baf40931a79b49eea52b36c54a627eb720b004fa34588fb6111c8d6cdb5cb42d2384d60f3df5b3643e5b980f4904fce9473a3d3fca7baf258fc
+DIST amdvlk-gpurt-7b226d48b46b7e92fec3b9ecc5712e5bf2bf3dd9.tar.gz 546000
BLAKE2B
d40c53f4041ada7e3dc58aecd0e82aa9f8ed87f37c75c683c812468d017d5ddc43f576fca3ad58432496f6280f68c6791a2f0cf23c8e26e2f4846d09c6b7bf41
SHA512
06aad81d4c353b316d5c772f147f2d519265f6da718c321daee446dc77d7392aca7f40e51eadf9b18a9e939add1f47f2381ec46914af739a6ecdf8c5472bd48b
+DIST amdvlk-llpc-40cb8d95ad8d6f7f1652e3fd47d39667594cce08.tar.gz 2972806
BLAKE2B
bb7c3f92e5c33fcc9441e80d892c92c2b06c9d7c8144996a82d64048d735135785962e2ef4c8b0f95f7c2101c54f49b65a8ef6773c373320416491e8d64a3a6b
SHA512
6272f1766bcb2f53ea1f42a89652fca69e74997cbac34896ebaaae9dc4018bf648d8a912d8b3e65b59ffee875a884721a93c8138f253ebf46eb5d144233b6e92
+DIST amdvlk-llvm-project-8fd93e26cf9b1235fc9573b68b96233818be0ed4.tar.gz
230574460 BLAKE2B
a64428d5694a3ddeaee9915f0e3fdbda3df2dec86e6c6ae9404e0653f25c277fbc2b8738823b678d9cef45191532ce8a52bbfaea1cbaf745a338863fa5972714
SHA512
aec3ef1e726cd7a97b0ee4885f1f9068562f549caf66fd172fe7b86ace847fb8b9c9bea9b67c03d71d6cfa529e7fd1f38b738ae9931fc9f5c042cfe3eaf97c76
+DIST amdvlk-pal-c5e800072a32f68b6ccc4422936d96167c6e0728.tar.gz 10627151
BLAKE2B
7b599b837d6b7545267c10685fab188f14ba3b0e54f0a54fbe488aef2ac3538c95bcc0eb6b63d4527d84663ef04f3968450514b5eee76b852c18ddea0b6b1d5f
SHA512
859e23b69e11021ebf95bba912ee7a89a1ab5aa6d50525f9a86a53a80b55c1c5c59778ac5ab098c6325934ee3b7fee3914ec615b57bf6bc967da82adcceff619
+DIST amdvlk-xgl-e9782eb33ce5e5e4ed2e339542a28c1b933624b4.tar.gz 1448430
BLAKE2B
22de4c218e8ae8a2d679784cf621ce6574f73a51badf4dd968a34ab7a4be09323d44ba7e48d214be3d5cef35d88ca13dcf5fbff5f36e26bccc02c99b362292ac
SHA512
ec8a22ce6bc1615de69b4093cfc36f635b08d2bc56c3f09612ef5df5895357cbfb15b04888a96c2617ebe3f270d67c2ac071f7986466f46a41da7d8469d756cc
diff --git a/media-libs/amdvlk/amdvlk-2025.1.3.ebuild
b/media-libs/amdvlk/amdvlk-2025.2.1.ebuild
similarity index 91%
rename from media-libs/amdvlk/amdvlk-2025.1.3.ebuild
rename to media-libs/amdvlk/amdvlk-2025.2.1.ebuild
index d1c66a789..e49e24cbd 100644
--- a/media-libs/amdvlk/amdvlk-2025.1.3.ebuild
+++ b/media-libs/amdvlk/amdvlk-2025.2.1.ebuild
@@ -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="ba24064a9c93e76d0cafb0196996e779fbe70bf4"
-PAL_COMMIT="04bc1e796dd15fc90fff8fa826d32e431d8722f6"
-LLPC_COMMIT="188bbf6a5b9403813e51d39f6fc8429550dbf267"
-GPURT_COMMIT="f734985ebc31f471c376ed0cb217f43bdd40ee17"
-LLVM_PROJECT_COMMIT="cf4271cbb7c60a6517c45e9fc9fa09a9f420f512"
-METROHASH_COMMIT="18893fb28601bb9af1154cd1a671a121fff6d8d3"
-CWPACK_COMMIT="4f8cf0584442a91d829d269158567d7ed926f026"
+XGL_COMMIT="e9782eb33ce5e5e4ed2e339542a28c1b933624b4"
+PAL_COMMIT="c5e800072a32f68b6ccc4422936d96167c6e0728"
+LLPC_COMMIT="40cb8d95ad8d6f7f1652e3fd47d39667594cce08"
+GPURT_COMMIT="7b226d48b46b7e92fec3b9ecc5712e5bf2bf3dd9"
+LLVM_PROJECT_COMMIT="8fd93e26cf9b1235fc9573b68b96233818be0ed4"
+METROHASH_COMMIT="6ab6ee5d31d001ba73feb5e7f13dbc75da96b620"
+CWPACK_COMMIT="73d612971b3a73341f241b021e5cbda220eef7f2"
# Submodule of LLPC, also updates often. Grab commit version from
# https://github.com/GPUOpen-Drivers/llpc/tree/${LLPC_COMMIT}/imported
-LLVM_DIALECTS_COMMIT="50260f8bdd9ce47b388f5009546a438aba8b9d16"
+LLVM_DIALECTS_COMMIT="b249d1d3285696bd2a6a5729f5dfb7f69150047e"
### 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
@@ -81,6 +81,8 @@ 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-2025.2.1-gpurt-path.patch"
+ "${FILESDIR}/amdvlk-2025.2.1-rapidjson-fix.patch"
)
python_check_deps() {
diff --git a/media-libs/amdvlk/files/amdvlk-2025.2.1-gpurt-path.patch
b/media-libs/amdvlk/files/amdvlk-2025.2.1-gpurt-path.patch
new file mode 100644
index 000000000..20e354365
--- /dev/null
+++ b/media-libs/amdvlk/files/amdvlk-2025.2.1-gpurt-path.patch
@@ -0,0 +1,13 @@
+diff --git a/gpurt/cmake/GpuRtGenerateShaders.cmake
b/gpurt/cmake/GpuRtGenerateShaders.cmake
+index ccc06fe..b4893a8 100644
+--- a/gpurt/cmake/GpuRtGenerateShaders.cmake
++++ b/gpurt/cmake/GpuRtGenerateShaders.cmake
+@@ -72,7 +72,7 @@ set(gpurtDebugInfoFile
"${CMAKE_CURRENT_BINARY_DIR}/g_gpurtDebugInfo.h")
+ find_program(gpurtSpirvRemap spirv-remap REQUIRED)
+ # Find dxcompiler library.
+ get_filename_component(gpurtDxcCompilerDirectory "${gpurtDxcCompiler}"
DIRECTORY)
+- find_library(gpurtDxcompilerLib dxcompiler HINTS
${gpurtDxcCompilerDirectory} /usr/lib/dxc REQUIRED)
++ find_library(gpurtDxcompilerLib dxcompiler HINTS
${gpurtDxcCompilerDirectory} /usr/lib/llvm/dxc/lib REQUIRED)
+
+ set(originalShaderSourceDir "${GPU_RAY_TRACING_SOURCE_DIR}/src/shaders/")
+ set(originalShaderSource ${GPURT_SHADER_SOURCE_FILES})
diff --git a/media-libs/amdvlk/files/amdvlk-2025.2.1-rapidjson-fix.patch
b/media-libs/amdvlk/files/amdvlk-2025.2.1-rapidjson-fix.patch
new file mode 100644
index 000000000..7beb8ffc7
--- /dev/null
+++ b/media-libs/amdvlk/files/amdvlk-2025.2.1-rapidjson-fix.patch
@@ -0,0 +1,13 @@
+diff --git
a/pal/shared/devdriver/third_party/rapidjson/include/rapidjson/document.h
b/pal/shared/devdriver/third_party/rapidjson/include/rapidjson/document.h
+index e3e20dfb..ad362a69 100644
+--- a/pal/shared/devdriver/third_party/rapidjson/include/rapidjson/document.h
++++ b/pal/shared/devdriver/third_party/rapidjson/include/rapidjson/document.h
+@@ -322,7 +322,7 @@ struct GenericStringRef {
+ operator const Ch *() const { return s; }
+
+ const Ch* const s; //!< plain CharType pointer
+- const SizeType length; //!< length of the string (excluding the trailing
NULL terminator)
++ SizeType length; //!< length of the string (excluding the trailing NULL
terminator)
+
+ private:
+ //! Disallow construction from non-const array
