[gentoo-commits] repo/proj/guru:dev commit in: media-libs/amdvlk/, media-libs/amdvlk/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/proj/guru:dev commit in: media-libs/amdvlk/, media-libs/amdvlk/files/
@ 2022-12-22  6:46 Denis Reva
  0 siblings, 0 replies; 5+ messages in thread
From: Denis Reva @ 2022-12-22  6:46 UTC (permalink / raw
  To: gentoo-commits

commit:     4b35f21d43dcb365da67fce9899e659a21fa79a5
Author:     Denis Reva <denis7774 <AT> gmail <DOT> com>
AuthorDate: Thu Dec 22 06:45:51 2022 +0000
Commit:     Denis Reva <denis7774 <AT> gmail <DOT> com>
CommitDate: Thu Dec 22 06:46:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4b35f21d

media-libs/amdvlk: Disabled adding werror on it's own

Closes: https://bugs.gentoo.org/887777
Signed-off-by: Denis Reva <denis7774 <AT> gmail.com>

 media-libs/amdvlk/amdvlk-2022.4.4.ebuild                    |  9 ++++++++-
 .../amdvlk/files/amdvlk-2022.4.4-r1-disable-Werror.patch    | 13 +++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/media-libs/amdvlk/amdvlk-2022.4.4.ebuild b/media-libs/amdvlk/amdvlk-2022.4.4.ebuild
index 38fe858d0..27a9903d6 100644
--- a/media-libs/amdvlk/amdvlk-2022.4.4.ebuild
+++ b/media-libs/amdvlk/amdvlk-2022.4.4.ebuild
@@ -68,6 +68,7 @@ PATCHES=(
 	"${FILESDIR}/amdvlk-2022.4.2-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-2022.4.4-r1-disable-Werror.patch" #887777
 )
 
 src_prepare() {
@@ -90,11 +91,17 @@ multilib_src_configure() {
 		-DVKI_RAY_TRACING=$(usex raytracing)
 		-DLLVM_VERSION_SUFFIX="-amdvlk"
 		-DLLVM_HOST_TRIPLE="${CHOST}"
+		-DLLVM_ENABLE_WERROR=OFF
+		-DSPVGEN_ENABLE_WERROR=OFF
+		-DENABLE_WERROR=OFF
+		-DVAM_ENABLE_WERROR=OFF
+		-DICD_ANALYSIS_WARNINGS_AS_ERRORS=OFF
+		-DMETROHASH_ENABLE_WERROR=OFF
 		-DBUILD_SHARED_LIBS=OFF #LLVM parts don't support shared libs
 		-DPython3_EXECUTABLE="${PYTHON}"
 		-DPACKAGE_VERSION="${PV}"
 		-DPACKAGE_NAME="${PN}"
-		-DLLVM_INSTALL_TOOLCHAIN_ONLY=On #Disable installation of various LLVM parts which we had to clean up.
+		-DLLVM_INSTALL_TOOLCHAIN_ONLY=ON #Disable installation of various LLVM parts which we had to clean up.
 		-Wno-dev
 		)
 	cmake_src_configure

diff --git a/media-libs/amdvlk/files/amdvlk-2022.4.4-r1-disable-Werror.patch b/media-libs/amdvlk/files/amdvlk-2022.4.4-r1-disable-Werror.patch
new file mode 100644
index 000000000..01c28e0ea
--- /dev/null
+++ b/media-libs/amdvlk/files/amdvlk-2022.4.4-r1-disable-Werror.patch
@@ -0,0 +1,13 @@
+diff --git a/pal/shared/devdriver/cmake/DevDriver.cmake b/pal/shared/devdriver/cmake/DevDriver.cmake
+index b3f2e7e48..cbd9f7839 100644
+--- a/pal/shared/devdriver/cmake/DevDriver.cmake
++++ b/pal/shared/devdriver/cmake/DevDriver.cmake
+@@ -111,7 +111,7 @@ function(apply_devdriver_warnings name)
+         target_compile_options(${name} PRIVATE
+             -Wall # Enable all warnings.
+             -Wextra # Enable extra warnings that are not enabled by -Wall.
+-            -Werror # warning as error
++	    #-Werror # warning as error
+         )
+     elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+         target_compile_options(${name} PRIVATE


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-libs/amdvlk/, media-libs/amdvlk/files/
@ 2024-08-13 19:52 David Roman
  2024-08-13 19:56 ` [gentoo-commits] repo/proj/guru:master commit in: media-libs/amdvlk/files/, media-libs/amdvlk/ David Roman
  0 siblings, 1 reply; 5+ messages in thread
From: David Roman @ 2024-08-13 19:52 UTC (permalink / raw
  To: gentoo-commits

commit:     910b07c201b6309edca34c7ae4b1ba8d19fc1ee8
Author:     Username404-59 <w.iron.zombie <AT> gmail <DOT> com>
AuthorDate: Tue Aug 13 17:05:44 2024 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Tue Aug 13 19:51:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=910b07c2

media-libs/amdvlk: drop old ebuilds

Signed-off-by: Username404-59 <w.iron.zombie <AT> gmail.com>
Signed-off-by: David Roman <davidroman96 <AT> gmail.com>

 media-libs/amdvlk/Manifest                         |  19 ---
 media-libs/amdvlk/amdvlk-2023.1.1.ebuild           | 147 --------------------
 media-libs/amdvlk/amdvlk-2023.1.2.ebuild           | 147 --------------------
 media-libs/amdvlk/amdvlk-2023.1.3.ebuild           | 149 ---------------------
 .../files/amdvlk-2022.4.4-r1-disable-Werror.patch  |  13 --
 .../files/amdvlk-2023.1.2-gcc13-cstdint.patch      |  11 --
 6 files changed, 486 deletions(-)

diff --git a/media-libs/amdvlk/Manifest b/media-libs/amdvlk/Manifest
index 4d1ac16e9..e69de29bb 100644
--- a/media-libs/amdvlk/Manifest
+++ b/media-libs/amdvlk/Manifest
@@ -1,19 +0,0 @@
-DIST amdvlk-CWPack-4f8cf0584442a91d829d269158567d7ed926f026.tar.gz 39633 BLAKE2B d5b2a88f0d563eef5beb42a8304cf6cdd825e75242c22acc360c5bb9cbd1d02a4f891b6b2f3a4803e1e6b48a4d176aad40f8bdeca92847f2fbf53674dedeaff3 SHA512 06d56baaba1f1224a5266f4a63c1abf70edba7cc16cc4e62f2f5b1ec94fc2c1cfc4c6f11a9c6ef42c23b29be8d07921caad5e919357c0bd82cf714783eee0bcc
-DIST amdvlk-LLVM-dialects-17aafecff46b68206a0ed82d58f5e2fc358367a1.tar.gz 44441 BLAKE2B a94eb01ae3a2a868a1613e17573c5326252fa163d8e336b8c3292d0e3e349e3df98b124d300bbe42870bc2d60d18afe2c566e4484b45beb84a7087c0d58291e4 SHA512 4a6b2484f0fbb63f2cf987184a12f8a4a344ebfbfe5c1f37423fbda88c171f2eee0f7af4d0b066a9a87c3b22e0c92b7f7f1f5536b4c5d59fb2ca10b963cb8e62
-DIST amdvlk-LLVM-dialects-d12df4e895733e0adf8364f22349d92a000ae30d.tar.gz 33556 BLAKE2B c8e005345e965b1ce2d3977886a4939291d00fc4483f7a22b18399c1e0c7e39f766f50d7fb873e5defee58c2f57980b0692e70a11144d0e08e29ac9a57c9fa40 SHA512 77f37150bfcb26f657461c457b4240ba1d339b661521b1633d625439ee5cbcd1765b1eba9dd8239548692058a2e69df6cb359baee5bbb4d3e45d9d664ce04bc7
-DIST amdvlk-LLVM-dialects-f282131c7c331688c31f7c3aabe9b6d3ff09fbc4.tar.gz 33544 BLAKE2B c3c4adcd0413be6a4240820f7efdf3f5e03faf188cb48fd3845b2b84ed9d55d7f334ea91d5b3439b0653cfd0e5e70145092d59b8de9640408b05907f3769396c SHA512 c1d6a2d2528b273645a6a005f8b8c14209104bec9102a5dd344d0f005e6eff6d5478b8ce674f7c6241ecc11aff15a229caf502a10e017cdcadb41b14b28ebead
-DIST amdvlk-MetroHash-18893fb28601bb9af1154cd1a671a121fff6d8d3.tar.gz 11729 BLAKE2B b0e3de885e50c317141d62c885b421c7fd2e1ac783733704342bbed3109bff36a9209ab276f534a2231531483539221bbb1014bd39528a91124161bafc5646eb SHA512 8f12f95e80d594c8bd87a852c67a2d6777ce89d1a13e1a87ee17bbb876a0702c14ffe7a7fd65a244620f2043ad5d22ae8eb863d69f1dc5494d985733bbfb7bf9
-DIST amdvlk-gpurt-172e852f90365bac5869f83eb9c929d9daae51f0.tar.gz 308347 BLAKE2B b2839366fd35a452bf29502837c9aeeb1badf181dbe5fb57e042d073dccccb73c4069b5c7c6f3cc7938f9fb45f851e94a30f31c0698d2a523a28bb077ca15d6e SHA512 fae3cdc0c070ddd1d0d7b02ed13b527ec3fe8f766063f8e3fc1cd24729843139d5b5e1d68aec7596ce80128498f14c1e47c775928aa9a341df6429c6a2f24a4e
-DIST amdvlk-gpurt-714a028e920c502520011fc4f4556f58ec897424.tar.gz 308297 BLAKE2B aeb699332b76cd6d0ac0dcc47a410e8a6ad0b6b073ca2521b3e6c06b4307ee74b79ae9f7767f43e863b8070f664ffd9ffcbacab5f0b12576069e5469b8f5251e SHA512 8044de6555dd2c73ff75d059bda1bba3ef6960c46bb6a92b4ff77e3ced3a8100380ec3d27e5e8ad49fae2fe6994d548494535aa5023412033a2ed9b9236b52bc
-DIST amdvlk-gpurt-e19c8ceca056f0b0d24ca4ecd654ef21d40ea063.tar.gz 303085 BLAKE2B 51efb5bfc62496225ff2ef82760b7d6e5b7b484a43f100a6eec870d6f29c353c3d83c66896687d1ff6a0f2a8569cae157b120642ea1185d1157d95606b08cb2c SHA512 998570f5df17ac2ce457acf5732f0e4ce813403362ea7b88e9805eb6180d92f55933494f204d85549a02e804a8204b35ddfc83e8bd166a8d0c212078cac27ec9
-DIST amdvlk-llpc-1ecd9997579b962be571162931c9e38bd86bafad.tar.gz 2618677 BLAKE2B 5849ce333bc52ea1bba47f253834c10974fdc2089ba41fa41a89d9a9fe0249f6e4286985e092c5aaaa52b2e9aff3704dde01ac09fad82d43556b67786156092e SHA512 11f69a6f31a282acc410d1ddd6a8996842e1076cdd49db8f08378ab1401acac1d4eba48788b7f78fb5d5297dda52fd1ceaeec6e68986168c0a92b49222bda3b5
-DIST amdvlk-llpc-522365aa657f9cf65c4634261b800a04e214fd38.tar.gz 2595121 BLAKE2B a82bfd688abb18857d0c8db28c946eee5be97e3f5740d0ecbbcb01cd978d4bec3eb221ece192bbb49feec27d76b2e682717a48fb56153e6098742362d8c75d61 SHA512 2d2f8245776b37eba2ef271dc22707b0d81422cc6a1ed1983eea51a22f89ca28a147b8b0f4b6126b92193c0b33cf81d08ea7d6121f20f5270296381ea0e82820
-DIST amdvlk-llpc-ffc49b2a07dea2754c1f7f3457a4ab5b4129c422.tar.gz 2599441 BLAKE2B 38c7596947afaf1a40b1e834714d98404aa40a5101a6f989f9cb0a08cae57c8229165241aae1f232511e91b7f1f9bb8c8ba668960dae888e06e2e9f80d6cf386 SHA512 831645a6a107569cec5823a9383de0fb01d7ad469cc14d21e9fd673d3c2efaa4dcb7e7e2453437ced7a2e73c35bcae4b72eb0e9f662b16849ddf310c37dd913d
-DIST amdvlk-llvm-project-916f05c15939f5c94a3ec95d5b1fd6dbaf6c1ee4.tar.gz 167651090 BLAKE2B 5d5be2f308f7ca4e12b9bb67fcb33f05245719c0388befe28fd327a4d17b15298a5730ef65dbecb260c4d3f436b5c1204c111e31953fe8ce402df6f4430e865f SHA512 13f87d75d11c779c3e791ee619ba847ca36951d3a6db11441bde455e82936dfee29c21f15412bde711ac5f957be908c80d9248e945be3b0aa59777608b91cd9e
-DIST amdvlk-llvm-project-fdc6165b081b7b5e5ba245f4283fcb23d6d9f167.tar.gz 179654477 BLAKE2B 4a09ad5d194525365106b44627693f6eef49b9bd9c38c9eb690ea0288593e7a72467e0f2da757e728b40ee11a26ae3e5305aefe0744965dc7b0166f348539116 SHA512 e8603930e389cbcd0433d48bd72763b0d3ac3acd4f6fadaa3ac68f5148881723863f2816fa6ae34b4cb87538f77a70eb318b31d5ef9c085cc72a5dc9ca83fcb2
-DIST amdvlk-pal-042362399cdac1019fbc7f0ace8489aee2907883.tar.gz 12426374 BLAKE2B b4cd6f3496e9146e481de339128cb6b4be735aec2982f45af9806ce8647cd5e5cc3470dc4bcf82f354f03c227faff3f63148444ac26fd1a54ecdfd9844cff7e7 SHA512 5845d3bdc312915b07b1b59df387d4611ad280c499a8fdb1fa2ec0eba37a286179461b0eb445ac32646cd2c4842670f5e48f26b15a2a4b76864d7efb3fba3e69
-DIST amdvlk-pal-4640888b579bc9b0951c586b08a4552f71780d0d.tar.gz 12404946 BLAKE2B a348bce089766ac86539df1f9297df61d94d5db7993f95d86e8967e8641090949d177e9f6d9c1b257404eac8a0a05836c7f0dd6964b8bfc1946a21c47d7f19e0 SHA512 3b43ff0a86f66a238a02a7c71a0fe957deb63968abf2f48b1222ffd048d8fd3e864240a956fb013ab6336eebebb7a76538f748c0c93fbda9ab110e1d33547ef3
-DIST amdvlk-pal-ac9ff8bd22605bf7fd428fd9cf83248fb4dbe94b.tar.gz 12387976 BLAKE2B bba22f4dab618d6c0a82f1a147d1abc3f098bda78ff654991df9a7b0d8d6b79fc7c2bdf5674587a1694820f1be16dcb9a21e6d6c805fa0e1306f414701e5745c SHA512 c57a521a43e29bfbc730caa267005cfa3b557793310a717967a0e471cfecf44947cdbdab9dd9171f788b98b1653bd7630f43d9fff72bd2193c5eba6c6781c2d0
-DIST amdvlk-xgl-67cd9d1d3016c0522ddf83ba0a0b2bda0de27d4c.tar.gz 1243619 BLAKE2B 46f133a057158f293daa0c37bb60ca87d96728f7becffe5c78839b0658f9237ed1c5b11d57e569f0b62e7542a4f48afbada6527eb5e9c2cb62cbda8b4dd2bd2c SHA512 d7b9970a3bd444149e1801ffc268796a02833db39132c32f7745350bc423c40d111e9e338e9f0e35fa8b6b84c527d313669ff9f7b1488fcf2d4c834ab7495bf2
-DIST amdvlk-xgl-997225355d7fce7392a9e32fe9f0a515f5736d0f.tar.gz 1247401 BLAKE2B 5381474b3e8eb1783ab5b6a6059204fdd1fc6215a4bdc724bef874908d860f3f306773235325c725bddbc1c7e416a00a865e7b11e5218c3bca9fccd09e6bda95 SHA512 4217567268525f934dbde112e4a3b7703576d63cd49776dc1d991897bce406533d5954196cface6c31663d9ae073ec74ea0b084e55dfa91314aca350b9effa47
-DIST amdvlk-xgl-b72c7accced07675aeddace4e143152406076932.tar.gz 1245899 BLAKE2B 9de616524eaead6c650bf9c75f6bb2737e25ffd518012771b66878f4ea20a1b29f18f8e9c5b3f7eb16e0676652f13d8e62e2460376d7d6e2fcef54b82c4e5c61 SHA512 d5b975967fbb168717c8dcd2b9a1f786e5fead2276f9aaf3ca1fe68e8fd0ad00999f3af4e507b58674a62973a6f1cc57495280522aeea77f4925e4b7686e7b65

diff --git a/media-libs/amdvlk/amdvlk-2023.1.1.ebuild b/media-libs/amdvlk/amdvlk-2023.1.1.ebuild
deleted file mode 100644
index 02d04f50f..000000000
--- a/media-libs/amdvlk/amdvlk-2023.1.1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit check-reqs python-any-r1 cmake-multilib
-
-DESCRIPTION="AMD Open Source Driver for Vulkan"
-HOMEPAGE="https://github.com/GPUOpen-Drivers/AMDVLK"
-
-### SOURCE CODE PER_VERSION VARIABLES
-FETCH_URI="https://github.com/GPUOpen-Drivers"
-## For those who wants update ebuild: check https://github.com/GPUOpen-Drivers/AMDVLK/blob/${VERSION}/default.xml
-## e.g. https://github.com/GPUOpen-Drivers/AMDVLK/blob/v-2022.Q3.5/default.xml
-## and place commits in the desired variables
-## EXAMPLE: XGL_COMMIT="80e5a4b11ad2058097e77746772ddc9ab2118e07"
-## SRC_URI="... ${FETCH_URI}/$PART/archive/$COMMIT.zip -> $PART-$COMMIT.zip ..."
-XGL_COMMIT="67cd9d1d3016c0522ddf83ba0a0b2bda0de27d4c"
-PAL_COMMIT="042362399cdac1019fbc7f0ace8489aee2907883"
-LLPC_COMMIT="ffc49b2a07dea2754c1f7f3457a4ab5b4129c422"
-GPURT_COMMIT="e19c8ceca056f0b0d24ca4ecd654ef21d40ea063"
-LLVM_PROJECT_COMMIT="916f05c15939f5c94a3ec95d5b1fd6dbaf6c1ee4"
-METROHASH_COMMIT="18893fb28601bb9af1154cd1a671a121fff6d8d3"
-CWPACK_COMMIT="4f8cf0584442a91d829d269158567d7ed926f026"
-# Submodule of LLPC, also updates often. Grab commit version from
-# https://github.com/GPUOpen-Drivers/llpc/tree/dev/imported
-LLVM_DIALECTS_COMMIT="d12df4e895733e0adf8364f22349d92a000ae30d"
-# 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
-${FETCH_URI}/llpc/archive/${LLPC_COMMIT}.tar.gz -> amdvlk-llpc-${LLPC_COMMIT}.tar.gz
-${FETCH_URI}/gpurt/archive/${GPURT_COMMIT}.tar.gz -> amdvlk-gpurt-${GPURT_COMMIT}.tar.gz
-${FETCH_URI}/llvm-project/archive/${LLVM_PROJECT_COMMIT}.tar.gz -> amdvlk-llvm-project-${LLVM_PROJECT_COMMIT}.tar.gz
-${FETCH_URI}/MetroHash/archive/${METROHASH_COMMIT}.tar.gz -> amdvlk-MetroHash-${METROHASH_COMMIT}.tar.gz
-${FETCH_URI}/CWPack/archive/${CWPACK_COMMIT}.tar.gz -> amdvlk-CWPack-${CWPACK_COMMIT}.tar.gz
-${FETCH_URI}/llvm-dialects/archive/${LLVM_DIALECTS_COMMIT}.tar.gz -> amdvlk-LLVM-dialects-${LLVM_DIALECTS_COMMIT}.tar.gz"
-
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="wayland +raytracing"
-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.224
-	raytracing? ( dev-util/DirectXShaderCompiler )
-	dev-util/glslang[${MULTILIB_USEDEP}]"
-BDEPEND="${BUNDLED_LLVM_DEPEND}
-	${PYTHON_DEPS}
-	virtual/linux-sources"
-RDEPEND=" ${DEPEND}
-	x11-libs/libdrm[${MULTILIB_USEDEP}]
-	x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	x11-libs/libxcb[${MULTILIB_USEDEP}]
-	x11-libs/libxshmfence[${MULTILIB_USEDEP}]
-	>=media-libs/vulkan-loader-1.3.224[${MULTILIB_USEDEP}]
-	dev-util/glslang[${MULTILIB_USEDEP}]
-	dev-libs/openssl[${MULTILIB_USEDEP}]" #890449
-
-CHECKREQS_MEMORY="7G"
-CHECKREQS_DISK_BUILD="4G"
-CMAKE_USE_DIR="${S}/xgl"
-
-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-2022.4.2-reduced-llvm-installations.patch"
-	"${FILESDIR}/amdvlk-2022.4.2-reduced-llvm-installations-part2.patch"
-	"${FILESDIR}/amdvlk-2022.4.4-r1-disable-Werror.patch" #887777
-	"${FILESDIR}/amdvlk-2023.1.2-gcc13-cstdint.patch" #905174
-)
-
-pkg_pretend(){
-	ewarn "It's generally recomended to have at least 16GB memory to build"
-	ewarn "However, experiments shows that if you'll use MAKEOPTS=\"-j1\" you can build it with 4GB RAM"
-	ewarn "or you can use MAKEOPTS=\"-j3\" with 7.5GB system memory"
-	ewarn "See https://wiki.gentoo.org/wiki/AMDVLK#Additional_system_requirements_to_build"
-	ewarn "Use CHECKREQS_DONOTHING=1 if you need to bypass memory checking"
-
-	check-reqs_pkg_pretend
-}
-
-src_prepare() {
-	einfo "moving src to proper directories"
-	mkdir third_party || die
-	mv xgl-${XGL_COMMIT}/ xgl || die
-	mv pal-${PAL_COMMIT}/ pal || die
-	mv llpc-${LLPC_COMMIT}/ llpc || die
-	mv gpurt-${GPURT_COMMIT}/ gpurt || die
-	mv llvm-project-${LLVM_PROJECT_COMMIT}/ llvm-project || die
-	rm -d llpc/imported/llvm-dialects/ || die
-	mv llvm-dialects-${LLVM_DIALECTS_COMMIT}/ llpc/imported/llvm-dialects/ || die
-	mv MetroHash-${METROHASH_COMMIT}/ third_party/metrohash || die
-	mv CWPack-${CWPACK_COMMIT}/ third_party/cwpack || die
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_WAYLAND_SUPPORT=$(usex wayland)
-		-DVKI_RAY_TRACING=$(usex raytracing)
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-		-DLLVM_ENABLE_WERROR=OFF
-		-DENABLE_WERROR=OFF
-		-DVAM_ENABLE_WERROR=OFF
-		-DICD_ANALYSIS_WARNINGS_AS_ERRORS=OFF
-		-DMETROHASH_ENABLE_WERROR=OFF
-		-DBUILD_SHARED_LIBS=OFF #LLVM parts don't support shared libs
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DPACKAGE_VERSION="${PV}"
-		-DPACKAGE_NAME="${PN}"
-		-DLLVM_INSTALL_TOOLCHAIN_ONLY=ON #Disable installation of various LLVM parts which we had to clean up.
-		-Wno-dev
-		)
-	cmake_src_configure
-}
-multilib_check_headers() {
-	einfo "Checking headers skipped: there is no headers"
-}
-
-multilib_src_install_all() {
-	default
-	einfo "Removing unused LLVM parts…"
-	rm "${ED}"/usr/lib/libLTO* || die "Can't remove unused LLVM lto library"
-	rm "${ED}"/usr/lib/libRemarks* || die "Can't remove unused LLVM libRemarks library"
-	rm -r "${ED}"/usr/lib/cmake || die "Can't remove unused LLVM cmake folder"
-	einfo "Removal done"
-}
-
-pkg_postinst() {
-	ewarn "Make sure the following line is NOT included in the any Xorg configuration section:"
-	ewarn "| Driver	  \"modesetting\""
-	ewarn "and make sure you use DRI3 mode for Xorg (not revelant for wayland)"
-	elog "More information about the configuration can be found here:"
-	elog "https://github.com/GPUOpen-Drivers/AMDVLK"
-	elog "You can use AMD_VULKAN_ICD variable to switch to the required driver."
-	elog "AMD_VULKAN_ICD=RADV application   - for using radv."
-	elog "AMD_VULKAN_ICD=AMDVLK application - for using amdvlk."
-}

diff --git a/media-libs/amdvlk/amdvlk-2023.1.2.ebuild b/media-libs/amdvlk/amdvlk-2023.1.2.ebuild
deleted file mode 100644
index aa0f0cd91..000000000
--- a/media-libs/amdvlk/amdvlk-2023.1.2.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit check-reqs python-any-r1 cmake-multilib
-
-DESCRIPTION="AMD Open Source Driver for Vulkan"
-HOMEPAGE="https://github.com/GPUOpen-Drivers/AMDVLK"
-
-### SOURCE CODE PER_VERSION VARIABLES
-FETCH_URI="https://github.com/GPUOpen-Drivers"
-## For those who wants update ebuild: check https://github.com/GPUOpen-Drivers/AMDVLK/blob/${VERSION}/default.xml
-## e.g. https://github.com/GPUOpen-Drivers/AMDVLK/blob/v-2022.Q3.5/default.xml
-## and place commits in the desired variables
-## EXAMPLE: XGL_COMMIT="80e5a4b11ad2058097e77746772ddc9ab2118e07"
-## SRC_URI="... ${FETCH_URI}/$PART/archive/$COMMIT.zip -> $PART-$COMMIT.zip ..."
-XGL_COMMIT="b72c7accced07675aeddace4e143152406076932"
-PAL_COMMIT="ac9ff8bd22605bf7fd428fd9cf83248fb4dbe94b"
-LLPC_COMMIT="522365aa657f9cf65c4634261b800a04e214fd38"
-GPURT_COMMIT="172e852f90365bac5869f83eb9c929d9daae51f0"
-LLVM_PROJECT_COMMIT="916f05c15939f5c94a3ec95d5b1fd6dbaf6c1ee4"
-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="f282131c7c331688c31f7c3aabe9b6d3ff09fbc4"
-### 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
-${FETCH_URI}/llpc/archive/${LLPC_COMMIT}.tar.gz -> amdvlk-llpc-${LLPC_COMMIT}.tar.gz
-${FETCH_URI}/gpurt/archive/${GPURT_COMMIT}.tar.gz -> amdvlk-gpurt-${GPURT_COMMIT}.tar.gz
-${FETCH_URI}/llvm-project/archive/${LLVM_PROJECT_COMMIT}.tar.gz -> amdvlk-llvm-project-${LLVM_PROJECT_COMMIT}.tar.gz
-${FETCH_URI}/MetroHash/archive/${METROHASH_COMMIT}.tar.gz -> amdvlk-MetroHash-${METROHASH_COMMIT}.tar.gz
-${FETCH_URI}/CWPack/archive/${CWPACK_COMMIT}.tar.gz -> amdvlk-CWPack-${CWPACK_COMMIT}.tar.gz
-${FETCH_URI}/llvm-dialects/archive/${LLVM_DIALECTS_COMMIT}.tar.gz -> amdvlk-LLVM-dialects-${LLVM_DIALECTS_COMMIT}.tar.gz"
-
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="wayland +raytracing"
-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.224
-	raytracing? ( dev-util/DirectXShaderCompiler )
-	dev-util/glslang[${MULTILIB_USEDEP}]"
-BDEPEND="${BUNDLED_LLVM_DEPEND}
-	${PYTHON_DEPS}
-	virtual/linux-sources"
-RDEPEND=" ${DEPEND}
-	x11-libs/libdrm[${MULTILIB_USEDEP}]
-	x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	x11-libs/libxcb[${MULTILIB_USEDEP}]
-	x11-libs/libxshmfence[${MULTILIB_USEDEP}]
-	>=media-libs/vulkan-loader-1.3.224[${MULTILIB_USEDEP}]
-	dev-util/glslang[${MULTILIB_USEDEP}]
-	dev-libs/openssl[${MULTILIB_USEDEP}]" #890449
-
-CHECKREQS_MEMORY="7G"
-CHECKREQS_DISK_BUILD="4G"
-CMAKE_USE_DIR="${S}/xgl"
-
-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-2022.4.2-reduced-llvm-installations.patch"
-	"${FILESDIR}/amdvlk-2022.4.2-reduced-llvm-installations-part2.patch"
-	"${FILESDIR}/amdvlk-2022.4.4-r1-disable-Werror.patch" #887777
-	"${FILESDIR}/amdvlk-2023.1.2-gcc13-cstdint.patch" #905174
-)
-
-pkg_pretend(){
-	ewarn "It's generally recomended to have at least 16GB memory to build"
-	ewarn "However, experiments shows that if you'll use MAKEOPTS=\"-j1\" you can build it with 4GB RAM"
-	ewarn "or you can use MAKEOPTS=\"-j3\" with 7.5GB system memory"
-	ewarn "See https://wiki.gentoo.org/wiki/AMDVLK#Additional_system_requirements_to_build"
-	ewarn "Use CHECKREQS_DONOTHING=1 if you need to bypass memory checking"
-
-	check-reqs_pkg_pretend
-}
-
-src_prepare() {
-	einfo "moving src to proper directories"
-	mkdir third_party || die
-	mv xgl-${XGL_COMMIT}/ xgl || die
-	mv pal-${PAL_COMMIT}/ pal || die
-	mv llpc-${LLPC_COMMIT}/ llpc || die
-	mv gpurt-${GPURT_COMMIT}/ gpurt || die
-	mv llvm-project-${LLVM_PROJECT_COMMIT}/ llvm-project || die
-	rm -d llpc/imported/llvm-dialects/ || die
-	mv llvm-dialects-${LLVM_DIALECTS_COMMIT}/ llpc/imported/llvm-dialects/ || die
-	mv MetroHash-${METROHASH_COMMIT}/ third_party/metrohash || die
-	mv CWPack-${CWPACK_COMMIT}/ third_party/cwpack || die
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_WAYLAND_SUPPORT=$(usex wayland)
-		-DVKI_RAY_TRACING=$(usex raytracing)
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-		-DLLVM_ENABLE_WERROR=OFF
-		-DENABLE_WERROR=OFF
-		-DVAM_ENABLE_WERROR=OFF
-		-DICD_ANALYSIS_WARNINGS_AS_ERRORS=OFF
-		-DMETROHASH_ENABLE_WERROR=OFF
-		-DBUILD_SHARED_LIBS=OFF #LLVM parts don't support shared libs
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DPACKAGE_VERSION="${PV}"
-		-DPACKAGE_NAME="${PN}"
-		-DLLVM_INSTALL_TOOLCHAIN_ONLY=ON #Disable installation of various LLVM parts which we had to clean up.
-		-Wno-dev
-		)
-	cmake_src_configure
-}
-multilib_check_headers() {
-	einfo "Checking headers skipped: there is no headers"
-}
-
-multilib_src_install_all() {
-	default
-	einfo "Removing unused LLVM parts…"
-	rm "${ED}"/usr/lib/libLTO* || die "Can't remove unused LLVM lto library"
-	rm "${ED}"/usr/lib/libRemarks* || die "Can't remove unused LLVM libRemarks library"
-	rm -r "${ED}"/usr/lib/cmake || die "Can't remove unused LLVM cmake folder"
-	einfo "Removal done"
-}
-
-pkg_postinst() {
-	ewarn "Make sure the following line is NOT included in the any Xorg configuration section:"
-	ewarn "| Driver	  \"modesetting\""
-	ewarn "and make sure you use DRI3 mode for Xorg (not revelant for wayland)"
-	elog "More information about the configuration can be found here:"
-	elog "https://github.com/GPUOpen-Drivers/AMDVLK"
-	elog "You can use AMD_VULKAN_ICD variable to switch to the required driver."
-	elog "AMD_VULKAN_ICD=RADV application   - for using radv."
-	elog "AMD_VULKAN_ICD=AMDVLK application - for using amdvlk."
-}

diff --git a/media-libs/amdvlk/amdvlk-2023.1.3.ebuild b/media-libs/amdvlk/amdvlk-2023.1.3.ebuild
deleted file mode 100644
index 192387df2..000000000
--- a/media-libs/amdvlk/amdvlk-2023.1.3.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit check-reqs python-any-r1 cmake-multilib
-
-DESCRIPTION="AMD Open Source Driver for Vulkan"
-HOMEPAGE="https://github.com/GPUOpen-Drivers/AMDVLK"
-
-### SOURCE CODE PER_VERSION VARIABLES
-FETCH_URI="https://github.com/GPUOpen-Drivers"
-## For those who wants update ebuild: check https://github.com/GPUOpen-Drivers/AMDVLK/blob/${VERSION}/default.xml
-## e.g. https://github.com/GPUOpen-Drivers/AMDVLK/blob/v-2022.Q3.5/default.xml
-## and place commits in the desired variables
-## EXAMPLE: XGL_COMMIT="80e5a4b11ad2058097e77746772ddc9ab2118e07"
-## SRC_URI="... ${FETCH_URI}/$PART/archive/$COMMIT.zip -> $PART-$COMMIT.zip ..."
-XGL_COMMIT="997225355d7fce7392a9e32fe9f0a515f5736d0f"
-PAL_COMMIT="4640888b579bc9b0951c586b08a4552f71780d0d"
-LLPC_COMMIT="1ecd9997579b962be571162931c9e38bd86bafad"
-GPURT_COMMIT="714a028e920c502520011fc4f4556f58ec897424"
-LLVM_PROJECT_COMMIT="fdc6165b081b7b5e5ba245f4283fcb23d6d9f167"
-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="17aafecff46b68206a0ed82d58f5e2fc358367a1"
-### 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
-${FETCH_URI}/llpc/archive/${LLPC_COMMIT}.tar.gz -> amdvlk-llpc-${LLPC_COMMIT}.tar.gz
-${FETCH_URI}/gpurt/archive/${GPURT_COMMIT}.tar.gz -> amdvlk-gpurt-${GPURT_COMMIT}.tar.gz
-${FETCH_URI}/llvm-project/archive/${LLVM_PROJECT_COMMIT}.tar.gz -> amdvlk-llvm-project-${LLVM_PROJECT_COMMIT}.tar.gz
-${FETCH_URI}/MetroHash/archive/${METROHASH_COMMIT}.tar.gz -> amdvlk-MetroHash-${METROHASH_COMMIT}.tar.gz
-${FETCH_URI}/CWPack/archive/${CWPACK_COMMIT}.tar.gz -> amdvlk-CWPack-${CWPACK_COMMIT}.tar.gz
-${FETCH_URI}/llvm-dialects/archive/${LLVM_DIALECTS_COMMIT}.tar.gz -> amdvlk-LLVM-dialects-${LLVM_DIALECTS_COMMIT}.tar.gz"
-
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="wayland +raytracing"
-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.224
-	raytracing? ( dev-util/DirectXShaderCompiler )
-	dev-util/glslang[${MULTILIB_USEDEP}]"
-BDEPEND="${BUNDLED_LLVM_DEPEND}
-	${PYTHON_DEPS}
-	virtual/linux-sources"
-RDEPEND=" ${DEPEND}
-	x11-libs/libdrm[${MULTILIB_USEDEP}]
-	x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	x11-libs/libxcb[${MULTILIB_USEDEP}]
-	x11-libs/libxshmfence[${MULTILIB_USEDEP}]
-	>=media-libs/vulkan-loader-1.3.224[${MULTILIB_USEDEP}]
-	dev-util/glslang[${MULTILIB_USEDEP}]
-	dev-libs/openssl[${MULTILIB_USEDEP}]" #890449
-
-CHECKREQS_MEMORY="7G"
-CHECKREQS_DISK_BUILD="4G"
-CMAKE_USE_DIR="${S}/xgl"
-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-2022.4.2-reduced-llvm-installations.patch"
-	#"${FILESDIR}/amdvlk-2022.4.2-reduced-llvm-installations-part2.patch"
-	"${FILESDIR}/amdvlk-2022.4.4-r1-disable-Werror.patch" #887777
-	"${FILESDIR}/amdvlk-2023.1.2-gcc13-cstdint.patch" #905174
-)
-
-pkg_pretend(){
-	ewarn "It's generally recomended to have at least 16GB memory to build"
-	ewarn "However, experiments shows that if you'll use MAKEOPTS=\"-j1\" you can build it with 4GB RAM"
-	ewarn "or you can use MAKEOPTS=\"-j3\" with 7.5GB system memory"
-	ewarn "See https://wiki.gentoo.org/wiki/AMDVLK#Additional_system_requirements_to_build"
-	ewarn "Use CHECKREQS_DONOTHING=1 if you need to bypass memory checking"
-
-	check-reqs_pkg_pretend
-}
-
-src_prepare() {
-	einfo "moving src to proper directories"
-	mkdir third_party || die
-	mv xgl-${XGL_COMMIT}/ xgl || die
-	mv pal-${PAL_COMMIT}/ pal || die
-	mv llpc-${LLPC_COMMIT}/ llpc || die
-	mv gpurt-${GPURT_COMMIT}/ gpurt || die
-	mv llvm-project-${LLVM_PROJECT_COMMIT}/ llvm-project || die
-	rm -d llpc/imported/llvm-dialects/ || die
-	mv llvm-dialects-${LLVM_DIALECTS_COMMIT}/ llpc/imported/llvm-dialects/ || die
-	mv MetroHash-${METROHASH_COMMIT}/ third_party/metrohash || die
-	mv CWPack-${CWPACK_COMMIT}/ third_party/cwpack || die
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_WAYLAND_SUPPORT=$(usex wayland)
-		-DVKI_RAY_TRACING=$(usex raytracing)
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-		-DLLVM_ENABLE_WERROR=OFF
-		-DENABLE_WERROR=OFF
-		-DVAM_ENABLE_WERROR=OFF
-		-DICD_ANALYSIS_WARNINGS_AS_ERRORS=OFF
-		-DMETROHASH_ENABLE_WERROR=OFF
-		-DBUILD_SHARED_LIBS=OFF #LLVM parts don't support shared libs
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DPACKAGE_VERSION="${PV}"
-		-DPACKAGE_NAME="${PN}"
-		-DLLVM_INSTALL_TOOLCHAIN_ONLY=ON #Disable installation of various LLVM parts which we had to clean up.
-		-Wno-dev
-		)
-	cmake_src_configure
-}
-
-multilib_check_headers() {
-	einfo "Checking headers skipped: there is no headers"
-}
-
-multilib_src_install_all() {
-	default
-	einfo "Removing unused LLVM parts…"
-	rm "${ED}"/usr/lib/libLTO* || die "Can't remove unused LLVM lto library"
-	rm "${ED}"/usr/lib/libRemarks* || die "Can't remove unused LLVM libRemarks library"
-	rm -r "${ED}"/usr/lib/cmake || die "Can't remove unused LLVM cmake folder"
-	einfo "Removal done"
-}
-
-pkg_postinst() {
-	ewarn "Make sure the following line is NOT included in the any Xorg configuration section:"
-	ewarn "| Driver	  \"modesetting\""
-	ewarn "and make sure you use DRI3 mode for Xorg (not revelant for wayland)"
-	elog "More information about the configuration can be found here:"
-	elog "https://github.com/GPUOpen-Drivers/AMDVLK"
-	elog "You can use AMD_VULKAN_ICD variable to switch to the required driver."
-	elog "AMD_VULKAN_ICD=RADV application   - for using radv."
-	elog "AMD_VULKAN_ICD=AMDVLK application - for using amdvlk."
-}

diff --git a/media-libs/amdvlk/files/amdvlk-2022.4.4-r1-disable-Werror.patch b/media-libs/amdvlk/files/amdvlk-2022.4.4-r1-disable-Werror.patch
deleted file mode 100644
index 01c28e0ea..000000000
--- a/media-libs/amdvlk/files/amdvlk-2022.4.4-r1-disable-Werror.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/pal/shared/devdriver/cmake/DevDriver.cmake b/pal/shared/devdriver/cmake/DevDriver.cmake
-index b3f2e7e48..cbd9f7839 100644
---- a/pal/shared/devdriver/cmake/DevDriver.cmake
-+++ b/pal/shared/devdriver/cmake/DevDriver.cmake
-@@ -111,7 +111,7 @@ function(apply_devdriver_warnings name)
-         target_compile_options(${name} PRIVATE
-             -Wall # Enable all warnings.
-             -Wextra # Enable extra warnings that are not enabled by -Wall.
--            -Werror # warning as error
-+	    #-Werror # warning as error
-         )
-     elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-         target_compile_options(${name} PRIVATE

diff --git a/media-libs/amdvlk/files/amdvlk-2023.1.2-gcc13-cstdint.patch b/media-libs/amdvlk/files/amdvlk-2023.1.2-gcc13-cstdint.patch
deleted file mode 100644
index 2bfc7d299..000000000
--- a/media-libs/amdvlk/files/amdvlk-2023.1.2-gcc13-cstdint.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur amdvlk.orig/pal/src/core/imported/rdf/rdf/inc/amdrdf.h amdvlk/pal/src/core/imported/rdf/rdf/inc/amdrdf.h
---- amdvlk.orig/pal/src/core/imported/rdf/rdf/inc/amdrdf.h	2023-02-16 17:37:47.000000000 +0900
-+++ amdvlk/pal/src/core/imported/rdf/rdf/inc/amdrdf.h	2024-01-17 06:58:02.666146730 +0900
-@@ -25,6 +25,7 @@
- #pragma once
- 
- #include <cstddef>
-+#include <cstdint>
- #include <cstring>
- #include <functional>
- #include <memory>


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: media-libs/amdvlk/files/, media-libs/amdvlk/
  2024-08-13 19:52 [gentoo-commits] repo/proj/guru:dev commit in: media-libs/amdvlk/, media-libs/amdvlk/files/ David Roman
@ 2024-08-13 19:56 ` David Roman
  0 siblings, 0 replies; 5+ messages in thread
From: David Roman @ 2024-08-13 19:56 UTC (permalink / raw
  To: gentoo-commits

commit:     910b07c201b6309edca34c7ae4b1ba8d19fc1ee8
Author:     Username404-59 <w.iron.zombie <AT> gmail <DOT> com>
AuthorDate: Tue Aug 13 17:05:44 2024 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Tue Aug 13 19:51:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=910b07c2

media-libs/amdvlk: drop old ebuilds

Signed-off-by: Username404-59 <w.iron.zombie <AT> gmail.com>
Signed-off-by: David Roman <davidroman96 <AT> gmail.com>

 media-libs/amdvlk/Manifest                         |  19 ---
 media-libs/amdvlk/amdvlk-2023.1.1.ebuild           | 147 --------------------
 media-libs/amdvlk/amdvlk-2023.1.2.ebuild           | 147 --------------------
 media-libs/amdvlk/amdvlk-2023.1.3.ebuild           | 149 ---------------------
 .../files/amdvlk-2022.4.4-r1-disable-Werror.patch  |  13 --
 .../files/amdvlk-2023.1.2-gcc13-cstdint.patch      |  11 --
 6 files changed, 486 deletions(-)

diff --git a/media-libs/amdvlk/Manifest b/media-libs/amdvlk/Manifest
index 4d1ac16e9..e69de29bb 100644
--- a/media-libs/amdvlk/Manifest
+++ b/media-libs/amdvlk/Manifest
@@ -1,19 +0,0 @@
-DIST amdvlk-CWPack-4f8cf0584442a91d829d269158567d7ed926f026.tar.gz 39633 BLAKE2B d5b2a88f0d563eef5beb42a8304cf6cdd825e75242c22acc360c5bb9cbd1d02a4f891b6b2f3a4803e1e6b48a4d176aad40f8bdeca92847f2fbf53674dedeaff3 SHA512 06d56baaba1f1224a5266f4a63c1abf70edba7cc16cc4e62f2f5b1ec94fc2c1cfc4c6f11a9c6ef42c23b29be8d07921caad5e919357c0bd82cf714783eee0bcc
-DIST amdvlk-LLVM-dialects-17aafecff46b68206a0ed82d58f5e2fc358367a1.tar.gz 44441 BLAKE2B a94eb01ae3a2a868a1613e17573c5326252fa163d8e336b8c3292d0e3e349e3df98b124d300bbe42870bc2d60d18afe2c566e4484b45beb84a7087c0d58291e4 SHA512 4a6b2484f0fbb63f2cf987184a12f8a4a344ebfbfe5c1f37423fbda88c171f2eee0f7af4d0b066a9a87c3b22e0c92b7f7f1f5536b4c5d59fb2ca10b963cb8e62
-DIST amdvlk-LLVM-dialects-d12df4e895733e0adf8364f22349d92a000ae30d.tar.gz 33556 BLAKE2B c8e005345e965b1ce2d3977886a4939291d00fc4483f7a22b18399c1e0c7e39f766f50d7fb873e5defee58c2f57980b0692e70a11144d0e08e29ac9a57c9fa40 SHA512 77f37150bfcb26f657461c457b4240ba1d339b661521b1633d625439ee5cbcd1765b1eba9dd8239548692058a2e69df6cb359baee5bbb4d3e45d9d664ce04bc7
-DIST amdvlk-LLVM-dialects-f282131c7c331688c31f7c3aabe9b6d3ff09fbc4.tar.gz 33544 BLAKE2B c3c4adcd0413be6a4240820f7efdf3f5e03faf188cb48fd3845b2b84ed9d55d7f334ea91d5b3439b0653cfd0e5e70145092d59b8de9640408b05907f3769396c SHA512 c1d6a2d2528b273645a6a005f8b8c14209104bec9102a5dd344d0f005e6eff6d5478b8ce674f7c6241ecc11aff15a229caf502a10e017cdcadb41b14b28ebead
-DIST amdvlk-MetroHash-18893fb28601bb9af1154cd1a671a121fff6d8d3.tar.gz 11729 BLAKE2B b0e3de885e50c317141d62c885b421c7fd2e1ac783733704342bbed3109bff36a9209ab276f534a2231531483539221bbb1014bd39528a91124161bafc5646eb SHA512 8f12f95e80d594c8bd87a852c67a2d6777ce89d1a13e1a87ee17bbb876a0702c14ffe7a7fd65a244620f2043ad5d22ae8eb863d69f1dc5494d985733bbfb7bf9
-DIST amdvlk-gpurt-172e852f90365bac5869f83eb9c929d9daae51f0.tar.gz 308347 BLAKE2B b2839366fd35a452bf29502837c9aeeb1badf181dbe5fb57e042d073dccccb73c4069b5c7c6f3cc7938f9fb45f851e94a30f31c0698d2a523a28bb077ca15d6e SHA512 fae3cdc0c070ddd1d0d7b02ed13b527ec3fe8f766063f8e3fc1cd24729843139d5b5e1d68aec7596ce80128498f14c1e47c775928aa9a341df6429c6a2f24a4e
-DIST amdvlk-gpurt-714a028e920c502520011fc4f4556f58ec897424.tar.gz 308297 BLAKE2B aeb699332b76cd6d0ac0dcc47a410e8a6ad0b6b073ca2521b3e6c06b4307ee74b79ae9f7767f43e863b8070f664ffd9ffcbacab5f0b12576069e5469b8f5251e SHA512 8044de6555dd2c73ff75d059bda1bba3ef6960c46bb6a92b4ff77e3ced3a8100380ec3d27e5e8ad49fae2fe6994d548494535aa5023412033a2ed9b9236b52bc
-DIST amdvlk-gpurt-e19c8ceca056f0b0d24ca4ecd654ef21d40ea063.tar.gz 303085 BLAKE2B 51efb5bfc62496225ff2ef82760b7d6e5b7b484a43f100a6eec870d6f29c353c3d83c66896687d1ff6a0f2a8569cae157b120642ea1185d1157d95606b08cb2c SHA512 998570f5df17ac2ce457acf5732f0e4ce813403362ea7b88e9805eb6180d92f55933494f204d85549a02e804a8204b35ddfc83e8bd166a8d0c212078cac27ec9
-DIST amdvlk-llpc-1ecd9997579b962be571162931c9e38bd86bafad.tar.gz 2618677 BLAKE2B 5849ce333bc52ea1bba47f253834c10974fdc2089ba41fa41a89d9a9fe0249f6e4286985e092c5aaaa52b2e9aff3704dde01ac09fad82d43556b67786156092e SHA512 11f69a6f31a282acc410d1ddd6a8996842e1076cdd49db8f08378ab1401acac1d4eba48788b7f78fb5d5297dda52fd1ceaeec6e68986168c0a92b49222bda3b5
-DIST amdvlk-llpc-522365aa657f9cf65c4634261b800a04e214fd38.tar.gz 2595121 BLAKE2B a82bfd688abb18857d0c8db28c946eee5be97e3f5740d0ecbbcb01cd978d4bec3eb221ece192bbb49feec27d76b2e682717a48fb56153e6098742362d8c75d61 SHA512 2d2f8245776b37eba2ef271dc22707b0d81422cc6a1ed1983eea51a22f89ca28a147b8b0f4b6126b92193c0b33cf81d08ea7d6121f20f5270296381ea0e82820
-DIST amdvlk-llpc-ffc49b2a07dea2754c1f7f3457a4ab5b4129c422.tar.gz 2599441 BLAKE2B 38c7596947afaf1a40b1e834714d98404aa40a5101a6f989f9cb0a08cae57c8229165241aae1f232511e91b7f1f9bb8c8ba668960dae888e06e2e9f80d6cf386 SHA512 831645a6a107569cec5823a9383de0fb01d7ad469cc14d21e9fd673d3c2efaa4dcb7e7e2453437ced7a2e73c35bcae4b72eb0e9f662b16849ddf310c37dd913d
-DIST amdvlk-llvm-project-916f05c15939f5c94a3ec95d5b1fd6dbaf6c1ee4.tar.gz 167651090 BLAKE2B 5d5be2f308f7ca4e12b9bb67fcb33f05245719c0388befe28fd327a4d17b15298a5730ef65dbecb260c4d3f436b5c1204c111e31953fe8ce402df6f4430e865f SHA512 13f87d75d11c779c3e791ee619ba847ca36951d3a6db11441bde455e82936dfee29c21f15412bde711ac5f957be908c80d9248e945be3b0aa59777608b91cd9e
-DIST amdvlk-llvm-project-fdc6165b081b7b5e5ba245f4283fcb23d6d9f167.tar.gz 179654477 BLAKE2B 4a09ad5d194525365106b44627693f6eef49b9bd9c38c9eb690ea0288593e7a72467e0f2da757e728b40ee11a26ae3e5305aefe0744965dc7b0166f348539116 SHA512 e8603930e389cbcd0433d48bd72763b0d3ac3acd4f6fadaa3ac68f5148881723863f2816fa6ae34b4cb87538f77a70eb318b31d5ef9c085cc72a5dc9ca83fcb2
-DIST amdvlk-pal-042362399cdac1019fbc7f0ace8489aee2907883.tar.gz 12426374 BLAKE2B b4cd6f3496e9146e481de339128cb6b4be735aec2982f45af9806ce8647cd5e5cc3470dc4bcf82f354f03c227faff3f63148444ac26fd1a54ecdfd9844cff7e7 SHA512 5845d3bdc312915b07b1b59df387d4611ad280c499a8fdb1fa2ec0eba37a286179461b0eb445ac32646cd2c4842670f5e48f26b15a2a4b76864d7efb3fba3e69
-DIST amdvlk-pal-4640888b579bc9b0951c586b08a4552f71780d0d.tar.gz 12404946 BLAKE2B a348bce089766ac86539df1f9297df61d94d5db7993f95d86e8967e8641090949d177e9f6d9c1b257404eac8a0a05836c7f0dd6964b8bfc1946a21c47d7f19e0 SHA512 3b43ff0a86f66a238a02a7c71a0fe957deb63968abf2f48b1222ffd048d8fd3e864240a956fb013ab6336eebebb7a76538f748c0c93fbda9ab110e1d33547ef3
-DIST amdvlk-pal-ac9ff8bd22605bf7fd428fd9cf83248fb4dbe94b.tar.gz 12387976 BLAKE2B bba22f4dab618d6c0a82f1a147d1abc3f098bda78ff654991df9a7b0d8d6b79fc7c2bdf5674587a1694820f1be16dcb9a21e6d6c805fa0e1306f414701e5745c SHA512 c57a521a43e29bfbc730caa267005cfa3b557793310a717967a0e471cfecf44947cdbdab9dd9171f788b98b1653bd7630f43d9fff72bd2193c5eba6c6781c2d0
-DIST amdvlk-xgl-67cd9d1d3016c0522ddf83ba0a0b2bda0de27d4c.tar.gz 1243619 BLAKE2B 46f133a057158f293daa0c37bb60ca87d96728f7becffe5c78839b0658f9237ed1c5b11d57e569f0b62e7542a4f48afbada6527eb5e9c2cb62cbda8b4dd2bd2c SHA512 d7b9970a3bd444149e1801ffc268796a02833db39132c32f7745350bc423c40d111e9e338e9f0e35fa8b6b84c527d313669ff9f7b1488fcf2d4c834ab7495bf2
-DIST amdvlk-xgl-997225355d7fce7392a9e32fe9f0a515f5736d0f.tar.gz 1247401 BLAKE2B 5381474b3e8eb1783ab5b6a6059204fdd1fc6215a4bdc724bef874908d860f3f306773235325c725bddbc1c7e416a00a865e7b11e5218c3bca9fccd09e6bda95 SHA512 4217567268525f934dbde112e4a3b7703576d63cd49776dc1d991897bce406533d5954196cface6c31663d9ae073ec74ea0b084e55dfa91314aca350b9effa47
-DIST amdvlk-xgl-b72c7accced07675aeddace4e143152406076932.tar.gz 1245899 BLAKE2B 9de616524eaead6c650bf9c75f6bb2737e25ffd518012771b66878f4ea20a1b29f18f8e9c5b3f7eb16e0676652f13d8e62e2460376d7d6e2fcef54b82c4e5c61 SHA512 d5b975967fbb168717c8dcd2b9a1f786e5fead2276f9aaf3ca1fe68e8fd0ad00999f3af4e507b58674a62973a6f1cc57495280522aeea77f4925e4b7686e7b65

diff --git a/media-libs/amdvlk/amdvlk-2023.1.1.ebuild b/media-libs/amdvlk/amdvlk-2023.1.1.ebuild
deleted file mode 100644
index 02d04f50f..000000000
--- a/media-libs/amdvlk/amdvlk-2023.1.1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit check-reqs python-any-r1 cmake-multilib
-
-DESCRIPTION="AMD Open Source Driver for Vulkan"
-HOMEPAGE="https://github.com/GPUOpen-Drivers/AMDVLK"
-
-### SOURCE CODE PER_VERSION VARIABLES
-FETCH_URI="https://github.com/GPUOpen-Drivers"
-## For those who wants update ebuild: check https://github.com/GPUOpen-Drivers/AMDVLK/blob/${VERSION}/default.xml
-## e.g. https://github.com/GPUOpen-Drivers/AMDVLK/blob/v-2022.Q3.5/default.xml
-## and place commits in the desired variables
-## EXAMPLE: XGL_COMMIT="80e5a4b11ad2058097e77746772ddc9ab2118e07"
-## SRC_URI="... ${FETCH_URI}/$PART/archive/$COMMIT.zip -> $PART-$COMMIT.zip ..."
-XGL_COMMIT="67cd9d1d3016c0522ddf83ba0a0b2bda0de27d4c"
-PAL_COMMIT="042362399cdac1019fbc7f0ace8489aee2907883"
-LLPC_COMMIT="ffc49b2a07dea2754c1f7f3457a4ab5b4129c422"
-GPURT_COMMIT="e19c8ceca056f0b0d24ca4ecd654ef21d40ea063"
-LLVM_PROJECT_COMMIT="916f05c15939f5c94a3ec95d5b1fd6dbaf6c1ee4"
-METROHASH_COMMIT="18893fb28601bb9af1154cd1a671a121fff6d8d3"
-CWPACK_COMMIT="4f8cf0584442a91d829d269158567d7ed926f026"
-# Submodule of LLPC, also updates often. Grab commit version from
-# https://github.com/GPUOpen-Drivers/llpc/tree/dev/imported
-LLVM_DIALECTS_COMMIT="d12df4e895733e0adf8364f22349d92a000ae30d"
-# 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
-${FETCH_URI}/llpc/archive/${LLPC_COMMIT}.tar.gz -> amdvlk-llpc-${LLPC_COMMIT}.tar.gz
-${FETCH_URI}/gpurt/archive/${GPURT_COMMIT}.tar.gz -> amdvlk-gpurt-${GPURT_COMMIT}.tar.gz
-${FETCH_URI}/llvm-project/archive/${LLVM_PROJECT_COMMIT}.tar.gz -> amdvlk-llvm-project-${LLVM_PROJECT_COMMIT}.tar.gz
-${FETCH_URI}/MetroHash/archive/${METROHASH_COMMIT}.tar.gz -> amdvlk-MetroHash-${METROHASH_COMMIT}.tar.gz
-${FETCH_URI}/CWPack/archive/${CWPACK_COMMIT}.tar.gz -> amdvlk-CWPack-${CWPACK_COMMIT}.tar.gz
-${FETCH_URI}/llvm-dialects/archive/${LLVM_DIALECTS_COMMIT}.tar.gz -> amdvlk-LLVM-dialects-${LLVM_DIALECTS_COMMIT}.tar.gz"
-
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="wayland +raytracing"
-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.224
-	raytracing? ( dev-util/DirectXShaderCompiler )
-	dev-util/glslang[${MULTILIB_USEDEP}]"
-BDEPEND="${BUNDLED_LLVM_DEPEND}
-	${PYTHON_DEPS}
-	virtual/linux-sources"
-RDEPEND=" ${DEPEND}
-	x11-libs/libdrm[${MULTILIB_USEDEP}]
-	x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	x11-libs/libxcb[${MULTILIB_USEDEP}]
-	x11-libs/libxshmfence[${MULTILIB_USEDEP}]
-	>=media-libs/vulkan-loader-1.3.224[${MULTILIB_USEDEP}]
-	dev-util/glslang[${MULTILIB_USEDEP}]
-	dev-libs/openssl[${MULTILIB_USEDEP}]" #890449
-
-CHECKREQS_MEMORY="7G"
-CHECKREQS_DISK_BUILD="4G"
-CMAKE_USE_DIR="${S}/xgl"
-
-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-2022.4.2-reduced-llvm-installations.patch"
-	"${FILESDIR}/amdvlk-2022.4.2-reduced-llvm-installations-part2.patch"
-	"${FILESDIR}/amdvlk-2022.4.4-r1-disable-Werror.patch" #887777
-	"${FILESDIR}/amdvlk-2023.1.2-gcc13-cstdint.patch" #905174
-)
-
-pkg_pretend(){
-	ewarn "It's generally recomended to have at least 16GB memory to build"
-	ewarn "However, experiments shows that if you'll use MAKEOPTS=\"-j1\" you can build it with 4GB RAM"
-	ewarn "or you can use MAKEOPTS=\"-j3\" with 7.5GB system memory"
-	ewarn "See https://wiki.gentoo.org/wiki/AMDVLK#Additional_system_requirements_to_build"
-	ewarn "Use CHECKREQS_DONOTHING=1 if you need to bypass memory checking"
-
-	check-reqs_pkg_pretend
-}
-
-src_prepare() {
-	einfo "moving src to proper directories"
-	mkdir third_party || die
-	mv xgl-${XGL_COMMIT}/ xgl || die
-	mv pal-${PAL_COMMIT}/ pal || die
-	mv llpc-${LLPC_COMMIT}/ llpc || die
-	mv gpurt-${GPURT_COMMIT}/ gpurt || die
-	mv llvm-project-${LLVM_PROJECT_COMMIT}/ llvm-project || die
-	rm -d llpc/imported/llvm-dialects/ || die
-	mv llvm-dialects-${LLVM_DIALECTS_COMMIT}/ llpc/imported/llvm-dialects/ || die
-	mv MetroHash-${METROHASH_COMMIT}/ third_party/metrohash || die
-	mv CWPack-${CWPACK_COMMIT}/ third_party/cwpack || die
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_WAYLAND_SUPPORT=$(usex wayland)
-		-DVKI_RAY_TRACING=$(usex raytracing)
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-		-DLLVM_ENABLE_WERROR=OFF
-		-DENABLE_WERROR=OFF
-		-DVAM_ENABLE_WERROR=OFF
-		-DICD_ANALYSIS_WARNINGS_AS_ERRORS=OFF
-		-DMETROHASH_ENABLE_WERROR=OFF
-		-DBUILD_SHARED_LIBS=OFF #LLVM parts don't support shared libs
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DPACKAGE_VERSION="${PV}"
-		-DPACKAGE_NAME="${PN}"
-		-DLLVM_INSTALL_TOOLCHAIN_ONLY=ON #Disable installation of various LLVM parts which we had to clean up.
-		-Wno-dev
-		)
-	cmake_src_configure
-}
-multilib_check_headers() {
-	einfo "Checking headers skipped: there is no headers"
-}
-
-multilib_src_install_all() {
-	default
-	einfo "Removing unused LLVM parts…"
-	rm "${ED}"/usr/lib/libLTO* || die "Can't remove unused LLVM lto library"
-	rm "${ED}"/usr/lib/libRemarks* || die "Can't remove unused LLVM libRemarks library"
-	rm -r "${ED}"/usr/lib/cmake || die "Can't remove unused LLVM cmake folder"
-	einfo "Removal done"
-}
-
-pkg_postinst() {
-	ewarn "Make sure the following line is NOT included in the any Xorg configuration section:"
-	ewarn "| Driver	  \"modesetting\""
-	ewarn "and make sure you use DRI3 mode for Xorg (not revelant for wayland)"
-	elog "More information about the configuration can be found here:"
-	elog "https://github.com/GPUOpen-Drivers/AMDVLK"
-	elog "You can use AMD_VULKAN_ICD variable to switch to the required driver."
-	elog "AMD_VULKAN_ICD=RADV application   - for using radv."
-	elog "AMD_VULKAN_ICD=AMDVLK application - for using amdvlk."
-}

diff --git a/media-libs/amdvlk/amdvlk-2023.1.2.ebuild b/media-libs/amdvlk/amdvlk-2023.1.2.ebuild
deleted file mode 100644
index aa0f0cd91..000000000
--- a/media-libs/amdvlk/amdvlk-2023.1.2.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit check-reqs python-any-r1 cmake-multilib
-
-DESCRIPTION="AMD Open Source Driver for Vulkan"
-HOMEPAGE="https://github.com/GPUOpen-Drivers/AMDVLK"
-
-### SOURCE CODE PER_VERSION VARIABLES
-FETCH_URI="https://github.com/GPUOpen-Drivers"
-## For those who wants update ebuild: check https://github.com/GPUOpen-Drivers/AMDVLK/blob/${VERSION}/default.xml
-## e.g. https://github.com/GPUOpen-Drivers/AMDVLK/blob/v-2022.Q3.5/default.xml
-## and place commits in the desired variables
-## EXAMPLE: XGL_COMMIT="80e5a4b11ad2058097e77746772ddc9ab2118e07"
-## SRC_URI="... ${FETCH_URI}/$PART/archive/$COMMIT.zip -> $PART-$COMMIT.zip ..."
-XGL_COMMIT="b72c7accced07675aeddace4e143152406076932"
-PAL_COMMIT="ac9ff8bd22605bf7fd428fd9cf83248fb4dbe94b"
-LLPC_COMMIT="522365aa657f9cf65c4634261b800a04e214fd38"
-GPURT_COMMIT="172e852f90365bac5869f83eb9c929d9daae51f0"
-LLVM_PROJECT_COMMIT="916f05c15939f5c94a3ec95d5b1fd6dbaf6c1ee4"
-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="f282131c7c331688c31f7c3aabe9b6d3ff09fbc4"
-### 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
-${FETCH_URI}/llpc/archive/${LLPC_COMMIT}.tar.gz -> amdvlk-llpc-${LLPC_COMMIT}.tar.gz
-${FETCH_URI}/gpurt/archive/${GPURT_COMMIT}.tar.gz -> amdvlk-gpurt-${GPURT_COMMIT}.tar.gz
-${FETCH_URI}/llvm-project/archive/${LLVM_PROJECT_COMMIT}.tar.gz -> amdvlk-llvm-project-${LLVM_PROJECT_COMMIT}.tar.gz
-${FETCH_URI}/MetroHash/archive/${METROHASH_COMMIT}.tar.gz -> amdvlk-MetroHash-${METROHASH_COMMIT}.tar.gz
-${FETCH_URI}/CWPack/archive/${CWPACK_COMMIT}.tar.gz -> amdvlk-CWPack-${CWPACK_COMMIT}.tar.gz
-${FETCH_URI}/llvm-dialects/archive/${LLVM_DIALECTS_COMMIT}.tar.gz -> amdvlk-LLVM-dialects-${LLVM_DIALECTS_COMMIT}.tar.gz"
-
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="wayland +raytracing"
-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.224
-	raytracing? ( dev-util/DirectXShaderCompiler )
-	dev-util/glslang[${MULTILIB_USEDEP}]"
-BDEPEND="${BUNDLED_LLVM_DEPEND}
-	${PYTHON_DEPS}
-	virtual/linux-sources"
-RDEPEND=" ${DEPEND}
-	x11-libs/libdrm[${MULTILIB_USEDEP}]
-	x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	x11-libs/libxcb[${MULTILIB_USEDEP}]
-	x11-libs/libxshmfence[${MULTILIB_USEDEP}]
-	>=media-libs/vulkan-loader-1.3.224[${MULTILIB_USEDEP}]
-	dev-util/glslang[${MULTILIB_USEDEP}]
-	dev-libs/openssl[${MULTILIB_USEDEP}]" #890449
-
-CHECKREQS_MEMORY="7G"
-CHECKREQS_DISK_BUILD="4G"
-CMAKE_USE_DIR="${S}/xgl"
-
-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-2022.4.2-reduced-llvm-installations.patch"
-	"${FILESDIR}/amdvlk-2022.4.2-reduced-llvm-installations-part2.patch"
-	"${FILESDIR}/amdvlk-2022.4.4-r1-disable-Werror.patch" #887777
-	"${FILESDIR}/amdvlk-2023.1.2-gcc13-cstdint.patch" #905174
-)
-
-pkg_pretend(){
-	ewarn "It's generally recomended to have at least 16GB memory to build"
-	ewarn "However, experiments shows that if you'll use MAKEOPTS=\"-j1\" you can build it with 4GB RAM"
-	ewarn "or you can use MAKEOPTS=\"-j3\" with 7.5GB system memory"
-	ewarn "See https://wiki.gentoo.org/wiki/AMDVLK#Additional_system_requirements_to_build"
-	ewarn "Use CHECKREQS_DONOTHING=1 if you need to bypass memory checking"
-
-	check-reqs_pkg_pretend
-}
-
-src_prepare() {
-	einfo "moving src to proper directories"
-	mkdir third_party || die
-	mv xgl-${XGL_COMMIT}/ xgl || die
-	mv pal-${PAL_COMMIT}/ pal || die
-	mv llpc-${LLPC_COMMIT}/ llpc || die
-	mv gpurt-${GPURT_COMMIT}/ gpurt || die
-	mv llvm-project-${LLVM_PROJECT_COMMIT}/ llvm-project || die
-	rm -d llpc/imported/llvm-dialects/ || die
-	mv llvm-dialects-${LLVM_DIALECTS_COMMIT}/ llpc/imported/llvm-dialects/ || die
-	mv MetroHash-${METROHASH_COMMIT}/ third_party/metrohash || die
-	mv CWPack-${CWPACK_COMMIT}/ third_party/cwpack || die
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_WAYLAND_SUPPORT=$(usex wayland)
-		-DVKI_RAY_TRACING=$(usex raytracing)
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-		-DLLVM_ENABLE_WERROR=OFF
-		-DENABLE_WERROR=OFF
-		-DVAM_ENABLE_WERROR=OFF
-		-DICD_ANALYSIS_WARNINGS_AS_ERRORS=OFF
-		-DMETROHASH_ENABLE_WERROR=OFF
-		-DBUILD_SHARED_LIBS=OFF #LLVM parts don't support shared libs
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DPACKAGE_VERSION="${PV}"
-		-DPACKAGE_NAME="${PN}"
-		-DLLVM_INSTALL_TOOLCHAIN_ONLY=ON #Disable installation of various LLVM parts which we had to clean up.
-		-Wno-dev
-		)
-	cmake_src_configure
-}
-multilib_check_headers() {
-	einfo "Checking headers skipped: there is no headers"
-}
-
-multilib_src_install_all() {
-	default
-	einfo "Removing unused LLVM parts…"
-	rm "${ED}"/usr/lib/libLTO* || die "Can't remove unused LLVM lto library"
-	rm "${ED}"/usr/lib/libRemarks* || die "Can't remove unused LLVM libRemarks library"
-	rm -r "${ED}"/usr/lib/cmake || die "Can't remove unused LLVM cmake folder"
-	einfo "Removal done"
-}
-
-pkg_postinst() {
-	ewarn "Make sure the following line is NOT included in the any Xorg configuration section:"
-	ewarn "| Driver	  \"modesetting\""
-	ewarn "and make sure you use DRI3 mode for Xorg (not revelant for wayland)"
-	elog "More information about the configuration can be found here:"
-	elog "https://github.com/GPUOpen-Drivers/AMDVLK"
-	elog "You can use AMD_VULKAN_ICD variable to switch to the required driver."
-	elog "AMD_VULKAN_ICD=RADV application   - for using radv."
-	elog "AMD_VULKAN_ICD=AMDVLK application - for using amdvlk."
-}

diff --git a/media-libs/amdvlk/amdvlk-2023.1.3.ebuild b/media-libs/amdvlk/amdvlk-2023.1.3.ebuild
deleted file mode 100644
index 192387df2..000000000
--- a/media-libs/amdvlk/amdvlk-2023.1.3.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit check-reqs python-any-r1 cmake-multilib
-
-DESCRIPTION="AMD Open Source Driver for Vulkan"
-HOMEPAGE="https://github.com/GPUOpen-Drivers/AMDVLK"
-
-### SOURCE CODE PER_VERSION VARIABLES
-FETCH_URI="https://github.com/GPUOpen-Drivers"
-## For those who wants update ebuild: check https://github.com/GPUOpen-Drivers/AMDVLK/blob/${VERSION}/default.xml
-## e.g. https://github.com/GPUOpen-Drivers/AMDVLK/blob/v-2022.Q3.5/default.xml
-## and place commits in the desired variables
-## EXAMPLE: XGL_COMMIT="80e5a4b11ad2058097e77746772ddc9ab2118e07"
-## SRC_URI="... ${FETCH_URI}/$PART/archive/$COMMIT.zip -> $PART-$COMMIT.zip ..."
-XGL_COMMIT="997225355d7fce7392a9e32fe9f0a515f5736d0f"
-PAL_COMMIT="4640888b579bc9b0951c586b08a4552f71780d0d"
-LLPC_COMMIT="1ecd9997579b962be571162931c9e38bd86bafad"
-GPURT_COMMIT="714a028e920c502520011fc4f4556f58ec897424"
-LLVM_PROJECT_COMMIT="fdc6165b081b7b5e5ba245f4283fcb23d6d9f167"
-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="17aafecff46b68206a0ed82d58f5e2fc358367a1"
-### 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
-${FETCH_URI}/llpc/archive/${LLPC_COMMIT}.tar.gz -> amdvlk-llpc-${LLPC_COMMIT}.tar.gz
-${FETCH_URI}/gpurt/archive/${GPURT_COMMIT}.tar.gz -> amdvlk-gpurt-${GPURT_COMMIT}.tar.gz
-${FETCH_URI}/llvm-project/archive/${LLVM_PROJECT_COMMIT}.tar.gz -> amdvlk-llvm-project-${LLVM_PROJECT_COMMIT}.tar.gz
-${FETCH_URI}/MetroHash/archive/${METROHASH_COMMIT}.tar.gz -> amdvlk-MetroHash-${METROHASH_COMMIT}.tar.gz
-${FETCH_URI}/CWPack/archive/${CWPACK_COMMIT}.tar.gz -> amdvlk-CWPack-${CWPACK_COMMIT}.tar.gz
-${FETCH_URI}/llvm-dialects/archive/${LLVM_DIALECTS_COMMIT}.tar.gz -> amdvlk-LLVM-dialects-${LLVM_DIALECTS_COMMIT}.tar.gz"
-
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="wayland +raytracing"
-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.224
-	raytracing? ( dev-util/DirectXShaderCompiler )
-	dev-util/glslang[${MULTILIB_USEDEP}]"
-BDEPEND="${BUNDLED_LLVM_DEPEND}
-	${PYTHON_DEPS}
-	virtual/linux-sources"
-RDEPEND=" ${DEPEND}
-	x11-libs/libdrm[${MULTILIB_USEDEP}]
-	x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	x11-libs/libxcb[${MULTILIB_USEDEP}]
-	x11-libs/libxshmfence[${MULTILIB_USEDEP}]
-	>=media-libs/vulkan-loader-1.3.224[${MULTILIB_USEDEP}]
-	dev-util/glslang[${MULTILIB_USEDEP}]
-	dev-libs/openssl[${MULTILIB_USEDEP}]" #890449
-
-CHECKREQS_MEMORY="7G"
-CHECKREQS_DISK_BUILD="4G"
-CMAKE_USE_DIR="${S}/xgl"
-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-2022.4.2-reduced-llvm-installations.patch"
-	#"${FILESDIR}/amdvlk-2022.4.2-reduced-llvm-installations-part2.patch"
-	"${FILESDIR}/amdvlk-2022.4.4-r1-disable-Werror.patch" #887777
-	"${FILESDIR}/amdvlk-2023.1.2-gcc13-cstdint.patch" #905174
-)
-
-pkg_pretend(){
-	ewarn "It's generally recomended to have at least 16GB memory to build"
-	ewarn "However, experiments shows that if you'll use MAKEOPTS=\"-j1\" you can build it with 4GB RAM"
-	ewarn "or you can use MAKEOPTS=\"-j3\" with 7.5GB system memory"
-	ewarn "See https://wiki.gentoo.org/wiki/AMDVLK#Additional_system_requirements_to_build"
-	ewarn "Use CHECKREQS_DONOTHING=1 if you need to bypass memory checking"
-
-	check-reqs_pkg_pretend
-}
-
-src_prepare() {
-	einfo "moving src to proper directories"
-	mkdir third_party || die
-	mv xgl-${XGL_COMMIT}/ xgl || die
-	mv pal-${PAL_COMMIT}/ pal || die
-	mv llpc-${LLPC_COMMIT}/ llpc || die
-	mv gpurt-${GPURT_COMMIT}/ gpurt || die
-	mv llvm-project-${LLVM_PROJECT_COMMIT}/ llvm-project || die
-	rm -d llpc/imported/llvm-dialects/ || die
-	mv llvm-dialects-${LLVM_DIALECTS_COMMIT}/ llpc/imported/llvm-dialects/ || die
-	mv MetroHash-${METROHASH_COMMIT}/ third_party/metrohash || die
-	mv CWPack-${CWPACK_COMMIT}/ third_party/cwpack || die
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_WAYLAND_SUPPORT=$(usex wayland)
-		-DVKI_RAY_TRACING=$(usex raytracing)
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-		-DLLVM_ENABLE_WERROR=OFF
-		-DENABLE_WERROR=OFF
-		-DVAM_ENABLE_WERROR=OFF
-		-DICD_ANALYSIS_WARNINGS_AS_ERRORS=OFF
-		-DMETROHASH_ENABLE_WERROR=OFF
-		-DBUILD_SHARED_LIBS=OFF #LLVM parts don't support shared libs
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DPACKAGE_VERSION="${PV}"
-		-DPACKAGE_NAME="${PN}"
-		-DLLVM_INSTALL_TOOLCHAIN_ONLY=ON #Disable installation of various LLVM parts which we had to clean up.
-		-Wno-dev
-		)
-	cmake_src_configure
-}
-
-multilib_check_headers() {
-	einfo "Checking headers skipped: there is no headers"
-}
-
-multilib_src_install_all() {
-	default
-	einfo "Removing unused LLVM parts…"
-	rm "${ED}"/usr/lib/libLTO* || die "Can't remove unused LLVM lto library"
-	rm "${ED}"/usr/lib/libRemarks* || die "Can't remove unused LLVM libRemarks library"
-	rm -r "${ED}"/usr/lib/cmake || die "Can't remove unused LLVM cmake folder"
-	einfo "Removal done"
-}
-
-pkg_postinst() {
-	ewarn "Make sure the following line is NOT included in the any Xorg configuration section:"
-	ewarn "| Driver	  \"modesetting\""
-	ewarn "and make sure you use DRI3 mode for Xorg (not revelant for wayland)"
-	elog "More information about the configuration can be found here:"
-	elog "https://github.com/GPUOpen-Drivers/AMDVLK"
-	elog "You can use AMD_VULKAN_ICD variable to switch to the required driver."
-	elog "AMD_VULKAN_ICD=RADV application   - for using radv."
-	elog "AMD_VULKAN_ICD=AMDVLK application - for using amdvlk."
-}

diff --git a/media-libs/amdvlk/files/amdvlk-2022.4.4-r1-disable-Werror.patch b/media-libs/amdvlk/files/amdvlk-2022.4.4-r1-disable-Werror.patch
deleted file mode 100644
index 01c28e0ea..000000000
--- a/media-libs/amdvlk/files/amdvlk-2022.4.4-r1-disable-Werror.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/pal/shared/devdriver/cmake/DevDriver.cmake b/pal/shared/devdriver/cmake/DevDriver.cmake
-index b3f2e7e48..cbd9f7839 100644
---- a/pal/shared/devdriver/cmake/DevDriver.cmake
-+++ b/pal/shared/devdriver/cmake/DevDriver.cmake
-@@ -111,7 +111,7 @@ function(apply_devdriver_warnings name)
-         target_compile_options(${name} PRIVATE
-             -Wall # Enable all warnings.
-             -Wextra # Enable extra warnings that are not enabled by -Wall.
--            -Werror # warning as error
-+	    #-Werror # warning as error
-         )
-     elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-         target_compile_options(${name} PRIVATE

diff --git a/media-libs/amdvlk/files/amdvlk-2023.1.2-gcc13-cstdint.patch b/media-libs/amdvlk/files/amdvlk-2023.1.2-gcc13-cstdint.patch
deleted file mode 100644
index 2bfc7d299..000000000
--- a/media-libs/amdvlk/files/amdvlk-2023.1.2-gcc13-cstdint.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur amdvlk.orig/pal/src/core/imported/rdf/rdf/inc/amdrdf.h amdvlk/pal/src/core/imported/rdf/rdf/inc/amdrdf.h
---- amdvlk.orig/pal/src/core/imported/rdf/rdf/inc/amdrdf.h	2023-02-16 17:37:47.000000000 +0900
-+++ amdvlk/pal/src/core/imported/rdf/rdf/inc/amdrdf.h	2024-01-17 06:58:02.666146730 +0900
-@@ -25,6 +25,7 @@
- #pragma once
- 
- #include <cstddef>
-+#include <cstdint>
- #include <cstring>
- #include <functional>
- #include <memory>


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-libs/amdvlk/, media-libs/amdvlk/files/
@ 2024-12-05  8:10 Denis Reva
  0 siblings, 0 replies; 5+ messages in thread
From: Denis Reva @ 2024-12-05  8:10 UTC (permalink / raw
  To: gentoo-commits

commit:     2036471360a1972d3f5f39ad56803738bb30bf34
Author:     Denis Reva <denis7774 <AT> gmail <DOT> com>
AuthorDate: Thu Dec  5 08:09:59 2024 +0000
Commit:     Denis Reva <denis7774 <AT> gmail <DOT> com>
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
+ {


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-libs/amdvlk/, media-libs/amdvlk/files/
@ 2025-02-09 22:40 Quinet Charlie
  0 siblings, 0 replies; 5+ messages in thread
From: Quinet Charlie @ 2025-02-09 22:40 UTC (permalink / raw
  To: gentoo-commits

commit:     deb5dcd847321756374cc22a67f4296bdb455183
Author:     Charlie Quinet <w.iron.zombie <AT> gmail <DOT> com>
AuthorDate: Sun Feb  9 19:19:35 2025 +0000
Commit:     Quinet Charlie <w.iron.zombie <AT> gmail <DOT> com>
CommitDate: Sun Feb  9 22:39:03 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=deb5dcd8

media-libs/amdvlk: add a patch to try supporting building with musl

Works on my machine with sys-libs/musl-9999, although I have not checked with the stable releases

Signed-off-by: Charlie Quinet <w.iron.zombie <AT> gmail.com>

 media-libs/amdvlk/amdvlk-2025.1.1.ebuild           |  2 ++
 .../files/amdvlk-2025.1.1-support-musl.patch       | 28 ++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/media-libs/amdvlk/amdvlk-2025.1.1.ebuild b/media-libs/amdvlk/amdvlk-2025.1.1.ebuild
index 8df544c94..12c734016 100644
--- a/media-libs/amdvlk/amdvlk-2025.1.1.ebuild
+++ b/media-libs/amdvlk/amdvlk-2025.1.1.ebuild
@@ -99,6 +99,8 @@ pkg_pretend(){
 }
 
 src_prepare() {
+	use elibc_musl && PATCHES+=( "${FILESDIR}/amdvlk-2025.1.1-support-musl.patch" )
+
 	einfo "moving src to proper directories"
 	mkdir third_party || die
 	mv xgl-${XGL_COMMIT}/ xgl || die

diff --git a/media-libs/amdvlk/files/amdvlk-2025.1.1-support-musl.patch b/media-libs/amdvlk/files/amdvlk-2025.1.1-support-musl.patch
new file mode 100644
index 000000000..dccf1ad5c
--- /dev/null
+++ b/media-libs/amdvlk/files/amdvlk-2025.1.1-support-musl.patch
@@ -0,0 +1,28 @@
+diff --git a/pal/src/util/file.cpp b/pal/src/util/file.cpp
+index db9df291..61c1969f 100644
+--- a/pal/src/util/file.cpp
++++ b/pal/src/util/file.cpp
+@@ -481,7 +481,7 @@ void File::Seek(
+ {
+     if (m_pFileHandle != nullptr)
+     {
+-        const int32 ret = fseeko64(m_pFileHandle, offset, static_cast<int>(pos));
++        const int32 ret = fseeko(m_pFileHandle, offset, static_cast<int>(pos));
+         PAL_ASSERT(ret == 0);
+     }
+ }
+diff --git a/pal/src/util/lnx/lnxSysUtil.cpp b/pal/src/util/lnx/lnxSysUtil.cpp
+index 0a05f3ae..ec05e28d 100644
+--- a/pal/src/util/lnx/lnxSysUtil.cpp
++++ b/pal/src/util/lnx/lnxSysUtil.cpp
+@@ -51,6 +51,10 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ 
++#if !defined(ACCESSPERMS)
++#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO)
++#endif
++
+ using namespace std::chrono;
+ 
+ namespace Util


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2025-02-09 22:40 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-13 19:52 [gentoo-commits] repo/proj/guru:dev commit in: media-libs/amdvlk/, media-libs/amdvlk/files/ David Roman
2024-08-13 19:56 ` [gentoo-commits] repo/proj/guru:master commit in: media-libs/amdvlk/files/, media-libs/amdvlk/ David Roman
  -- strict thread matches above, loose matches on Subject: below --
2025-02-09 22:40 [gentoo-commits] repo/proj/guru:dev commit in: media-libs/amdvlk/, media-libs/amdvlk/files/ Quinet Charlie
2024-12-05  8:10 Denis Reva
2022-12-22  6:46 Denis Reva

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox