Skip to content

Commit 55d66e5

Browse files
Username404-59Username404-59
committed
media-libs/amdvlk: update to 2024.4.1
Signed-off-by: Username404-59 <[email protected]>
1 parent ad9fc7a commit 55d66e5

File tree

5 files changed

+41
-28
lines changed

5 files changed

+41
-28
lines changed

‎media-libs/amdvlk/Manifest‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
DIST amdvlk-CWPack-4f8cf0584442a91d829d269158567d7ed926f026.tar.gz 39633 BLAKE2B d5b2a88f0d563eef5beb42a8304cf6cdd825e75242c22acc360c5bb9cbd1d02a4f891b6b2f3a4803e1e6b48a4d176aad40f8bdeca92847f2fbf53674dedeaff3 SHA512 06d56baaba1f1224a5266f4a63c1abf70edba7cc16cc4e62f2f5b1ec94fc2c1cfc4c6f11a9c6ef42c23b29be8d07921caad5e919357c0bd82cf714783eee0bcc
2-
DIST amdvlk-LLVM-dialects-bdfb113d8d765bdf4554a2b30ae909b93f26aeea.tar.gz 106775 BLAKE2B 0fe96213e62ac0e90b7c4a62a43909bdc6f047901f5b338773739146fe56cef86d92e3af90ae1188358f3af836f5c09566ea61cfd634eafe46ae5c2c07d4623f SHA512 d5eda9ade2d94cc2ff8ddda546cbb0b5992aa8138eda27dca31c706af42e99bcdda85527ca768a421b06328e879a2ef3ceaeb89611caf38c85043da79d2a99d4
2+
DIST amdvlk-LLVM-dialects-c4365946902436063f872dbcf1a370fe73982a54.tar.gz 106922 BLAKE2B be9eecbaab1bab302a08181373158f335feecae941f8f5ca4ea99cecb35a5aa6f515ed5478a94cfe67e7c6868a0b834ca8756410082908ae74fe8d4d3d92cabd SHA512 ee7159e4de582d2848224473a58942459efdd55e38aab472157a9cb0b679565696fb04fdd7875d06dcb13659e5c8d19d5dfda18dbda1fef16ace30416539b356
33
DIST amdvlk-MetroHash-18893fb28601bb9af1154cd1a671a121fff6d8d3.tar.gz 11729 BLAKE2B b0e3de885e50c317141d62c885b421c7fd2e1ac783733704342bbed3109bff36a9209ab276f534a2231531483539221bbb1014bd39528a91124161bafc5646eb SHA512 8f12f95e80d594c8bd87a852c67a2d6777ce89d1a13e1a87ee17bbb876a0702c14ffe7a7fd65a244620f2043ad5d22ae8eb863d69f1dc5494d985733bbfb7bf9
4-
DIST amdvlk-gpurt-95c27c4031b112daaa231b76dee07f7ff05357d0.tar.gz 351839 BLAKE2B b2e4c4cdb4f2532cf22316ceb8cb6a949a2128bd1fd0276bf515793291bc63a84e0d0205fb195259f87eaf036dd0323e9d6a931b95d21bd66bc09f3c81654cd4 SHA512 f698157c7cfdbc25524230a949cef4c8b3d682825c6efe3f68b93d5b8c48b66f1c27826adb9e2d7b6670e5bea16eeec3e085dfecb39d29a37a2198c8b46ab74c
5-
DIST amdvlk-llpc-872ddfdeecfd1e56ddbc0db2012b96788129fee9.tar.gz 2860471 BLAKE2B f2496e90238796dccd584d539bc210e14f68731fb92f74ba6353ad6464e4eec228cccfeca54d05effd4e2913ccf43ed640175cad71afa3b610546e16760b970d SHA512 d09072aa89a8a593f76e09d8c8d3166663ce8bcbb379793f96509f2248112541207cc5fb1fa0a2df1a40a7a35b51c28d382e77d83996e70d961b92e8338209da
6-
DIST amdvlk-llvm-project-8abfff872ebbb1f57ebe83149f8166fb5dd487dc.tar.gz 217893483 BLAKE2B 53a543629a2392b6cb496a4c0c852516e516c315c9e2742555e44b4998eef2d59455f3ac8f1cb206c857e819e5f17fcf20a5878d2224679aa1fa7695cf80826c SHA512 04f4bff33be025ff6ae9591312ea9aa9a5e600268ac25186e36b401f27333bf75a83d4c784e289325def995254d54bede9b02484cc3152cebbdf39a32dc31f2a
7-
DIST amdvlk-pal-31f6a70d0e9ee22894daab5305dd91b3ebb599a5.tar.gz 10376369 BLAKE2B d9f8e3c1e27cca738b08bd55e9e7c7b9fe139fafe60e4ff35f43f99b38e6100b92b47d826cc90be93cdc5eb68db03537e127e4cdd6d10073848fbc4a3d826aaf SHA512 bf420c9e4fc5454b84ddb9bdbe843ede4af77e79298fc7b2b3dc7bc5af8391f97d8c9e71487c9ed97219a554f103af65a1f9687f51843e27fcad95d1a1fee85e
8-
DIST amdvlk-xgl-c4ca1f6077c7fecc8df2ad2ed8719fb943b4e4b1.tar.gz 1365942 BLAKE2B 5b65a21e9a8181ddd78cdb8dabe9b7ba85961757f220bbdf844da0222ab2af14a01b8adac2eae1f4dd61be326b753cbc03c6f5433717d10d645fe9fa8e3a3f6a SHA512 832fbd90689196a8989e43f9cf696e2c8384e4bd48f0caa3869ff68830693683375a1ce4553043ab40e3fc097763955094f903a8580eac533735d32f102d099a
4+
DIST amdvlk-gpurt-f2d96f116cbbe34b2784c589b63d851c8b31b2e0.tar.gz 353788 BLAKE2B 500d54f28e1399a0c537fd29a805c7bce228f703670e7d3de7c3e55c7e1114b3f82abff7aecd9045d5f8d9dc96a18f5d50027025f3a031c7f6a277b2ba83e37d SHA512 9b9842ce5ebb2abb4b1545612fe49329804e1a2e454ca3458b4d7d8319d852f3394552b90298e2e074697ab85545b6b09e2cec367439027976fef0ce5aa253c5
5+
DIST amdvlk-llpc-b36b68fff3bc4bfb171ffa1e23597309d5d52cd6.tar.gz 2968132 BLAKE2B f9ddb5f164759c03c807da2deb3fdcf0d8c0f40ac3889679855a6d51544e345ab5f6dbcf0411300e6637228882539a83b30f9cb111c19bdf33845b7a97070a3b SHA512 3fe65c2e9e4d161709de0adc854d77b322fdc4724b56589f8ef050719e714d8792e53699fcd212e4f951d7f92dee538d23ce1c39ead39808df1168cd916a93e4
6+
DIST amdvlk-llvm-project-56f5582fdb0cc1d3f8f33bbb6ce1d9c32342c1d3.tar.gz 219369212 BLAKE2B 076022295f23b4fb20af662e97dd909dd480a784511d7b67e48005b61bb60cf8848cd625a05d1ebbd57afd606cdce6b6ae3bc2c36bf64299d12bdaa1d45f209f SHA512 23f0218e94597474a4a52195f076bc691e0f3d09089db0b4b8504ca2c0c75f42f1cbd40dd824d3f64d5d777099927cdbfeeb0edb455dccd6c743d30c50da26dd
7+
DIST amdvlk-pal-135eafd1b599b3dd57a1163701477f29259f5066.tar.gz 9814276 BLAKE2B d47f742830fac2df54e7e4063d64fba70bdca9736d6962577619b5f69da8fcdc01d2980df9e96b0fae282297a99853ce3c514d95dbce71c50d3cfc461286d6a4 SHA512 728da040b1af64a5f591fb64c48ee79d44da595d084f04ea5527cf00b050da594c9ee5c7372d4ed7da2460636290889a17f85630e2c235c2c1bff697f13363f5
8+
DIST amdvlk-xgl-8e7968c48914873b1c98b21cfb079573f9488d79.tar.gz 1384834 BLAKE2B caa5e4b1570e7475ea87af38ba3992c397052a52e768c5e53f58e1a408570e3d704de251f80efd31ddad1e27a5329baa75934f55cd8331d6da5709cb6d9ee93a SHA512 21d0639f1a7f2ce8d0f84551c1fb8b5c2ef8a6c7edc4080a662ccc7b50642f37acf461e66b8ae62062bf6d9767997983b303b3672cf4905a13658e9e68dfa47c

media-libs/amdvlk/amdvlk-2024.3.3.ebuild renamed to media-libs/amdvlk/amdvlk-2024.4.1.ebuild

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ FETCH_URI="https://github.com/GPUOpen-Drivers"
1818
## and place commits in the desired variables
1919
## EXAMPLE: XGL_COMMIT="80e5a4b11ad2058097e77746772ddc9ab2118e07"
2020
## SRC_URI="... ${FETCH_URI}/$PART/archive/$COMMIT.zip -> $PART-$COMMIT.zip ..."
21-
XGL_COMMIT="c4ca1f6077c7fecc8df2ad2ed8719fb943b4e4b1"
22-
PAL_COMMIT="31f6a70d0e9ee22894daab5305dd91b3ebb599a5"
23-
LLPC_COMMIT="872ddfdeecfd1e56ddbc0db2012b96788129fee9"
24-
GPURT_COMMIT="95c27c4031b112daaa231b76dee07f7ff05357d0"
25-
LLVM_PROJECT_COMMIT="8abfff872ebbb1f57ebe83149f8166fb5dd487dc"
21+
XGL_COMMIT="8e7968c48914873b1c98b21cfb079573f9488d79"
22+
PAL_COMMIT="135eafd1b599b3dd57a1163701477f29259f5066"
23+
LLPC_COMMIT="b36b68fff3bc4bfb171ffa1e23597309d5d52cd6"
24+
GPURT_COMMIT="f2d96f116cbbe34b2784c589b63d851c8b31b2e0"
25+
LLVM_PROJECT_COMMIT="56f5582fdb0cc1d3f8f33bbb6ce1d9c32342c1d3"
2626
METROHASH_COMMIT="18893fb28601bb9af1154cd1a671a121fff6d8d3"
2727
CWPACK_COMMIT="4f8cf0584442a91d829d269158567d7ed926f026"
2828
# Submodule of LLPC, also updates often. Grab commit version from
2929
# https://github.com/GPUOpen-Drivers/llpc/tree/${LLPC_COMMIT}/imported
30-
LLVM_DIALECTS_COMMIT="bdfb113d8d765bdf4554a2b30ae909b93f26aeea"
30+
LLVM_DIALECTS_COMMIT="c4365946902436063f872dbcf1a370fe73982a54"
3131
### end of variables
3232
SRC_URI="${FETCH_URI}/xgl/archive/${XGL_COMMIT}.tar.gz -> amdvlk-xgl-${XGL_COMMIT}.tar.gz
3333
${FETCH_URI}/pal/archive/${PAL_COMMIT}.tar.gz -> amdvlk-pal-${PAL_COMMIT}.tar.gz
@@ -49,7 +49,7 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
4949
BUNDLED_LLVM_DEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]"
5050
DEPEND="wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
5151
${BUNDLED_LLVM_DEPEND}
52-
>=dev-util/vulkan-headers-1.3.283
52+
>=dev-util/vulkan-headers-1.3.293
5353
raytracing? ( dev-util/DirectXShaderCompiler )
5454
dev-util/glslang[${MULTILIB_USEDEP}]"
5555
BDEPEND="${BUNDLED_LLVM_DEPEND}
@@ -61,7 +61,7 @@ RDEPEND=" ${DEPEND}
6161
x11-libs/libXrandr[${MULTILIB_USEDEP}]
6262
x11-libs/libxcb[${MULTILIB_USEDEP}]
6363
x11-libs/libxshmfence[${MULTILIB_USEDEP}]
64-
>=media-libs/vulkan-loader-1.3.290[${MULTILIB_USEDEP}]
64+
>=media-libs/vulkan-loader-1.3.293[${MULTILIB_USEDEP}]
6565
dev-util/glslang[${MULTILIB_USEDEP}]
6666
dev-libs/openssl[${MULTILIB_USEDEP}]" #890449
6767

@@ -73,11 +73,12 @@ CMAKE_MAKEFILE_GENERATOR=ninja
7373
PATCHES=(
7474
"${FILESDIR}/amdvlk-2022.3.5-no-compiler-presets.patch" #875821
7575
"${FILESDIR}/amdvlk-2022.4.1-proper-libdir.patch"
76-
"${FILESDIR}/amdvlk-2022.4.2-license-path.patch" #878803
76+
"${FILESDIR}/amdvlk-2024.4.1-license-path.patch" #878803
7777
#"${FILESDIR}/amdvlk-2022.4.2-reduced-llvm-installations.patch"
7878
#"${FILESDIR}/amdvlk-2022.4.2-reduced-llvm-installations-part2.patch"
7979
"${FILESDIR}/amdvlk-2024.3.1-disable-Werror.patch"
8080
"${FILESDIR}/amdvlk-2024.3.3-fix-build.patch"
81+
"${FILESDIR}/amdvlk-2024.4.1-missing-header.patch"
8182
)
8283

8384
pkg_pretend(){

‎media-libs/amdvlk/files/amdvlk-2022.4.2-license-path.patch‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎media-libs/amdvlk/files/amdvlk-2024.4.1-license-path.patch‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/xgl/cmake/XglPackaging.cmake b/xgl/cmake/XglPackaging.cmake
2+
index 05a84a4..cc878d7 100644
3+
--- a/xgl/cmake/XglPackaging.cmake
4+
+++ b/xgl/cmake/XglPackaging.cmake
5+
@@ -141,7 +141,7 @@ function(generateInstallTargets)
6+
endif()
7+
elseif(PACKAGE_NAME STREQUAL "amdvlk")
8+
if(EXISTS ${CMAKE_SOURCE_DIR}/LICENSE.txt)
9+
- install(FILES ${CMAKE_SOURCE_DIR}/LICENSE.txt COMPONENT icd DESTINATION share/doc/${PACKAGE_NAME})
10+
+ install(FILES ${CMAKE_SOURCE_DIR}/LICENSE.txt COMPONENT icd DESTINATION share/doc/${PACKAGE_NAME}-${PACKAGE_VERSION})
11+
else()
12+
message(WARNING "LICENSE.txt is not found under ${CMAKE_SOURCE_DIR}, please put it there")
13+
endif()

‎media-libs/amdvlk/files/amdvlk-2024.4.1-missing-header.patch‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/pal/src/core/misc/cacheLayer/multiElfCacheLayer.cpp b/pal/src/core/misc/cacheLayer/multiElfCacheLayer.cpp
2+
index 93af97aa..73db7af8 100644
3+
--- a/pal/src/core/misc/cacheLayer/multiElfCacheLayer.cpp
4+
+++ b/pal/src/core/misc/cacheLayer/multiElfCacheLayer.cpp
5+
@@ -24,6 +24,7 @@
6+
**********************************************************************************************************************/
7+
#include "multiElfCacheLayer.h"
8+
#include <cinttypes>
9+
+#include <cstdio>
10+
11+
namespace Util
12+
{

0 commit comments

Comments
 (0)