commit: 2036471360a1972d3f5f39ad56803738bb30bf34 Author: Denis Reva <denis7774 <AT> gmail <DOT> com> AuthorDate: Thu Dec 5 08:09:59 2024 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Thu Dec 5 08:09:59 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=20364713
media-libs/amdvlk: updated from: https://github.com/gentoo/guru/pull/256 Bug: https://bugs.gentoo.org/665590 Signed-off-by: Denis Reva <denis7774 <AT> gmail.com> media-libs/amdvlk/Manifest | 12 ++++++------ ...mdvlk-2024.3.3.ebuild => amdvlk-2024.4.2.ebuild} | 21 ++++++++++----------- .../amdvlk/files/amdvlk-2022.4.2-license-path.patch | 13 ------------- .../amdvlk/files/amdvlk-2024.3.3-fix-build.patch | 13 ------------- .../amdvlk/files/amdvlk-2024.4.1-license-path.patch | 13 +++++++++++++ .../files/amdvlk-2024.4.1-missing-header.patch | 12 ++++++++++++ 6 files changed, 41 insertions(+), 43 deletions(-) diff --git a/media-libs/amdvlk/Manifest b/media-libs/amdvlk/Manifest index 000ec0fa7..9e32e386d 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-bdfb113d8d765bdf4554a2b30ae909b93f26aeea.tar.gz 106775 BLAKE2B 0fe96213e62ac0e90b7c4a62a43909bdc6f047901f5b338773739146fe56cef86d92e3af90ae1188358f3af836f5c09566ea61cfd634eafe46ae5c2c07d4623f SHA512 d5eda9ade2d94cc2ff8ddda546cbb0b5992aa8138eda27dca31c706af42e99bcdda85527ca768a421b06328e879a2ef3ceaeb89611caf38c85043da79d2a99d4 +DIST amdvlk-LLVM-dialects-50e4ca3a5c365b0bde36b122cc34256406723049.tar.gz 106566 BLAKE2B 1b9231db33f8ec8e21d62b050b927ac8f1fc852e67785c615cd35c95b78a6fdce0bea3fc6283a80f63af747d607704baf3dffb745e065b6ff9c1a39c2e067393 SHA512 0c5bbaa71bb4183cb7ed8af6466f62c1dbea0f8c2bad9c0f082438e0db85cb9c5119321d9ffa920aa6484dbb55f623d6aa6d614ebb8f6daf7ca5aed2dc3726ad DIST amdvlk-MetroHash-18893fb28601bb9af1154cd1a671a121fff6d8d3.tar.gz 11729 BLAKE2B b0e3de885e50c317141d62c885b421c7fd2e1ac783733704342bbed3109bff36a9209ab276f534a2231531483539221bbb1014bd39528a91124161bafc5646eb SHA512 8f12f95e80d594c8bd87a852c67a2d6777ce89d1a13e1a87ee17bbb876a0702c14ffe7a7fd65a244620f2043ad5d22ae8eb863d69f1dc5494d985733bbfb7bf9 -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 +DIST amdvlk-gpurt-aa5ba689e8c33b6d42d4261687988e6e0b13998c.tar.gz 355370 BLAKE2B 8d3bc83e2d585c74d59cb2d6b717f91bd071eba1bbd3a30fdb692e131962fe0fac4b58878a961332bf36adda70f9e94ce4210cf3543301202676a5e182c97728 SHA512 0b89a8d3c2326f8bba6482f62fe927d2d7229625ae62a182e65a8d91ec066f03c9f94949e844e8698180026049e2ee7356094efa09d25d4cda79f5009356add2 +DIST amdvlk-llpc-1d04cdcb4c3d4edc300d9a61969a87208d44dcc4.tar.gz 2765940 BLAKE2B 8a11fdb3020115d05ea4b0bf7e8ad6a7b5262e2000e5d9be23fbf3bdf18687bffe251216bb9201852e4e4e84d92affa8c8f63ca62c1d717cfe0bd27100a50ab6 SHA512 2ac1a529b5ca59e796ee7b46b134d3392195f0a247a09aa8b7b3e4ccee42cdb52ca095bbcbd1befc49c252bc599a924efb6fcf23065b12cdda0ec809b4f98ff9 +DIST amdvlk-llvm-project-07d4dd012428b5a8c563de7c51ef33ab09bae53b.tar.gz 222378703 BLAKE2B be2a0ea202ab68d0dba975a4d53b2fe69c71acfa4d34f7f595a5c4b762548d272e3f7b5ddc36f0acae626721ea80dfd01f4971adca3f03a2790a0d845520eda0 SHA512 8a807ea3850c67c4e4bbf7fd2a9fec6d7022e73af1d6c15df1dd9374ed67de319698c0c030a07b9ce43ef2ea0edcabd5618301066ac8cc2d82cd7d5f313d5811 +DIST amdvlk-pal-b6da370a9bc66d86820fd3034a16e5b59ed7ff86.tar.gz 9647818 BLAKE2B 1c191b013800efbf696334fd35a3ea6c1b279ca4587687c061f91a3c2a985cb39bef24939b33b56e78ba09a14cf583784ffada095ead6083d5d82d516a3bc82c SHA512 427c01b141e729aadd46ca99b9f1ab62ac931e4f6e39a7de7add25efa43dd9a6e99535a69b7810fe73ec00b1c93eda7684762dd3f0178ac0e8faf63472d04bb1 +DIST amdvlk-xgl-a367518e0bf308056492d994c5713e06af9429af.tar.gz 1386723 BLAKE2B 26878ea2eeb8c3e1df0bdffad724a1f8a480043961b6482c3fa8e92768547441a0c912835b341591fb25f2624f635bf21ab808d8179901d42176c5fe69f10cac SHA512 38edd836bf35c44eaf1ad6cbc73e56a775b4e4bf834813965cbd144490990226dc454bcea43eedc6cbc667eab8aef44b9c234e38a619db9c1a37780a925cb0b2 diff --git a/media-libs/amdvlk/amdvlk-2024.3.3.ebuild b/media-libs/amdvlk/amdvlk-2024.4.2.ebuild old mode 100644 new mode 100755 similarity index 90% rename from media-libs/amdvlk/amdvlk-2024.3.3.ebuild rename to media-libs/amdvlk/amdvlk-2024.4.2.ebuild index 7d5fc13e0..87ce22034 --- a/media-libs/amdvlk/amdvlk-2024.3.3.ebuild +++ b/media-libs/amdvlk/amdvlk-2024.4.2.ebuild @@ -4,7 +4,7 @@ EAPI=8 MULTILIB_COMPAT=( abi_x86_{32,64} ) -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) 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="c4ca1f6077c7fecc8df2ad2ed8719fb943b4e4b1" -PAL_COMMIT="31f6a70d0e9ee22894daab5305dd91b3ebb599a5" -LLPC_COMMIT="872ddfdeecfd1e56ddbc0db2012b96788129fee9" -GPURT_COMMIT="95c27c4031b112daaa231b76dee07f7ff05357d0" -LLVM_PROJECT_COMMIT="8abfff872ebbb1f57ebe83149f8166fb5dd487dc" +XGL_COMMIT="a367518e0bf308056492d994c5713e06af9429af" +PAL_COMMIT="b6da370a9bc66d86820fd3034a16e5b59ed7ff86" +LLPC_COMMIT="1d04cdcb4c3d4edc300d9a61969a87208d44dcc4" +GPURT_COMMIT="aa5ba689e8c33b6d42d4261687988e6e0b13998c" +LLVM_PROJECT_COMMIT="07d4dd012428b5a8c563de7c51ef33ab09bae53b" 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="bdfb113d8d765bdf4554a2b30ae909b93f26aeea" +LLVM_DIALECTS_COMMIT="50e4ca3a5c365b0bde36b122cc34256406723049" ### 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 @@ -49,7 +49,7 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )" BUNDLED_LLVM_DEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]" DEPEND="wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] ) ${BUNDLED_LLVM_DEPEND} - >=dev-util/vulkan-headers-1.3.283 + >=dev-util/vulkan-headers-1.3.296 raytracing? ( dev-util/DirectXShaderCompiler ) dev-util/glslang[${MULTILIB_USEDEP}]" BDEPEND="${BUNDLED_LLVM_DEPEND} @@ -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.290[${MULTILIB_USEDEP}] + >=media-libs/vulkan-loader-1.3.296[${MULTILIB_USEDEP}] dev-util/glslang[${MULTILIB_USEDEP}] dev-libs/openssl[${MULTILIB_USEDEP}]" #890449 @@ -73,11 +73,10 @@ CMAKE_MAKEFILE_GENERATOR=ninja PATCHES=( "${FILESDIR}/amdvlk-2022.3.5-no-compiler-presets.patch" #875821 "${FILESDIR}/amdvlk-2022.4.1-proper-libdir.patch" - "${FILESDIR}/amdvlk-2022.4.2-license-path.patch" #878803 + "${FILESDIR}/amdvlk-2024.4.1-license-path.patch" #878803 #"${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-2022.4.2-license-path.patch b/media-libs/amdvlk/files/amdvlk-2022.4.2-license-path.patch deleted file mode 100644 index 9fd590190..000000000 --- a/media-libs/amdvlk/files/amdvlk-2022.4.2-license-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/xgl/cmake/XglPackaging.cmake b/xgl/cmake/XglPackaging.cmake -index a3375293d..14d951b69 100644 ---- a/xgl/cmake/XglPackaging.cmake -+++ b/xgl/cmake/XglPackaging.cmake -@@ -128,7 +128,7 @@ function(generateInstallTargets) - install(FILES ${CMAKE_BINARY_DIR}/icd/amd_icd${TARGET_ARCHITECTURE_BITS}.json COMPONENT icd DESTINATION /etc/vulkan/icd.d) - install(FILES ${CMAKE_BINARY_DIR}/icd/amd_icd${TARGET_ARCHITECTURE_BITS}.json COMPONENT icd DESTINATION /etc/vulkan/implicit_layer.d) - if(EXISTS ${CMAKE_SOURCE_DIR}/LICENSE.txt) -- install(FILES ${CMAKE_SOURCE_DIR}/LICENSE.txt COMPONENT icd DESTINATION share/doc/${PACKAGE_NAME}) -+ install(FILES ${CMAKE_SOURCE_DIR}/LICENSE.txt COMPONENT icd DESTINATION share/doc/${PACKAGE_NAME}-${PACKAGE_VERSION}) - else() - message(WARNING "LICENSE.txt is not found under ${CMAKE_SOURCE_DIR}, please put it there") - endif() 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 deleted file mode 100644 index 9aa3b4d5c..000000000 --- a/media-libs/amdvlk/files/amdvlk-2024.3.3-fix-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -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++) diff --git a/media-libs/amdvlk/files/amdvlk-2024.4.1-license-path.patch b/media-libs/amdvlk/files/amdvlk-2024.4.1-license-path.patch new file mode 100644 index 000000000..e477e3b85 --- /dev/null +++ b/media-libs/amdvlk/files/amdvlk-2024.4.1-license-path.patch @@ -0,0 +1,13 @@ +diff --git a/xgl/cmake/XglPackaging.cmake b/xgl/cmake/XglPackaging.cmake +index 05a84a4..cc878d7 100644 +--- a/xgl/cmake/XglPackaging.cmake ++++ b/xgl/cmake/XglPackaging.cmake +@@ -141,7 +141,7 @@ function(generateInstallTargets) + endif() + elseif(PACKAGE_NAME STREQUAL "amdvlk") + if(EXISTS ${CMAKE_SOURCE_DIR}/LICENSE.txt) +- install(FILES ${CMAKE_SOURCE_DIR}/LICENSE.txt COMPONENT icd DESTINATION share/doc/${PACKAGE_NAME}) ++ install(FILES ${CMAKE_SOURCE_DIR}/LICENSE.txt COMPONENT icd DESTINATION share/doc/${PACKAGE_NAME}-${PACKAGE_VERSION}) + else() + message(WARNING "LICENSE.txt is not found under ${CMAKE_SOURCE_DIR}, please put it there") + endif() diff --git a/media-libs/amdvlk/files/amdvlk-2024.4.1-missing-header.patch b/media-libs/amdvlk/files/amdvlk-2024.4.1-missing-header.patch new file mode 100644 index 000000000..e29d8746e --- /dev/null +++ b/media-libs/amdvlk/files/amdvlk-2024.4.1-missing-header.patch @@ -0,0 +1,12 @@ +diff --git a/pal/src/core/misc/cacheLayer/multiElfCacheLayer.cpp b/pal/src/core/misc/cacheLayer/multiElfCacheLayer.cpp +index 93af97aa..73db7af8 100644 +--- a/pal/src/core/misc/cacheLayer/multiElfCacheLayer.cpp ++++ b/pal/src/core/misc/cacheLayer/multiElfCacheLayer.cpp +@@ -24,6 +24,7 @@ + **********************************************************************************************************************/ + #include "multiElfCacheLayer.h" + #include <cinttypes> ++#include <cstdio> + + namespace Util + {
