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

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

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

commit:     890b93904f29f7b7b607f41bd7eecfb443d9eac1
Author:     Denis Reva <denis7774 <AT> gmail <DOT> com>
AuthorDate: Wed Oct 12 08:44:45 2022 +0000
Commit:     Denis Reva <denis7774 <AT> gmail <DOT> com>
CommitDate: Wed Oct 12 08:44:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=890b9390

media-libs/amdvlk: Fixes direct ar calls

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

 media-libs/amdvlk/amdvlk-2022.3.5-r1.ebuild        | 114 +++++++++++++++++++++
 .../amdvlk-2022.3.5-no-compiler-presets.patch      |  20 ++++
 2 files changed, 134 insertions(+)

diff --git a/media-libs/amdvlk/amdvlk-2022.3.5-r1.ebuild b/media-libs/amdvlk/amdvlk-2022.3.5-r1.ebuild
new file mode 100644
index 000000000..485a78945
--- /dev/null
+++ b/media-libs/amdvlk/amdvlk-2022.3.5-r1.ebuild
@@ -0,0 +1,114 @@
+# 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_{8..11} )
+
+inherit check-reqs python-any-r1 cmake-multilib
+
+DESCRIPTION="AMD Open Source Driver for Vulkan"
+HOMEPAGE="https://github.com/GPUOpen-Drivers/AMDVLK"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="wayland"
+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"
+BDEPEND="${BUNDLED_LLVM_DEPEND}
+	${PYTHON_DEPS}
+	dev-util/cmake
+	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-util/DirectXShaderCompiler"
+
+CHECKREQS_MEMORY="16G"
+CHECKREQS_DISK_BUILD="4G"
+S="${WORKDIR}"
+CMAKE_USE_DIR="${S}/xgl"
+
+###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="4118707939c2f4783d28ce2a383184a3794ca477"
+PAL_COMMIT="ae55b19b7553bf204b4945de9c11c5b05bc0e167"
+LLPC_COMMIT="7857f2e209fc65374f2891be52e3a4a22fbae483"
+GPURT_COMMIT="b89f22aadd0a335be632055434a7f8ba152fcb37"
+LLVM_PROJECT_COMMIT="5c82ef808fd269c95f5bd166d1846149e3afadc2"
+METROHASH_COMMIT="18893fb28601bb9af1154cd1a671a121fff6d8d3"
+CWPACK_COMMIT="4f8cf0584442a91d829d269158567d7ed926f026"
+# 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"
+
+PATCHES=(
+	"${FILESDIR}"/amdvlk-2022.3.5-no-compiler-presets.patch #875821
+)
+
+src_prepare() {
+	einfo "moving src to proper directories"
+	mkdir -p "${S}"
+	mkdir -p "${S}/third_party"
+	mv xgl-${XGL_COMMIT}/ "${S}/xgl"
+	mv pal-${PAL_COMMIT}/ "${S}/pal"
+	mv llpc-${LLPC_COMMIT}/ "${S}/llpc"
+	mv gpurt-${GPURT_COMMIT}/ "${S}/gpurt"
+	mv llvm-project-${LLVM_PROJECT_COMMIT}/ "${S}/llvm-project"
+	mv MetroHash-${METROHASH_COMMIT}/ "${S}/third_party/metrohash"
+	mv CWPack-${CWPACK_COMMIT}/ "${S}/third_party/cwpack"
+	cmake_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
+		-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_src_install_all() {
+	cat > "99${PN}" <<-EOF
+		LDPATH="${EPREFIX}/usr/lib/llvm/amdvlk/lib:${EPREFIX}/usr/lib/llvm/amdvlk/lib64"
+	EOF
+	doenvd "99${PN}"
+}
+
+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.3.5-no-compiler-presets.patch b/media-libs/amdvlk/files/amdvlk-2022.3.5-no-compiler-presets.patch
new file mode 100644
index 000000000..095705b6b
--- /dev/null
+++ b/media-libs/amdvlk/files/amdvlk-2022.3.5-no-compiler-presets.patch
@@ -0,0 +1,20 @@
+diff --git a/xgl/CMakeLists.txt b/xgl/CMakeLists.txt
+index 0abdb0f42..dada07d96 100644
+--- a/xgl/CMakeLists.txt
++++ b/xgl/CMakeLists.txt
+@@ -31,7 +31,6 @@ option(XGL_USE_CLANG "Build with clang?" OFF)
+ if(UNIX AND XGL_USE_CLANG)
+     list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+     include(XglCompilerOptions)
+-    xgl_use_clang_compiler()
+ endif()
+ 
+ ### CMake Includes ####################################################################################################
+@@ -114,7 +113,6 @@ if(UNIX)
+ endif()
+ 
+ ### Set Compiler ######################################################################################################
+-xgl_set_compiler()
+ 
+ ### Sanitizers ########################################################################################################
+ # Temporary variables


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

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

commit:     e85efe01ecc0ae9988b92dd51eb741954cadeaa9
Author:     Denis Reva <denis7774 <AT> gmail <DOT> com>
AuthorDate: Thu Oct 27 09:24:40 2022 +0000
Commit:     Denis Reva <denis7774 <AT> gmail <DOT> com>
CommitDate: Thu Oct 27 09:24:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e85efe01

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 <AT> gmail.com>

 media-libs/amdvlk/Manifest                         | 10 ++---
 ...k-2022.3.5-r1.ebuild => amdvlk-2022.4.1.ebuild} | 44 ++++++++++++----------
 .../files/amdvlk-2022.4.1-proper-libdir.patch      | 13 +++++++
 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
similarity index 73%
rename from media-libs/amdvlk/amdvlk-2022.3.5-r1.ebuild
rename to 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)


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

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

commit:     955851505c0c5538d143422cc5e65aca280df338
Author:     Denis Reva <denis7774 <AT> gmail <DOT> com>
AuthorDate: Wed Nov 16 17:03:06 2022 +0000
Commit:     Denis Reva <denis7774 <AT> gmail <DOT> com>
CommitDate: Wed Nov 16 17:03:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=95585150

media-libs/amdvlk: updated to 2022.4.2

Reduced installation time

Fixed warning about installation directory

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

 media-libs/amdvlk/Manifest                         |  10 +-
 ...dvlk-2022.4.1.ebuild => amdvlk-2022.4.2.ebuild} |  32 ++-
 .../files/amdvlk-2022.4.2-license-path.patch       |  13 +
 ...2022.4.2-reduced-llvm-installations-part2.patch | 175 ++++++++++++
 ...mdvlk-2022.4.2-reduced-llvm-installations.patch | 309 +++++++++++++++++++++
 5 files changed, 519 insertions(+), 20 deletions(-)

diff --git a/media-libs/amdvlk/Manifest b/media-libs/amdvlk/Manifest
index e8d73899c..0e8875ec9 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-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
+DIST amdvlk-gpurt-889dd8db7228814a530f0a897ae1ce35543f4662.tar.gz 293078 BLAKE2B 18efc22b0467bd8756e7746169ebd7e7816821c89fe33a04a7d495101fcea136ab6d379d037741f353a5707d4c5f9e2a80a589a009882d380234b23d767cd089 SHA512 ed49a3c88d8e8d91f8e2d733d060a4999051b4fc79ec3b5224c88de32f586e913ea76a48c9fe09acdbacb5be933ab0bac07c321034b0a5703605379b85e11e74
+DIST amdvlk-llpc-83e59f978821ce09390b25838b6684fc11b04774.tar.gz 2489526 BLAKE2B b9f595245a43cee0499c5dc49abb1071844c9f018b6bd7073fda7942c3ba876eb5c37e130118de95a9acff83064f75db6f39d238e439e75ca5611990b5de0ae1 SHA512 45857a3bf658a98675c81ca29061dd77736e44660a643438aca71e1752104a8c318cb0c96152d9203e740e62278ad74b3e084117f2a7ddc65e43278470e59ffc
+DIST amdvlk-llvm-project-3c87d1ffe0dbaa60927d428afe3a4a2b3352c31b.tar.gz 167640231 BLAKE2B 15199760d50db4af5925f47ffdd4cb13b891cd76becd81dd96d0dbbb5785176ea7d272d12949d9446eccf1dc774150af04379586931e2b9b4faa1d6743cb265f SHA512 bd790236238fd068a7e7d438803ab307df34297f6aeff10c07dde43c6f51e582a92f0f084531f8f5c16e8cc52927ec67e8349eebf836e8cf295a22430aaf46a3
+DIST amdvlk-pal-0f44ced5384c66d77df3dca1116c7daf7ccfdae5.tar.gz 11305484 BLAKE2B 774310e4b5d839ec1415340377c45b31fc60fde56250e9a2097ef0bbf1940a59b901a692215e28a7200cefa80b075b2e11882fe21b550f1e3edfebad203c28d3 SHA512 f96b79f3be4e5d0b82be7a37bfe546a2db466a92e9eb59053582b3b12a846fe737cd6e01a4d4725ef016611d850cb70b81fb478343b6d7b49832091f10f1e2b1
+DIST amdvlk-xgl-0387177d6143533c88ff0d5ac045bf3994ee618b.tar.gz 1216290 BLAKE2B 30d0914538562ca923216a14be2b54f6d065c0a9f03bdaa11e163bf8c0e3499fdff79aaf6e0495e9d0dd12af526627447781259694e93cf4dab2712b0e1be623 SHA512 6531d1649a09d4f59ce70e8f0f7f9075585c86e5a0053038c6e11c6d9df77ec1dbc2ec12c67dd4e250911faf6d1701f30665c96b18b56bd247f2381c82991550

diff --git a/media-libs/amdvlk/amdvlk-2022.4.1.ebuild b/media-libs/amdvlk/amdvlk-2022.4.2.ebuild
similarity index 83%
rename from media-libs/amdvlk/amdvlk-2022.4.1.ebuild
rename to media-libs/amdvlk/amdvlk-2022.4.2.ebuild
index 92d00b81a..bc6f408f9 100644
--- a/media-libs/amdvlk/amdvlk-2022.4.1.ebuild
+++ b/media-libs/amdvlk/amdvlk-2022.4.2.ebuild
@@ -19,7 +19,9 @@ 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"
+	>=dev-util/vulkan-headers-1.3.224
+	dev-util/DirectXShaderCompiler
+	dev-util/glslang[${MULTILIB_USEDEP}]"
 BDEPEND="${BUNDLED_LLVM_DEPEND}
 	${PYTHON_DEPS}
 	dev-util/cmake
@@ -30,8 +32,7 @@ RDEPEND=" ${DEPEND}
 	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-util/DirectXShaderCompiler"
+	dev-util/glslang[${MULTILIB_USEDEP}]"
 
 CHECKREQS_MEMORY="16G"
 CHECKREQS_DISK_BUILD="4G"
@@ -44,11 +45,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="8a67c76eedb8400fb5d3b1e7b6a3894efdc7a3b9"
-PAL_COMMIT="c2af6fc4c14ea61273bcf5576f8a83a12b945dd7"
-LLPC_COMMIT="9db0ba4c968bbfe2f3e7e546d17cbfd07dcfdc9e"
-GPURT_COMMIT="2874e509b677d78ddb3faae90989dd45e60669b3"
-LLVM_PROJECT_COMMIT="d2b67605e4dd5dc50d0afbeb4f20f29cce97b207"
+XGL_COMMIT="0387177d6143533c88ff0d5ac045bf3994ee618b"
+PAL_COMMIT="0f44ced5384c66d77df3dca1116c7daf7ccfdae5"
+LLPC_COMMIT="83e59f978821ce09390b25838b6684fc11b04774"
+GPURT_COMMIT="889dd8db7228814a530f0a897ae1ce35543f4662"
+LLVM_PROJECT_COMMIT="3c87d1ffe0dbaa60927d428afe3a4a2b3352c31b"
 METROHASH_COMMIT="18893fb28601bb9af1154cd1a671a121fff6d8d3"
 CWPACK_COMMIT="4f8cf0584442a91d829d269158567d7ed926f026"
 # end of variables
@@ -63,6 +64,9 @@ ${FETCH_URI}/CWPack/archive/${CWPACK_COMMIT}.tar.gz -> amdvlk-CWPack-${CWPACK_CO
 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"
 )
 
 src_prepare() {
@@ -86,6 +90,9 @@ multilib_src_configure() {
 		-DLLVM_HOST_TRIPLE="${CHOST}"
 		-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
@@ -97,15 +104,10 @@ multilib_check_headers() {
 multilib_src_install_all() {
 	default
 	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 "${D}"/usr/lib/libRemarks* || die "Can't remove unused LLVM libRemarks library"
 	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}"/ || ewarn "Can't move docs. It is not fatal"
-	einfo "Done!"
+	einfo "Removal done"
 }
 
 pkg_postinst() {

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
new file mode 100644
index 000000000..9fd590190
--- /dev/null
+++ b/media-libs/amdvlk/files/amdvlk-2022.4.2-license-path.patch
@@ -0,0 +1,13 @@
+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-2022.4.2-reduced-llvm-installations-part2.patch b/media-libs/amdvlk/files/amdvlk-2022.4.2-reduced-llvm-installations-part2.patch
new file mode 100644
index 000000000..aa9f7ac1d
--- /dev/null
+++ b/media-libs/amdvlk/files/amdvlk-2022.4.2-reduced-llvm-installations-part2.patch
@@ -0,0 +1,175 @@
+diff --git a/llvm-project/compiler-rt/cmake/Modules/AddCompilerRT.cmake b/llvm-project/compiler-rt/cmake/Modules/AddCompilerRT.cmake
+index 00bb892be..af4677fdc 100644
+--- a/llvm-project/compiler-rt/cmake/Modules/AddCompilerRT.cmake
++++ b/llvm-project/compiler-rt/cmake/Modules/AddCompilerRT.cmake
+@@ -355,9 +355,9 @@ function(add_compiler_rt_runtime name type)
+           DEPENDS ${sources_${libname}}
+           COMMENT "Building C object ${output_file_${libname}}")
+       add_custom_target(${libname} DEPENDS ${output_dir_${libname}}/${output_file_${libname}})
+-      install(FILES ${output_dir_${libname}}/${output_file_${libname}}
+-        DESTINATION ${install_dir_${libname}}
+-        ${COMPONENT_OPTION})
++      #install(FILES ${output_dir_${libname}}/${output_file_${libname}}
++      #  DESTINATION ${install_dir_${libname}}
++      #  ${COMPONENT_OPTION})
+     else()
+       add_library(${libname} ${type} ${sources_${libname}})
+       set_target_compile_flags(${libname} ${extra_cflags_${libname}})
+@@ -365,13 +365,13 @@ function(add_compiler_rt_runtime name type)
+       set_property(TARGET ${libname} APPEND PROPERTY
+                    COMPILE_DEFINITIONS ${LIB_DEFS})
+       set_target_output_directories(${libname} ${output_dir_${libname}})
+-      install(TARGETS ${libname}
+-        ARCHIVE DESTINATION ${install_dir_${libname}}
+-                ${COMPONENT_OPTION}
+-        LIBRARY DESTINATION ${install_dir_${libname}}
+-                ${COMPONENT_OPTION}
+-        RUNTIME DESTINATION ${install_dir_${libname}}
+-                ${COMPONENT_OPTION})
++      #      install(TARGETS ${libname}
++      #        ARCHIVE DESTINATION ${install_dir_${libname}}
++      #                ${COMPONENT_OPTION}
++      #        LIBRARY DESTINATION ${install_dir_${libname}}
++      #                ${COMPONENT_OPTION}
++      #        RUNTIME DESTINATION ${install_dir_${libname}}
++      #                ${COMPONENT_OPTION})
+     endif()
+     if(LIB_DEPS)
+       add_dependencies(${libname} ${LIB_DEPS})
+@@ -557,10 +557,10 @@ macro(add_compiler_rt_resource_file target_name file_name component)
+     COMMENT "Copying ${file_name}...")
+   add_custom_target(${target_name} DEPENDS ${dst_file})
+   # Install in Clang resource directory.
+-  install(FILES ${file_name}
+-    DESTINATION ${COMPILER_RT_INSTALL_DATA_DIR}
+-    COMPONENT ${component})
+-  add_dependencies(${component} ${target_name})
++  #install(FILES ${file_name}
++  #  DESTINATION ${COMPILER_RT_INSTALL_DATA_DIR}
++  #  COMPONENT ${component})
++  #add_dependencies(${component} ${target_name})
+ 
+   set_target_properties(${target_name} PROPERTIES FOLDER "Compiler-RT Misc")
+ endmacro()
+diff --git a/llvm-project/libc/loader/linux/CMakeLists.txt b/llvm-project/libc/loader/linux/CMakeLists.txt
+index 92ff8965b..e2aa73465 100644
+--- a/llvm-project/libc/loader/linux/CMakeLists.txt
++++ b/llvm-project/libc/loader/linux/CMakeLists.txt
+@@ -90,7 +90,7 @@ foreach(target IN LISTS startup_components)
+   set(fq_target_name libc.loader.linux.${target})
+   add_dependencies(libc-startup ${fq_target_name})
+   get_target_property(loader_object ${fq_target_name} LOADER_OBJECT)
+-  install(FILES ${loader_object}
+-          DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-          COMPONENT ${LIBC_COMPONENT})
++  #install(FILES ${loader_object}
++  #        DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  #        COMPONENT ${LIBC_COMPONENT})
+ endforeach()
+diff --git a/llvm-project/libcxx/src/CMakeLists.txt b/llvm-project/libcxx/src/CMakeLists.txt
+index 9abf548ab..2170d4391 100644
+--- a/llvm-project/libcxx/src/CMakeLists.txt
++++ b/llvm-project/libcxx/src/CMakeLists.txt
+@@ -366,32 +366,32 @@ if (LIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY)
+ endif()
+ 
+ if (LIBCXX_INSTALL_SHARED_LIBRARY)
+-  install(TARGETS cxx_shared
+-    ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
+-    LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
+-    RUNTIME DESTINATION ${LIBCXX_INSTALL_RUNTIME_DIR} COMPONENT cxx)
++	#install(TARGETS cxx_shared
++	# ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
++	#    LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
++	#    RUNTIME DESTINATION ${LIBCXX_INSTALL_RUNTIME_DIR} COMPONENT cxx)
+ endif()
+ 
+ if (LIBCXX_INSTALL_STATIC_LIBRARY)
+-  install(TARGETS cxx_static
+-    ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
+-    LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
+-    RUNTIME DESTINATION ${LIBCXX_INSTALL_RUNTIME_DIR} COMPONENT cxx)
++	#  install(TARGETS cxx_static
++	#    ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
++	#    LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
++	#    RUNTIME DESTINATION ${LIBCXX_INSTALL_RUNTIME_DIR} COMPONENT cxx)
+ endif()
+ 
+ if (LIBCXX_INSTALL_LIBRARY)
+-  install(TARGETS cxx_experimental
+-    LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
+-    ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
+-    RUNTIME DESTINATION ${LIBCXX_INSTALL_RUNTIME_DIR} COMPONENT cxx)
++	#  install(TARGETS cxx_experimental
++	#    LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
++	#    ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
++	#    RUNTIME DESTINATION ${LIBCXX_INSTALL_RUNTIME_DIR} COMPONENT cxx)
+ endif()
+ 
+ # NOTE: This install command must go after the cxx install command otherwise
+ # it will not be executed after the library symlinks are installed.
+ if (LIBCXX_ENABLE_SHARED AND LIBCXX_ENABLE_ABI_LINKER_SCRIPT)
+-  install(FILES "$<TARGET_LINKER_FILE:cxx_shared>"
+-    DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR}
+-    COMPONENT libcxx)
++	#  install(FILES "$<TARGET_LINKER_FILE:cxx_shared>"
++	#    DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR}
++	#    COMPONENT libcxx)
+ endif()
+ 
+ if (NOT CMAKE_CONFIGURATION_TYPES)
+diff --git a/llvm-project/llvm/tools/lto/CMakeLists.txt b/llvm-project/llvm/tools/lto/CMakeLists.txt
+index 67f6d3af4..51aa827a4 100644
+--- a/llvm-project/llvm/tools/lto/CMakeLists.txt
++++ b/llvm-project/llvm/tools/lto/CMakeLists.txt
+@@ -32,9 +32,9 @@ endif()
+ add_llvm_library(${LTO_LIBRARY_NAME} ${LTO_LIBRARY_TYPE} INSTALL_WITH_TOOLCHAIN
+     ${SOURCES} DEPENDS intrinsics_gen)
+ 
+-install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h
+-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/llvm-c"
+-  COMPONENT LTO)
++#install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h
++#  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/llvm-c"
++#  COMPONENT LTO)
+ 
+ if (APPLE)
+   set(LTO_VERSION ${LLVM_VERSION_MAJOR})
+diff --git a/llvm-project/llvm/tools/opt-viewer/CMakeLists.txt b/llvm-project/llvm/tools/opt-viewer/CMakeLists.txt
+index c0070f8cb..afe9756e0 100644
+--- a/llvm-project/llvm/tools/opt-viewer/CMakeLists.txt
++++ b/llvm-project/llvm/tools/opt-viewer/CMakeLists.txt
+@@ -6,11 +6,11 @@ set (files
+   "optrecord.py"
+   "style.css")
+ 
+-foreach (file ${files})
+-  install(PROGRAMS ${file}
+-    DESTINATION "${CMAKE_INSTALL_DATADIR}/opt-viewer"
+-    COMPONENT opt-viewer)
+-endforeach (file)
++#foreach (file ${files})
++	#  install(PROGRAMS ${file}
++	#    DESTINATION "${CMAKE_INSTALL_DATADIR}/opt-viewer"
++    #    COMPONENT opt-viewer)
++    #endforeach (file)
+ 
+ add_custom_target(opt-viewer DEPENDS ${files})
+ if(NOT LLVM_ENABLE_IDE)
+diff --git a/llvm-project/llvm/tools/remarks-shlib/CMakeLists.txt b/llvm-project/llvm/tools/remarks-shlib/CMakeLists.txt
+index f22cedd9e..13ec0103d 100644
+--- a/llvm-project/llvm/tools/remarks-shlib/CMakeLists.txt
++++ b/llvm-project/llvm/tools/remarks-shlib/CMakeLists.txt
+@@ -18,9 +18,9 @@ if(LLVM_ENABLE_PIC)
+     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -INCLUDE:malloc")
+   endif()
+   
+-  install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/Remarks.h
+-    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/llvm-c"
+-    COMPONENT Remarks)
++  #  install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/Remarks.h
++  #  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/llvm-c"
++  #  COMPONENT Remarks)
+ 
+   if (APPLE)
+     set(REMARKS_VERSION ${LLVM_VERSION_MAJOR})

diff --git a/media-libs/amdvlk/files/amdvlk-2022.4.2-reduced-llvm-installations.patch b/media-libs/amdvlk/files/amdvlk-2022.4.2-reduced-llvm-installations.patch
new file mode 100644
index 000000000..0bbd4d95e
--- /dev/null
+++ b/media-libs/amdvlk/files/amdvlk-2022.4.2-reduced-llvm-installations.patch
@@ -0,0 +1,309 @@
+diff --git a/llvm-project/compiler-rt/include/CMakeLists.txt b/llvm-project/compiler-rt/include/CMakeLists.txt
+index 5968cfd0e..b19de088b 100644
+--- a/llvm-project/compiler-rt/include/CMakeLists.txt
++++ b/llvm-project/compiler-rt/include/CMakeLists.txt
+@@ -74,30 +74,30 @@ add_dependencies(compiler-rt compiler-rt-headers)
+ set_target_properties(compiler-rt-headers PROPERTIES FOLDER "Compiler-RT Misc")
+ 
+ # Install sanitizer headers.
+-install(FILES ${SANITIZER_HEADERS}
+-  COMPONENT compiler-rt-headers
+-  PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+-  DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/sanitizer)
++#install(FILES ${SANITIZER_HEADERS}
++#  COMPONENT compiler-rt-headers
++#  PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
++#  DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/sanitizer)
+ # Install fuzzer headers.
+-install(FILES ${FUZZER_HEADERS}
+-  COMPONENT compiler-rt-headers
+-  PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+-  DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/fuzzer)
++#install(FILES ${FUZZER_HEADERS}
++#  COMPONENT compiler-rt-headers
++#  PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
++#  DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/fuzzer)
+ # Install xray headers.
+-install(FILES ${XRAY_HEADERS}
+-  COMPONENT compiler-rt-headers
+-  PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+-  DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/xray)
++#install(FILES ${XRAY_HEADERS}
++#  COMPONENT compiler-rt-headers
++#  PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
++#  DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/xray)
+ # Install ORC headers.
+-install(FILES ${ORC_HEADERS}
+-  COMPONENT compiler-rt-headers
+-  PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+-  DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/orc)
++#install(FILES ${ORC_HEADERS}
++#  COMPONENT compiler-rt-headers
++#  PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
++#  DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/orc)
+ # Install profile headers.
+-install(FILES ${PROFILE_HEADERS}
+-  COMPONENT compiler-rt-headers
+-  PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+-  DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/profile)
++#install(FILES ${PROFILE_HEADERS}
++#  COMPONENT compiler-rt-headers
++#  PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
++#  DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/profile)
+ 
+ if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDEs.
+   add_custom_target(install-compiler-rt-headers
+diff --git a/llvm-project/libclc/CMakeLists.txt b/llvm-project/libclc/CMakeLists.txt
+index 96519e09e..4d971d617 100644
+--- a/llvm-project/libclc/CMakeLists.txt
++++ b/llvm-project/libclc/CMakeLists.txt
+@@ -186,16 +186,16 @@ endif()
+ 
+ # pkg-config file
+ configure_file( libclc.pc.in libclc.pc @ONLY )
+-install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libclc.pc DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig" )
+-install( DIRECTORY generic/include/clc DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" )
++#install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libclc.pc DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig" )
++#install( DIRECTORY generic/include/clc DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" )
+ 
+ if( ENABLE_RUNTIME_SUBNORMAL )
+ 	add_library( subnormal_use_default STATIC
+ 		generic/lib/subnormal_use_default.ll )
+ 	add_library( subnormal_disable STATIC
+ 		generic/lib/subnormal_disable.ll )
+-	install( TARGETS subnormal_use_default subnormal_disable ARCHIVE
+-		DESTINATION "${CMAKE_INSTALL_DATADIR}/clc" )
++	#	install( TARGETS subnormal_use_default subnormal_disable ARCHIVE
++	#		DESTINATION "${CMAKE_INSTALL_DATADIR}/clc" )
+ endif()
+ 
+ find_package( Python3 REQUIRED COMPONENTS Interpreter )
+diff --git a/llvm-project/libcxxabi/include/CMakeLists.txt b/llvm-project/libcxxabi/include/CMakeLists.txt
+index 5b1cc2545..587549494 100644
+--- a/llvm-project/libcxxabi/include/CMakeLists.txt
++++ b/llvm-project/libcxxabi/include/CMakeLists.txt
+@@ -22,11 +22,11 @@ target_include_directories(cxxabi-headers INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}
+ if (LIBCXXABI_INSTALL_HEADERS)
+   foreach(file ${files})
+     get_filename_component(dir ${file} DIRECTORY)
+-    install(FILES ${file}
+-      DESTINATION ${LIBCXXABI_INSTALL_INCLUDE_DIR}/${dir}
+-      COMPONENT cxxabi-headers
+-      PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+-    )
++    #    install(FILES ${file}
++    #  DESTINATION ${LIBCXXABI_INSTALL_INCLUDE_DIR}/${dir}
++    #  COMPONENT cxxabi-headers
++    #  PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
++    #)
+   endforeach()
+ 
+   add_custom_target(install-cxxabi-headers
+diff --git a/llvm-project/libunwind/include/CMakeLists.txt b/llvm-project/libunwind/include/CMakeLists.txt
+index adf1766c4..5ca04b1f0 100644
+--- a/llvm-project/libunwind/include/CMakeLists.txt
++++ b/llvm-project/libunwind/include/CMakeLists.txt
+@@ -13,11 +13,11 @@ target_include_directories(unwind-headers INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
+ if(LIBUNWIND_INSTALL_HEADERS)
+   foreach(file ${files})
+     get_filename_component(dir ${file} DIRECTORY)
+-    install(FILES ${file}
+-      DESTINATION "${LIBUNWIND_INSTALL_INCLUDE_DIR}/${dir}"
+-      COMPONENT unwind-headers
+-      PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+-    )
++    #install(FILES ${file}
++    #  DESTINATION "${LIBUNWIND_INSTALL_INCLUDE_DIR}/${dir}"
++    #  COMPONENT unwind-headers
++    #  PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
++    #)
+   endforeach()
+ 
+   if(NOT CMAKE_CONFIGURATION_TYPES)
+diff --git a/llvm-project/lld/cmake/modules/CMakeLists.txt b/llvm-project/lld/cmake/modules/CMakeLists.txt
+index 61e7a1fe2..71395e8bb 100644
+--- a/llvm-project/lld/cmake/modules/CMakeLists.txt
++++ b/llvm-project/lld/cmake/modules/CMakeLists.txt
+@@ -50,10 +50,10 @@ set(LLD_CONFIG_CMAKE_DIR)
+ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
+   install_distribution_exports(LLD)
+ 
+-  install(FILES
+-    ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/LLDConfig.cmake
+-    DESTINATION ${LLD_INSTALL_PACKAGE_DIR}
+-    COMPONENT lld-cmake-exports)
++  #install(FILES
++  #  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/LLDConfig.cmake
++  #  DESTINATION ${LLD_INSTALL_PACKAGE_DIR}
++  #  COMPONENT lld-cmake-exports)
+ 
+   if(NOT LLVM_ENABLE_IDE)
+     # Add a dummy target so this can be used with LLVM_DISTRIBUTION_COMPONENTS
+diff --git a/llvm-project/llvm-libgcc/lib/CMakeLists.txt b/llvm-project/llvm-libgcc/lib/CMakeLists.txt
+index d895a2155..fb1969249 100644
+--- a/llvm-project/llvm-libgcc/lib/CMakeLists.txt
++++ b/llvm-project/llvm-libgcc/lib/CMakeLists.txt
+@@ -45,10 +45,10 @@ target_link_libraries(libgcc_s PRIVATE
+ extend_path(LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT "${CMAKE_INSTALL_PREFIX}" "${LIBUNWIND_INSTALL_LIBRARY_DIR}")
+ #string(REPLACE "${CMAKE_INSTALL_FULL_LIBDIR}/" "" LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT "${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}")
+ 
+-install(TARGETS libgcc_s
+-        LIBRARY DESTINATION "${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}" COMPONENT unwind
+-        ARCHIVE DESTINATION "${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}" COMPONENT unwind
+-        RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT unwind)
++#install(TARGETS libgcc_s
++#        LIBRARY DESTINATION "${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}" COMPONENT unwind
++#        ARCHIVE DESTINATION "${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}" COMPONENT unwind
++#        RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT unwind)
+ 
+ get_compiler_rt_install_dir(${LLVM_LIBGCC_TARGET_ARCH} install_dir_builtins)
+ string(REGEX REPLACE "^lib/" "" install_dir_builtins "${install_dir_builtins}")
+@@ -58,29 +58,29 @@ if(install_path_contains_triple EQUAL -1)
+ else()
+   string(PREPEND install_dir_builtins "../")
+ endif()
+-install(CODE "execute_process(
+-                COMMAND \"\${CMAKE_COMMAND}\" -E
+-                create_symlink ${install_dir_builtins}/libclang_rt.builtins${builtins_suffix}.a libgcc.a
+-                WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")"
+-        COMPONENT unwind)
++#install(CODE "execute_process(
++#                COMMAND \"\${CMAKE_COMMAND}\" -E
++#                create_symlink ${install_dir_builtins}/libclang_rt.builtins${builtins_suffix}.a libgcc.a
++#                WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")"
++#        COMPONENT unwind)
+ 
+-install(CODE "execute_process(
+-                COMMAND \"\${CMAKE_COMMAND}\" -E
+-                create_symlink libunwind.a libgcc_eh.a
+-                WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")"
+-        COMPONENT unwind)
+-install(CODE "execute_process(
+-               COMMAND \"\${CMAKE_COMMAND}\" -E
+-               create_symlink libunwind.so libgcc_s.so.1.0
+-               WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")"
+-        COMPONENT unwind)
+-install(CODE "execute_process(
+-                COMMAND \"\${CMAKE_COMMAND}\" -E
+-                create_symlink libgcc_s.so.1.0 libgcc_s.so.1
+-                WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")"
+-        COMPONENT unwind)
+-install(CODE "execute_process(
+-                COMMAND \"\${CMAKE_COMMAND}\" -E
+-                create_symlink libgcc_s.so.1 libgcc_s.so
+-                WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")"
+-        COMPONENT unwind)
++#install(CODE "execute_process(
++#                COMMAND \"\${CMAKE_COMMAND}\" -E
++#                create_symlink libunwind.a libgcc_eh.a
++#                WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")"
++#        COMPONENT unwind)
++#install(CODE "execute_process(
++#               COMMAND \"\${CMAKE_COMMAND}\" -E
++#               create_symlink libunwind.so libgcc_s.so.1.0
++#               WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")"
++#        COMPONENT unwind)
++#install(CODE "execute_process(
++#                COMMAND \"\${CMAKE_COMMAND}\" -E
++#                create_symlink libgcc_s.so.1.0 libgcc_s.so.1
++#                WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")"
++#        COMPONENT unwind)
++#install(CODE "execute_process(
++#                COMMAND \"\${CMAKE_COMMAND}\" -E
++#                create_symlink libgcc_s.so.1 libgcc_s.so
++#               WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")"
++#        COMPONENT unwind)
+diff --git a/llvm-project/llvm/CMakeLists.txt b/llvm-project/llvm/CMakeLists.txt
+index c60e34efa..123704685 100644
+--- a/llvm-project/llvm/CMakeLists.txt
++++ b/llvm-project/llvm/CMakeLists.txt
+@@ -999,8 +999,8 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "")
+   include_directories(${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/tensorflow/include)
+   add_subdirectory(${TENSORFLOW_AOT_PATH}/xla_aot_runtime_src
+     ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/tf_runtime)
+-  install(TARGETS tf_xla_runtime EXPORT LLVMExports
+-    ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime)
++  #install(TARGETS tf_xla_runtime EXPORT LLVMExports
++  #  ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime)
+   set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS tf_xla_runtime)
+   # Once we add more modules, we should handle this more automatically.
+   if (DEFINED LLVM_OVERRIDE_MODEL_HEADER_INLINERSIZEMODEL)
+@@ -1247,44 +1247,44 @@ if (LLVM_INCLUDE_UTILS)
+ endif()
+ 
+ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
+-  install(DIRECTORY include/llvm include/llvm-c
+-    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+-    COMPONENT llvm-headers
+-    FILES_MATCHING
+-    PATTERN "*.def"
+-    PATTERN "*.h"
+-    PATTERN "*.td"
+-    PATTERN "*.inc"
+-    PATTERN "LICENSE.TXT"
+-    )
+-
+-  install(DIRECTORY ${LLVM_INCLUDE_DIR}/llvm ${LLVM_INCLUDE_DIR}/llvm-c
+-    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+-    COMPONENT llvm-headers
+-    FILES_MATCHING
+-    PATTERN "*.def"
+-    PATTERN "*.h"
+-    PATTERN "*.gen"
+-    PATTERN "*.inc"
++	#install(DIRECTORY include/llvm include/llvm-c
++	#    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
++	#    COMPONENT llvm-headers
++	#    FILES_MATCHING
++	#    PATTERN "*.def"
++	#    PATTERN "*.h"
++	#    PATTERN "*.td"
++	#    PATTERN "*.inc"
++	#    PATTERN "LICENSE.TXT"
++	#    )
++
++	#  install(DIRECTORY ${LLVM_INCLUDE_DIR}/llvm ${LLVM_INCLUDE_DIR}/llvm-c
++	#    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
++	#    COMPONENT llvm-headers
++	#    FILES_MATCHING
++	#    PATTERN "*.def"
++	#    PATTERN "*.h"
++	#    PATTERN "*.gen"
++	#    PATTERN "*.inc"
+     # Exclude include/llvm/CMakeFiles/intrinsics_gen.dir, matched by "*.def"
+-    PATTERN "CMakeFiles" EXCLUDE
+-    PATTERN "config.h" EXCLUDE
+-    )
++    #    PATTERN "CMakeFiles" EXCLUDE
++    #    PATTERN "config.h" EXCLUDE
++    #    )
+ 
+   if (LLVM_INSTALL_MODULEMAPS)
+-    install(DIRECTORY include/llvm include/llvm-c
+-            DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+-            COMPONENT llvm-headers
+-            FILES_MATCHING
+-            PATTERN "module.modulemap"
+-            )
+-    install(FILES include/llvm/module.install.modulemap
+-            DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/llvm"
+-            COMPONENT llvm-headers
+-            RENAME "module.extern.modulemap"
+-            )
++	  #    install(DIRECTORY include/llvm include/llvm-c
++	  #            DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
++	  #            COMPONENT llvm-headers
++	  #            FILES_MATCHING
++	  #            PATTERN "module.modulemap"
++	  #            )
++	  #    install(FILES include/llvm/module.install.modulemap
++	  #            DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/llvm"
++	  #            COMPONENT llvm-headers
++	  #            RENAME "module.extern.modulemap"
++	  #         
+   endif(LLVM_INSTALL_MODULEMAPS)
+-
++	  #
+   # Installing the headers needs to depend on generating any public
+   # tablegen'd headers.
+   add_custom_target(llvm-headers DEPENDS intrinsics_gen omp_gen)


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

* [gentoo-commits] repo/proj/guru:dev commit in: media-libs/amdvlk/files/, media-libs/amdvlk/
@ 2024-01-16 22:16 YOSHIOKA Takuma
  0 siblings, 0 replies; 5+ messages in thread
From: YOSHIOKA Takuma @ 2024-01-16 22:16 UTC (permalink / raw
  To: gentoo-commits

commit:     9b26cbf2aa72f49ebfd3a4d0e30f77ad535b4e8d
Author:     YOSHIOKA Takuma <lo48576 <AT> hard-wi <DOT> red>
AuthorDate: Tue Jan 16 22:15:41 2024 +0000
Commit:     YOSHIOKA Takuma <lo48576 <AT> hard-wi <DOT> red>
CommitDate: Tue Jan 16 22:15:41 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9b26cbf2

media-libs/amdvlk: fix compilation for gcc-13

Closes: https://bugs.gentoo.org/905174
Signed-off-by: YOSHIOKA Takuma <lo48576 <AT> hard-wi.red>

 media-libs/amdvlk/amdvlk-2023.1.2.ebuild                    |  1 +
 media-libs/amdvlk/files/amdvlk-2023.1.2-gcc13-cstdint.patch | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/media-libs/amdvlk/amdvlk-2023.1.2.ebuild b/media-libs/amdvlk/amdvlk-2023.1.2.ebuild
index 9694ac2bfe..5ae8851868 100644
--- a/media-libs/amdvlk/amdvlk-2023.1.2.ebuild
+++ b/media-libs/amdvlk/amdvlk-2023.1.2.ebuild
@@ -73,6 +73,7 @@ PATCHES=(
 	"${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(){

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
new file mode 100644
index 0000000000..2bfc7d299f
--- /dev/null
+++ b/media-libs/amdvlk/files/amdvlk-2023.1.2-gcc13-cstdint.patch
@@ -0,0 +1,11 @@
+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/files/, media-libs/amdvlk/
@ 2024-08-13 19:52 David Roman
  0 siblings, 0 replies; 5+ messages in thread
From: David Roman @ 2024-08-13 19:52 UTC (permalink / raw
  To: gentoo-commits

commit:     5ab730bea13f3bc7c0a2b78de047ab2e7931ec8e
Author:     Username404-59 <w.iron.zombie <AT> gmail <DOT> com>
AuthorDate: Tue Aug 13 18:57:11 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=5ab730be

media-libs/amdvlk: add 2024.3.1

Signed-off-by: Username404-59 <w.iron.zombie <AT> gmail.com>
Closes: https://github.com/gentoo/guru/pull/230
Signed-off-by: David Roman <davidroman96 <AT> gmail.com>

 media-libs/amdvlk/Manifest                         |   8 ++
 media-libs/amdvlk/amdvlk-2024.3.1.ebuild           | 148 +++++++++++++++++++++
 .../files/amdvlk-2024.3.1-disable-Werror.patch     |  13 ++
 3 files changed, 169 insertions(+)

diff --git a/media-libs/amdvlk/Manifest b/media-libs/amdvlk/Manifest
index e69de29bb..031d3acbe 100644
--- a/media-libs/amdvlk/Manifest
+++ b/media-libs/amdvlk/Manifest
@@ -0,0 +1,8 @@
+DIST amdvlk-CWPack-4f8cf0584442a91d829d269158567d7ed926f026.tar.gz 39633 BLAKE2B d5b2a88f0d563eef5beb42a8304cf6cdd825e75242c22acc360c5bb9cbd1d02a4f891b6b2f3a4803e1e6b48a4d176aad40f8bdeca92847f2fbf53674dedeaff3 SHA512 06d56baaba1f1224a5266f4a63c1abf70edba7cc16cc4e62f2f5b1ec94fc2c1cfc4c6f11a9c6ef42c23b29be8d07921caad5e919357c0bd82cf714783eee0bcc
+DIST amdvlk-LLVM-dialects-6ff7d39046e280e446fd69aa08c6c6524c68c728.tar.gz 106772 BLAKE2B f00991a1d984bdca1b15ef803d0cf5b75a299c294a0e6ea9bd656ad669426f055cace518950833b35a17c18faafd0318a80f18f5b8e7b3c7fa27f4bec0d65239 SHA512 64e5dbb60fd0d863a58e39dc214c6393a1393cac7aa89ac95c4c285c4daed5f8d40069462081dbcf84043a6478cc471ee9d6e7b74215ba5199a60a2e338f508a
+DIST amdvlk-MetroHash-18893fb28601bb9af1154cd1a671a121fff6d8d3.tar.gz 11729 BLAKE2B b0e3de885e50c317141d62c885b421c7fd2e1ac783733704342bbed3109bff36a9209ab276f534a2231531483539221bbb1014bd39528a91124161bafc5646eb SHA512 8f12f95e80d594c8bd87a852c67a2d6777ce89d1a13e1a87ee17bbb876a0702c14ffe7a7fd65a244620f2043ad5d22ae8eb863d69f1dc5494d985733bbfb7bf9
+DIST amdvlk-gpurt-c5b10793bd96432609de2d5945a03ed54b7ebbe8.tar.gz 347915 BLAKE2B 16f770105ac58127eb7da4bc19f55d4e4119190f0be9d39e93d225bffb0a66883d3c06e0cda5b32afad2a218ea09941603a0eba2448bd61f7afda11f065ea069 SHA512 35806ebfc30b7e57ff3a6defeb87e6b049329ea02765264bb7e77ea84f53965b20593570b402730390a23c3284543a180c64dac40139dbcc0ceadf0dac7e2cb2
+DIST amdvlk-llpc-5278a3ff4f184ac76060892671c88d539be084c8.tar.gz 2768765 BLAKE2B 376618d3d63aaf5cd7fa8c2c37e667e9f1add40d3019c6c5cf6ef9e997eea665300bff1d7b665c44808bd1b0abc5735adf8f7ed4be902ed675d003718b0644ed SHA512 3165a854b28df064bf98289eb71f2deb5be5b8dafb22691983d4b085916a3349776445db3b39c3fd89bcea2e19a04d515fa372b25b8d5af60a27f81f70a85ef1
+DIST amdvlk-llvm-project-eb619c26c273559f0512aea704a4b0821c80b318.tar.gz 216601046 BLAKE2B 0b328679c71759a653e6ffd91d7ba0813053d6e5e7339256a735195ccef71a78b71342f5ffe75d9545845bfe368dfb35bc4fc72d56db4500edab9b389ffb6284 SHA512 48b46afeba7d1a020ddc72f559c29ffbfedb291df612ecb16bf237a4e3f1ddd055cb2802e9ee0dff727b71c70138c64645d2fe00b6d01db462bd6ea20b2a055e
+DIST amdvlk-pal-d3bfe509cd335b06d1276a5bb3ceb8dce622ca34.tar.gz 9245270 BLAKE2B 9bd315742e8b12e2f88e5046e30a95e31c313a3f2752bcfc76e88153289949994c426a59155eda1ed6342bbd67aeb4f6a24caa1177e5a2c77122ae5a4f97134e SHA512 19daf28a2702681df9470d95106125359382c97c049216f6e7801204638c29b6353ca330e6c76b3f02137da2d4b6f0ff3bb34b8fa3b1e93f1d62f175f58cfe00
+DIST amdvlk-xgl-8bf20dd1ca8b6b773ff0a773c09a845a9be42a96.tar.gz 1350996 BLAKE2B 1521504663a8976371398f91869d14515855a0a1cd1851d4e80ef1d94bd2aa6f4f163ce17e3f6ecc1df727985ca17bc4f2ddc468424c985c640ee3baaedc5c2f SHA512 e91ed1eb5b2d97e99ebebbead7859dd9380c405be3256ce4ed3365c7e4d468fef6749d6cc8221870994f8259955c2d74a6f708458aaf7e819d6da5b8364fd208

diff --git a/media-libs/amdvlk/amdvlk-2024.3.1.ebuild b/media-libs/amdvlk/amdvlk-2024.3.1.ebuild
new file mode 100644
index 000000000..bf94c3878
--- /dev/null
+++ b/media-libs/amdvlk/amdvlk-2024.3.1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2024 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="8bf20dd1ca8b6b773ff0a773c09a845a9be42a96"
+PAL_COMMIT="d3bfe509cd335b06d1276a5bb3ceb8dce622ca34"
+LLPC_COMMIT="5278a3ff4f184ac76060892671c88d539be084c8"
+GPURT_COMMIT="c5b10793bd96432609de2d5945a03ed54b7ebbe8"
+LLVM_PROJECT_COMMIT="eb619c26c273559f0512aea704a4b0821c80b318"
+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="6ff7d39046e280e446fd69aa08c6c6524c68c728"
+### 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"
+
+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.283
+	raytracing? ( dev-util/DirectXShaderCompiler )
+	dev-util/glslang[${MULTILIB_USEDEP}]"
+BDEPEND="${BUNDLED_LLVM_DEPEND}
+	${PYTHON_DEPS}
+	dev-python/ruamel-yaml
+	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.283[${MULTILIB_USEDEP}]
+	dev-util/glslang[${MULTILIB_USEDEP}]
+	dev-libs/openssl[${MULTILIB_USEDEP}]" #890449
+
+CHECKREQS_MEMORY="7G"
+CHECKREQS_DISK_BUILD="4G"
+S="${WORKDIR}"
+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-2024.3.1-disable-Werror.patch"
+)
+
+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-2024.3.1-disable-Werror.patch b/media-libs/amdvlk/files/amdvlk-2024.3.1-disable-Werror.patch
new file mode 100644
index 000000000..8a9894b34
--- /dev/null
+++ b/media-libs/amdvlk/files/amdvlk-2024.3.1-disable-Werror.patch
@@ -0,0 +1,13 @@
+diff --git a/pal/shared/devdriver/cmake/DevDriver.cmake b/pal/shared/devdriver/cmake/DevDriver.cmake
+index 74e966da..64157700 100644
+--- a/pal/shared/devdriver/cmake/DevDriver.cmake
++++ b/pal/shared/devdriver/cmake/DevDriver.cmake
+@@ -93,7 +93,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 # Treat warnings as errors
++        #-Werror # Treat warnings as errors
+         )
+     elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+         target_compile_options(${name} PRIVATE


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

end of thread, other threads:[~2024-08-13 19:52 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-16 22:16 [gentoo-commits] repo/proj/guru:dev commit in: media-libs/amdvlk/files/, media-libs/amdvlk/ YOSHIOKA Takuma
  -- strict thread matches above, loose matches on Subject: below --
2024-08-13 19:52 David Roman
2022-11-16 17:03 Denis Reva
2022-10-27  9:24 Denis Reva
2022-10-12  8:44 Denis Reva

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