public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:master commit in: media-libs/amdvlk/, media-libs/amdvlk/files/
@ 2022-10-17 11:26 Haelwenn Monnier
  0 siblings, 0 replies; 4+ messages in thread
From: Haelwenn Monnier @ 2022-10-17 11:26 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:     Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
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] 4+ 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
  2024-08-13 19:56 ` [gentoo-commits] repo/proj/guru:master commit in: media-libs/amdvlk/, media-libs/amdvlk/files/ David Roman
  0 siblings, 1 reply; 4+ 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] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: media-libs/amdvlk/files/, media-libs/amdvlk/
@ 2024-10-12 19:08 David Roman
  2024-10-13  0:09 ` [gentoo-commits] repo/proj/guru:master commit in: media-libs/amdvlk/, media-libs/amdvlk/files/ David Roman
  0 siblings, 1 reply; 4+ messages in thread
From: David Roman @ 2024-10-12 19:08 UTC (permalink / raw
  To: gentoo-commits

commit:     472c7020a538f7a335076db01f60861eec4aae68
Author:     Username404-59 <w.iron.zombie <AT> gmail <DOT> com>
AuthorDate: Fri Oct 11 19:25:38 2024 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Sat Oct 12 19:07:56 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=472c7020

media-libs/amdvlk: add patch to fix possible build failure

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

 media-libs/amdvlk/amdvlk-2024.3.3.ebuild                |  1 +
 media-libs/amdvlk/files/amdvlk-2024.3.3-fix-build.patch | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/media-libs/amdvlk/amdvlk-2024.3.3.ebuild b/media-libs/amdvlk/amdvlk-2024.3.3.ebuild
index e36d4bb20..7d5fc13e0 100644
--- a/media-libs/amdvlk/amdvlk-2024.3.3.ebuild
+++ b/media-libs/amdvlk/amdvlk-2024.3.3.ebuild
@@ -77,6 +77,7 @@ PATCHES=(
 	#"${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-2024.3.3-fix-build.patch b/media-libs/amdvlk/files/amdvlk-2024.3.3-fix-build.patch
new file mode 100644
index 000000000..9aa3b4d5c
--- /dev/null
+++ b/media-libs/amdvlk/files/amdvlk-2024.3.3-fix-build.patch
@@ -0,0 +1,13 @@
+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++)


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: media-libs/amdvlk/, media-libs/amdvlk/files/
@ 2024-12-05 12:00 Florian Schmaus
  0 siblings, 0 replies; 4+ messages in thread
From: Florian Schmaus @ 2024-12-05 12:00 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:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Dec  5 08:09:59 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=20364713

media-libs/amdvlk: updated from: https://github.com/gentoo/guru/pull/256

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

 media-libs/amdvlk/Manifest                          | 12 ++++++------
 ...mdvlk-2024.3.3.ebuild => amdvlk-2024.4.2.ebuild} | 21 ++++++++++-----------
 .../amdvlk/files/amdvlk-2022.4.2-license-path.patch | 13 -------------
 .../amdvlk/files/amdvlk-2024.3.3-fix-build.patch    | 13 -------------
 .../amdvlk/files/amdvlk-2024.4.1-license-path.patch | 13 +++++++++++++
 .../files/amdvlk-2024.4.1-missing-header.patch      | 12 ++++++++++++
 6 files changed, 41 insertions(+), 43 deletions(-)

diff --git a/media-libs/amdvlk/Manifest b/media-libs/amdvlk/Manifest
index 000ec0fa7..9e32e386d 100644
--- a/media-libs/amdvlk/Manifest
+++ b/media-libs/amdvlk/Manifest
@@ -1,8 +1,8 @@
 DIST amdvlk-CWPack-4f8cf0584442a91d829d269158567d7ed926f026.tar.gz 39633 BLAKE2B d5b2a88f0d563eef5beb42a8304cf6cdd825e75242c22acc360c5bb9cbd1d02a4f891b6b2f3a4803e1e6b48a4d176aad40f8bdeca92847f2fbf53674dedeaff3 SHA512 06d56baaba1f1224a5266f4a63c1abf70edba7cc16cc4e62f2f5b1ec94fc2c1cfc4c6f11a9c6ef42c23b29be8d07921caad5e919357c0bd82cf714783eee0bcc
-DIST amdvlk-LLVM-dialects-bdfb113d8d765bdf4554a2b30ae909b93f26aeea.tar.gz 106775 BLAKE2B 0fe96213e62ac0e90b7c4a62a43909bdc6f047901f5b338773739146fe56cef86d92e3af90ae1188358f3af836f5c09566ea61cfd634eafe46ae5c2c07d4623f SHA512 d5eda9ade2d94cc2ff8ddda546cbb0b5992aa8138eda27dca31c706af42e99bcdda85527ca768a421b06328e879a2ef3ceaeb89611caf38c85043da79d2a99d4
+DIST amdvlk-LLVM-dialects-50e4ca3a5c365b0bde36b122cc34256406723049.tar.gz 106566 BLAKE2B 1b9231db33f8ec8e21d62b050b927ac8f1fc852e67785c615cd35c95b78a6fdce0bea3fc6283a80f63af747d607704baf3dffb745e065b6ff9c1a39c2e067393 SHA512 0c5bbaa71bb4183cb7ed8af6466f62c1dbea0f8c2bad9c0f082438e0db85cb9c5119321d9ffa920aa6484dbb55f623d6aa6d614ebb8f6daf7ca5aed2dc3726ad
 DIST amdvlk-MetroHash-18893fb28601bb9af1154cd1a671a121fff6d8d3.tar.gz 11729 BLAKE2B b0e3de885e50c317141d62c885b421c7fd2e1ac783733704342bbed3109bff36a9209ab276f534a2231531483539221bbb1014bd39528a91124161bafc5646eb SHA512 8f12f95e80d594c8bd87a852c67a2d6777ce89d1a13e1a87ee17bbb876a0702c14ffe7a7fd65a244620f2043ad5d22ae8eb863d69f1dc5494d985733bbfb7bf9
-DIST amdvlk-gpurt-95c27c4031b112daaa231b76dee07f7ff05357d0.tar.gz 351839 BLAKE2B b2e4c4cdb4f2532cf22316ceb8cb6a949a2128bd1fd0276bf515793291bc63a84e0d0205fb195259f87eaf036dd0323e9d6a931b95d21bd66bc09f3c81654cd4 SHA512 f698157c7cfdbc25524230a949cef4c8b3d682825c6efe3f68b93d5b8c48b66f1c27826adb9e2d7b6670e5bea16eeec3e085dfecb39d29a37a2198c8b46ab74c
-DIST amdvlk-llpc-872ddfdeecfd1e56ddbc0db2012b96788129fee9.tar.gz 2860471 BLAKE2B f2496e90238796dccd584d539bc210e14f68731fb92f74ba6353ad6464e4eec228cccfeca54d05effd4e2913ccf43ed640175cad71afa3b610546e16760b970d SHA512 d09072aa89a8a593f76e09d8c8d3166663ce8bcbb379793f96509f2248112541207cc5fb1fa0a2df1a40a7a35b51c28d382e77d83996e70d961b92e8338209da
-DIST amdvlk-llvm-project-8abfff872ebbb1f57ebe83149f8166fb5dd487dc.tar.gz 217893483 BLAKE2B 53a543629a2392b6cb496a4c0c852516e516c315c9e2742555e44b4998eef2d59455f3ac8f1cb206c857e819e5f17fcf20a5878d2224679aa1fa7695cf80826c SHA512 04f4bff33be025ff6ae9591312ea9aa9a5e600268ac25186e36b401f27333bf75a83d4c784e289325def995254d54bede9b02484cc3152cebbdf39a32dc31f2a
-DIST amdvlk-pal-31f6a70d0e9ee22894daab5305dd91b3ebb599a5.tar.gz 10376369 BLAKE2B d9f8e3c1e27cca738b08bd55e9e7c7b9fe139fafe60e4ff35f43f99b38e6100b92b47d826cc90be93cdc5eb68db03537e127e4cdd6d10073848fbc4a3d826aaf SHA512 bf420c9e4fc5454b84ddb9bdbe843ede4af77e79298fc7b2b3dc7bc5af8391f97d8c9e71487c9ed97219a554f103af65a1f9687f51843e27fcad95d1a1fee85e
-DIST amdvlk-xgl-c4ca1f6077c7fecc8df2ad2ed8719fb943b4e4b1.tar.gz 1365942 BLAKE2B 5b65a21e9a8181ddd78cdb8dabe9b7ba85961757f220bbdf844da0222ab2af14a01b8adac2eae1f4dd61be326b753cbc03c6f5433717d10d645fe9fa8e3a3f6a SHA512 832fbd90689196a8989e43f9cf696e2c8384e4bd48f0caa3869ff68830693683375a1ce4553043ab40e3fc097763955094f903a8580eac533735d32f102d099a
+DIST amdvlk-gpurt-aa5ba689e8c33b6d42d4261687988e6e0b13998c.tar.gz 355370 BLAKE2B 8d3bc83e2d585c74d59cb2d6b717f91bd071eba1bbd3a30fdb692e131962fe0fac4b58878a961332bf36adda70f9e94ce4210cf3543301202676a5e182c97728 SHA512 0b89a8d3c2326f8bba6482f62fe927d2d7229625ae62a182e65a8d91ec066f03c9f94949e844e8698180026049e2ee7356094efa09d25d4cda79f5009356add2
+DIST amdvlk-llpc-1d04cdcb4c3d4edc300d9a61969a87208d44dcc4.tar.gz 2765940 BLAKE2B 8a11fdb3020115d05ea4b0bf7e8ad6a7b5262e2000e5d9be23fbf3bdf18687bffe251216bb9201852e4e4e84d92affa8c8f63ca62c1d717cfe0bd27100a50ab6 SHA512 2ac1a529b5ca59e796ee7b46b134d3392195f0a247a09aa8b7b3e4ccee42cdb52ca095bbcbd1befc49c252bc599a924efb6fcf23065b12cdda0ec809b4f98ff9
+DIST amdvlk-llvm-project-07d4dd012428b5a8c563de7c51ef33ab09bae53b.tar.gz 222378703 BLAKE2B be2a0ea202ab68d0dba975a4d53b2fe69c71acfa4d34f7f595a5c4b762548d272e3f7b5ddc36f0acae626721ea80dfd01f4971adca3f03a2790a0d845520eda0 SHA512 8a807ea3850c67c4e4bbf7fd2a9fec6d7022e73af1d6c15df1dd9374ed67de319698c0c030a07b9ce43ef2ea0edcabd5618301066ac8cc2d82cd7d5f313d5811
+DIST amdvlk-pal-b6da370a9bc66d86820fd3034a16e5b59ed7ff86.tar.gz 9647818 BLAKE2B 1c191b013800efbf696334fd35a3ea6c1b279ca4587687c061f91a3c2a985cb39bef24939b33b56e78ba09a14cf583784ffada095ead6083d5d82d516a3bc82c SHA512 427c01b141e729aadd46ca99b9f1ab62ac931e4f6e39a7de7add25efa43dd9a6e99535a69b7810fe73ec00b1c93eda7684762dd3f0178ac0e8faf63472d04bb1
+DIST amdvlk-xgl-a367518e0bf308056492d994c5713e06af9429af.tar.gz 1386723 BLAKE2B 26878ea2eeb8c3e1df0bdffad724a1f8a480043961b6482c3fa8e92768547441a0c912835b341591fb25f2624f635bf21ab808d8179901d42176c5fe69f10cac SHA512 38edd836bf35c44eaf1ad6cbc73e56a775b4e4bf834813965cbd144490990226dc454bcea43eedc6cbc667eab8aef44b9c234e38a619db9c1a37780a925cb0b2

diff --git a/media-libs/amdvlk/amdvlk-2024.3.3.ebuild b/media-libs/amdvlk/amdvlk-2024.4.2.ebuild
old mode 100644
new mode 100755
similarity index 90%
rename from media-libs/amdvlk/amdvlk-2024.3.3.ebuild
rename to media-libs/amdvlk/amdvlk-2024.4.2.ebuild
index 7d5fc13e0..87ce22034
--- a/media-libs/amdvlk/amdvlk-2024.3.3.ebuild
+++ b/media-libs/amdvlk/amdvlk-2024.4.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit check-reqs python-any-r1 cmake-multilib
 
@@ -18,16 +18,16 @@ FETCH_URI="https://github.com/GPUOpen-Drivers"
 ## and place commits in the desired variables
 ## EXAMPLE: XGL_COMMIT="80e5a4b11ad2058097e77746772ddc9ab2118e07"
 ## SRC_URI="... ${FETCH_URI}/$PART/archive/$COMMIT.zip -> $PART-$COMMIT.zip ..."
-XGL_COMMIT="c4ca1f6077c7fecc8df2ad2ed8719fb943b4e4b1"
-PAL_COMMIT="31f6a70d0e9ee22894daab5305dd91b3ebb599a5"
-LLPC_COMMIT="872ddfdeecfd1e56ddbc0db2012b96788129fee9"
-GPURT_COMMIT="95c27c4031b112daaa231b76dee07f7ff05357d0"
-LLVM_PROJECT_COMMIT="8abfff872ebbb1f57ebe83149f8166fb5dd487dc"
+XGL_COMMIT="a367518e0bf308056492d994c5713e06af9429af"
+PAL_COMMIT="b6da370a9bc66d86820fd3034a16e5b59ed7ff86"
+LLPC_COMMIT="1d04cdcb4c3d4edc300d9a61969a87208d44dcc4"
+GPURT_COMMIT="aa5ba689e8c33b6d42d4261687988e6e0b13998c"
+LLVM_PROJECT_COMMIT="07d4dd012428b5a8c563de7c51ef33ab09bae53b"
 METROHASH_COMMIT="18893fb28601bb9af1154cd1a671a121fff6d8d3"
 CWPACK_COMMIT="4f8cf0584442a91d829d269158567d7ed926f026"
 # Submodule of LLPC, also updates often. Grab commit version from
 # https://github.com/GPUOpen-Drivers/llpc/tree/${LLPC_COMMIT}/imported
-LLVM_DIALECTS_COMMIT="bdfb113d8d765bdf4554a2b30ae909b93f26aeea"
+LLVM_DIALECTS_COMMIT="50e4ca3a5c365b0bde36b122cc34256406723049"
 ### end of variables
 SRC_URI="${FETCH_URI}/xgl/archive/${XGL_COMMIT}.tar.gz -> amdvlk-xgl-${XGL_COMMIT}.tar.gz
 ${FETCH_URI}/pal/archive/${PAL_COMMIT}.tar.gz -> amdvlk-pal-${PAL_COMMIT}.tar.gz
@@ -49,7 +49,7 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
 BUNDLED_LLVM_DEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]"
 DEPEND="wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
 	${BUNDLED_LLVM_DEPEND}
-	>=dev-util/vulkan-headers-1.3.283
+	>=dev-util/vulkan-headers-1.3.296
 	raytracing? ( dev-util/DirectXShaderCompiler )
 	dev-util/glslang[${MULTILIB_USEDEP}]"
 BDEPEND="${BUNDLED_LLVM_DEPEND}
@@ -61,7 +61,7 @@ RDEPEND=" ${DEPEND}
 	x11-libs/libXrandr[${MULTILIB_USEDEP}]
 	x11-libs/libxcb[${MULTILIB_USEDEP}]
 	x11-libs/libxshmfence[${MULTILIB_USEDEP}]
-	>=media-libs/vulkan-loader-1.3.290[${MULTILIB_USEDEP}]
+	>=media-libs/vulkan-loader-1.3.296[${MULTILIB_USEDEP}]
 	dev-util/glslang[${MULTILIB_USEDEP}]
 	dev-libs/openssl[${MULTILIB_USEDEP}]" #890449
 
@@ -73,11 +73,10 @@ CMAKE_MAKEFILE_GENERATOR=ninja
 PATCHES=(
 	"${FILESDIR}/amdvlk-2022.3.5-no-compiler-presets.patch" #875821
 	"${FILESDIR}/amdvlk-2022.4.1-proper-libdir.patch"
-	"${FILESDIR}/amdvlk-2022.4.2-license-path.patch" #878803
+	"${FILESDIR}/amdvlk-2024.4.1-license-path.patch" #878803
 	#"${FILESDIR}/amdvlk-2022.4.2-reduced-llvm-installations.patch"
 	#"${FILESDIR}/amdvlk-2022.4.2-reduced-llvm-installations-part2.patch"
 	"${FILESDIR}/amdvlk-2024.3.1-disable-Werror.patch"
-	"${FILESDIR}/amdvlk-2024.3.3-fix-build.patch"
 )
 
 pkg_pretend(){

diff --git a/media-libs/amdvlk/files/amdvlk-2022.4.2-license-path.patch b/media-libs/amdvlk/files/amdvlk-2022.4.2-license-path.patch
deleted file mode 100644
index 9fd590190..000000000
--- a/media-libs/amdvlk/files/amdvlk-2022.4.2-license-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/xgl/cmake/XglPackaging.cmake b/xgl/cmake/XglPackaging.cmake
-index a3375293d..14d951b69 100644
---- a/xgl/cmake/XglPackaging.cmake
-+++ b/xgl/cmake/XglPackaging.cmake
-@@ -128,7 +128,7 @@ function(generateInstallTargets)
-   install(FILES ${CMAKE_BINARY_DIR}/icd/amd_icd${TARGET_ARCHITECTURE_BITS}.json COMPONENT icd DESTINATION /etc/vulkan/icd.d)
-   install(FILES ${CMAKE_BINARY_DIR}/icd/amd_icd${TARGET_ARCHITECTURE_BITS}.json COMPONENT icd DESTINATION /etc/vulkan/implicit_layer.d)
-   if(EXISTS ${CMAKE_SOURCE_DIR}/LICENSE.txt)
--    install(FILES ${CMAKE_SOURCE_DIR}/LICENSE.txt COMPONENT icd DESTINATION share/doc/${PACKAGE_NAME})
-+    install(FILES ${CMAKE_SOURCE_DIR}/LICENSE.txt COMPONENT icd DESTINATION share/doc/${PACKAGE_NAME}-${PACKAGE_VERSION})
-   else()
-     message(WARNING "LICENSE.txt is not found under ${CMAKE_SOURCE_DIR}, please put it there")
-   endif()

diff --git a/media-libs/amdvlk/files/amdvlk-2024.3.3-fix-build.patch b/media-libs/amdvlk/files/amdvlk-2024.3.3-fix-build.patch
deleted file mode 100644
index 9aa3b4d5c..000000000
--- a/media-libs/amdvlk/files/amdvlk-2024.3.3-fix-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/pal/shared/devdriver/shared/legacy/inc/util/queue.h b/pal/shared/devdriver/shared/legacy/inc/util/queue.h
-index 95421760..926e6c89 100644
---- a/pal/shared/devdriver/shared/legacy/inc/util/queue.h
-+++ b/pal/shared/devdriver/shared/legacy/inc/util/queue.h
-@@ -368,7 +368,7 @@ namespace DevDriver
- 
-         // Private copy constructor to prevent implicit copies
-         Queue(const Queue& rhs)
--            : Queue(rhs.allocCb)
-+            : Queue(rhs.m_allocCb)
-         {
-             GrowBlocks(rhs.m_numBlocks);
-             for (int i = 0; i < rhs.m_size; i++)

diff --git a/media-libs/amdvlk/files/amdvlk-2024.4.1-license-path.patch b/media-libs/amdvlk/files/amdvlk-2024.4.1-license-path.patch
new file mode 100644
index 000000000..e477e3b85
--- /dev/null
+++ b/media-libs/amdvlk/files/amdvlk-2024.4.1-license-path.patch
@@ -0,0 +1,13 @@
+diff --git a/xgl/cmake/XglPackaging.cmake b/xgl/cmake/XglPackaging.cmake
+index 05a84a4..cc878d7 100644
+--- a/xgl/cmake/XglPackaging.cmake
++++ b/xgl/cmake/XglPackaging.cmake
+@@ -141,7 +141,7 @@ function(generateInstallTargets)
+     endif()
+   elseif(PACKAGE_NAME STREQUAL "amdvlk")
+     if(EXISTS ${CMAKE_SOURCE_DIR}/LICENSE.txt)
+-      install(FILES ${CMAKE_SOURCE_DIR}/LICENSE.txt COMPONENT icd DESTINATION share/doc/${PACKAGE_NAME})
++      install(FILES ${CMAKE_SOURCE_DIR}/LICENSE.txt COMPONENT icd DESTINATION share/doc/${PACKAGE_NAME}-${PACKAGE_VERSION})
+     else()
+       message(WARNING "LICENSE.txt is not found under ${CMAKE_SOURCE_DIR}, please put it there")
+     endif()

diff --git a/media-libs/amdvlk/files/amdvlk-2024.4.1-missing-header.patch b/media-libs/amdvlk/files/amdvlk-2024.4.1-missing-header.patch
new file mode 100644
index 000000000..e29d8746e
--- /dev/null
+++ b/media-libs/amdvlk/files/amdvlk-2024.4.1-missing-header.patch
@@ -0,0 +1,12 @@
+diff --git a/pal/src/core/misc/cacheLayer/multiElfCacheLayer.cpp b/pal/src/core/misc/cacheLayer/multiElfCacheLayer.cpp
+index 93af97aa..73db7af8 100644
+--- a/pal/src/core/misc/cacheLayer/multiElfCacheLayer.cpp
++++ b/pal/src/core/misc/cacheLayer/multiElfCacheLayer.cpp
+@@ -24,6 +24,7 @@
+  **********************************************************************************************************************/
+ #include "multiElfCacheLayer.h"
+ #include <cinttypes>
++#include <cstdio>
+ 
+ namespace Util
+ {


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-12-05 12:00 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-17 11:26 [gentoo-commits] repo/proj/guru:master commit in: media-libs/amdvlk/, media-libs/amdvlk/files/ Haelwenn Monnier
  -- strict thread matches above, loose matches on Subject: below --
2024-08-13 19:52 [gentoo-commits] repo/proj/guru:dev commit in: media-libs/amdvlk/files/, media-libs/amdvlk/ David Roman
2024-08-13 19:56 ` [gentoo-commits] repo/proj/guru:master commit in: media-libs/amdvlk/, media-libs/amdvlk/files/ David Roman
2024-10-12 19:08 [gentoo-commits] repo/proj/guru:dev commit in: media-libs/amdvlk/files/, media-libs/amdvlk/ David Roman
2024-10-13  0:09 ` [gentoo-commits] repo/proj/guru:master commit in: media-libs/amdvlk/, media-libs/amdvlk/files/ David Roman
2024-12-05 12:00 Florian Schmaus

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