media-libs/amdvlk: amdvlk is now used static build without separate llvm

Changed installation prefix to default ones

Removed buggy amdvlk version

New version 2022.4.6

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

3 files changed, 43 insertions, 24 deletions

diff --git a/media-libs/amdvlk/Manifest b/media-libs/amdvlk/Manifest
index 11df523cf..e8d73899c 100644
--- a/media-libs/amdvlk/Manifest
+++ b/media-libs/amdvlk/Manifest
@@ -1,7 +1,7 @@
 DIST amdvlk-CWPack-4f8cf0584442a91d829d269158567d7ed926f026.tar.gz 39633 BLAKE2B d5b2a88f0d563eef5beb42a8304cf6cdd825e75242c22acc360c5bb9cbd1d02a4f891b6b2f3a4803e1e6b48a4d176aad40f8bdeca92847f2fbf53674dedeaff3 SHA512 06d56baaba1f1224a5266f4a63c1abf70edba7cc16cc4e62f2f5b1ec94fc2c1cfc4c6f11a9c6ef42c23b29be8d07921caad5e919357c0bd82cf714783eee0bcc
 DIST amdvlk-MetroHash-18893fb28601bb9af1154cd1a671a121fff6d8d3.tar.gz 11729 BLAKE2B b0e3de885e50c317141d62c885b421c7fd2e1ac783733704342bbed3109bff36a9209ab276f534a2231531483539221bbb1014bd39528a91124161bafc5646eb SHA512 8f12f95e80d594c8bd87a852c67a2d6777ce89d1a13e1a87ee17bbb876a0702c14ffe7a7fd65a244620f2043ad5d22ae8eb863d69f1dc5494d985733bbfb7bf9
-DIST amdvlk-gpurt-b89f22aadd0a335be632055434a7f8ba152fcb37.tar.gz 278191 BLAKE2B 9774616f6875601136108f2e9d6336f18c5d58a98cd9dc01839df210cc5d484bcd0b6a754cec8660216ab92275aa88fa20bcc4d5b36fa727e258abd7d2e23a7f SHA512 9fa3ac42ec8ac416a1fe92ece3573f4a3ba874f6c3e8fce42754b89aace825f4ee680789ddd7e5ab3cac83b5eb04934d2e659a7543925b5ecdb7d8dbb91c4b92
-DIST amdvlk-llpc-7857f2e209fc65374f2891be52e3a4a22fbae483.tar.gz 2467228 BLAKE2B 9715d5721770725371c1faa2d33f0217e998b5fc77aeb6a665d0a200db54d337fdfb3d9561abf54cf035009fb1dfd41b3e2e0ecf78eaceb5890877303d67a3ab SHA512 8a5a18ad64ee97d36aa7ae87c31112985c49c6755ae850fea141710cf54ff1610828eb5d35ea8f2a0148be9090f0c04099c94948e0c2489f68b0b58966847d03
-DIST amdvlk-llvm-project-5c82ef808fd269c95f5bd166d1846149e3afadc2.tar.gz 167121209 BLAKE2B 7a3da40252e68a58588a5b8e640f324f89ab750f98e4d5d58ba164ba4fa9a19561100b1e84cc75d93347101837e50a70c8d33bc3bca211990134fefd11e31a12 SHA512 d2b68885737ab77e976b6cddce733ad1ca5295e390b6900765b54d82b6d5d9fe9099d5c16dbb2e8c8e1c266c9e22e1c6298be2b41e7d48ecfc5521f3d960a692
-DIST amdvlk-pal-ae55b19b7553bf204b4945de9c11c5b05bc0e167.tar.gz 11241268 BLAKE2B f2fc5db1070493e3d79342143ec5005880d6a71669b8d741bde5d1c0f40b54b60f9e2f68a8092d6a398606ec97a95d0c7ab79ecbfe6568fee335e5a99b6631f1 SHA512 249ceb603a2f18391419053f11606a14483a2bbb097ce6b270b50a723a209db8125f08c719d61891f75cf9edbbaac20217bdcf4f820e35e933ea84594094d6e9
-DIST amdvlk-xgl-4118707939c2f4783d28ce2a383184a3794ca477.tar.gz 1188889 BLAKE2B 7e51c1fb954c2eca42544f6a890e996cbfb196cc3ad216d43a56feacbe16242240b1e2eefc8ebc13cb1c43d5541151e15369541a59abcef83c15daf15dedc14a SHA512 8735d6e0d008a066d2ac1ac9c7bdb31e162380a08c06e8f57c6d3e0c4a768b7a11484a5542c4b60c0ce91e560ea6d38c784ae8a6af25a72adcbefd7d95c88152
+DIST amdvlk-gpurt-2874e509b677d78ddb3faae90989dd45e60669b3.tar.gz 281182 BLAKE2B c6642db52268b76d8c9cb4e140d28f84ed402ec7b3f83e1c5ec716efcdba00ed565312913ad342edd3520f5b17195b36696e3074059c0c509a9afcfd9ccd4d24 SHA512 08c410d0c9478b76947537f84b3a91f8598412765aee30a883f974e3475a3e336f19a9063c762fccdd2970dec60cff9af045d0c9c330ea484a8503b75b543c3f
+DIST amdvlk-llpc-9db0ba4c968bbfe2f3e7e546d17cbfd07dcfdc9e.tar.gz 2472851 BLAKE2B 1341d1de88d09f6f46c00b78a0871fb793896c4193aea4ec5ad1464e376940fceac288a4d7358d6fe5521a11dfdab4edb3b6d7b85f9d2e9b7e3e6de449d5a179 SHA512 fe417bda2177273b8d42232b39cb5d99b5d115686e555e904d2914204f9fff0637c91d1ddedc5433402fc7e584d8b5d7e435fe828895281e43d7bc5848109daf
+DIST amdvlk-llvm-project-d2b67605e4dd5dc50d0afbeb4f20f29cce97b207.tar.gz 167636626 BLAKE2B 23152ac9f5548847bd4109f1da25642f30dece0f482cfd7ab1c89d1623f0bb57b0b47915a4eb82d307b33a14b1023af6593d16fa7fd751bbbc4907b6554c7fbb SHA512 4681d3f49ef66863df46387ca021dfe2f77750528a90d3f6f709919f56a6b783ffd095a7442a30f83a4168381e8fc088190341944e4bc2d080cbfb274606b772
+DIST amdvlk-pal-c2af6fc4c14ea61273bcf5576f8a83a12b945dd7.tar.gz 11242034 BLAKE2B d72b31a2d6606e9fee7a505203343df8a7712ee97caa1c828f2e7f4d7a96fc47e95d9695d8f0e4749fc9c3a092b17deca21abec6b7b52c0430a02855abf44bdb SHA512 ee4a8686df45bebe9ab8f745694a51f6f1f71aa1c4b7699fafe0ad86fa5eb374832f7be59aff3fd2f0d29b6b1367ecb0d8658e8f110ec06972d528af88acc9dc
+DIST amdvlk-xgl-8a67c76eedb8400fb5d3b1e7b6a3894efdc7a3b9.tar.gz 1196792 BLAKE2B f59f2a020793c40c2082fb8ebc461f03b6d0ffd18a2c3eddf961e674e590ed8026d09d5bd142ed7ebcca8e18b26c8dc282b4f7ce7d2387896559e1de70c81f4c SHA512 294f8bdf87bc0b479b108def31672f29557a145c268089959a4825eeecd593a56e7c5943ff3959b3cf98037b4583fde99a9b04dcaf7a940cb75f3486a419ef48
diff --git a/media-libs/amdvlk/amdvlk-2022.3.5-r1.ebuild b/media-libs/amdvlk/amdvlk-2022.4.1.ebuild
index 485a78945..a1204099a 100644
--- a/media-libs/amdvlk/amdvlk-2022.3.5-r1.ebuild
+++ b/media-libs/amdvlk/amdvlk-2022.4.1.ebuild
@@ -44,11 +44,11 @@ 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="4118707939c2f4783d28ce2a383184a3794ca477"
-PAL_COMMIT="ae55b19b7553bf204b4945de9c11c5b05bc0e167"
-LLPC_COMMIT="7857f2e209fc65374f2891be52e3a4a22fbae483"
-GPURT_COMMIT="b89f22aadd0a335be632055434a7f8ba152fcb37"
-LLVM_PROJECT_COMMIT="5c82ef808fd269c95f5bd166d1846149e3afadc2"
+XGL_COMMIT="8a67c76eedb8400fb5d3b1e7b6a3894efdc7a3b9"
+PAL_COMMIT="c2af6fc4c14ea61273bcf5576f8a83a12b945dd7"
+LLPC_COMMIT="9db0ba4c968bbfe2f3e7e546d17cbfd07dcfdc9e"
+GPURT_COMMIT="2874e509b677d78ddb3faae90989dd45e60669b3"
+LLVM_PROJECT_COMMIT="d2b67605e4dd5dc50d0afbeb4f20f29cce97b207"
 METROHASH_COMMIT="18893fb28601bb9af1154cd1a671a121fff6d8d3"
 CWPACK_COMMIT="4f8cf0584442a91d829d269158567d7ed926f026"
 # end of variables
@@ -61,7 +61,8 @@ ${FETCH_URI}/MetroHash/archive/${METROHASH_COMMIT}.tar.gz -> amdvlk-MetroHash-${
 ${FETCH_URI}/CWPack/archive/${CWPACK_COMMIT}.tar.gz -> amdvlk-CWPack-${CWPACK_COMMIT}.tar.gz"
 
 PATCHES=(
-	"${FILESDIR}"/amdvlk-2022.3.5-no-compiler-presets.patch #875821
+	"${FILESDIR}/amdvlk-2022.3.5-no-compiler-presets.patch" #875821
+	"${FILESDIR}/amdvlk-2022.4.1-proper-libdir.patch"
 )
 
 src_prepare() {
@@ -81,25 +82,30 @@ src_prepare() {
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DBUILD_WAYLAND_SUPPORT=$(usex wayland)
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/amdvlk"
-		-DLLVM_VERSION_SUFFIX="-$(get_libdir)-amdvlk"
-		-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON
+		-DLLVM_VERSION_SUFFIX="-amdvlk"
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+		-DBUILD_SHARED_LIBS=OFF #LLVM parts don't support shared libs
+		-DPython3_EXECUTABLE="${PYTHON}"
 		-Wno-dev
 		)
 	cmake_src_configure
 }
-multilib_src_install(){
-	cmake_src_install
-	rm -r "${D}"/var/ || die "can't remove incorrect temporary files of amdvlk"
-	einfo "Correcting permissions of amdvlk $(get_libdir) libraries"
-	fperms -R 775 /usr/lib/llvm/amdvlk/$(get_libdir)
+multilib_check_headers() {
+	einfo "There is no headers"
 }
 
-multilib_src_install_all() {
-	cat > "99${PN}" <<-EOF
-		LDPATH="${EPREFIX}/usr/lib/llvm/amdvlk/lib:${EPREFIX}/usr/lib/llvm/amdvlk/lib64"
-	EOF
-	doenvd "99${PN}"
+multilib_src_install() {
+	cmake_src_install
+	einfo "Removing unused LLVM parts…"
+	rm "${D}"/usr/lib/libLLVM*.a || die "Can't remove unused LLVM static libs"
+	rm "${D}"/usr/lib/libLTO* || die "Can't remove unused LLVM lto library"
+	rm "${D}"/usr/lib/libRemarks* || die "Can't remove unused LLVM lto library"
+	rm -r "${D}"/usr/share/opt-viewer || "Can't remove unused LLVM opt-viewer"
+	rm -r "${D}"/usr/include || die "Can't remove unused include folder"
+	rm -r "${D}"/usr/lib/cmake || die "Can't remove unused LLVM cmake folder"
+	einfo "Removal done! Moving docs…"
+	mv "${D}"/usr/share/doc/amdvlk/* "${D}"/usr/share/doc/"amdvlk-${PV}"/ || die "Can't move docs"
+	einfo "Done!"
 }
 
 pkg_postinst() {
diff --git a/media-libs/amdvlk/files/amdvlk-2022.4.1-proper-libdir.patch b/media-libs/amdvlk/files/amdvlk-2022.4.1-proper-libdir.patch
new file mode 100644
index 000000000..dd6679e8b
--- /dev/null
+++ b/media-libs/amdvlk/files/amdvlk-2022.4.1-proper-libdir.patch
@@ -0,0 +1,13 @@
+diff --git a/xgl/icd/CMakeLists.txt b/xgl/icd/CMakeLists.txt
+index 2d52a00ab..2d723e51b 100644
+--- a/xgl/icd/CMakeLists.txt
++++ b/xgl/icd/CMakeLists.txt
+@@ -30,7 +30,7 @@ set(ICD_TARGET amdvlk${TARGET_ARCHITECTURE_BITS})
+ set_target_properties(xgl PROPERTIES OUTPUT_NAME ${ICD_TARGET})
+ set_target_properties(xgl PROPERTIES PREFIX "")
+ 
+-install(TARGETS xgl DESTINATION ${CMAKE_SOURCE_DIR}/lib/${CMAKE_BUILD_TYPE})
++install(TARGETS xgl DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
+ 
+ ### Compiler Options ###################################################################################################
+ xgl_compiler_options(xgl)