public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:master commit in: media-libs/amdvlk/files/, media-libs/amdvlk/
@ 2022-11-16 19:33 Florian Schmaus
  0 siblings, 0 replies; 4+ messages in thread
From: Florian Schmaus @ 2022-11-16 19:33 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:     Florian Schmaus <flow <AT> gentoo <DOT> org>
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] 4+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: media-libs/amdvlk/files/, media-libs/amdvlk/
@ 2024-01-17 13:51 David Roman
  0 siblings, 0 replies; 4+ messages in thread
From: David Roman @ 2024-01-17 13:51 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:     David Roman <davidroman96 <AT> gmail <DOT> com>
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] 4+ messages in thread

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

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

media-libs/amdvlk: drop old ebuilds

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

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

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

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

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

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

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

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


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

* [gentoo-commits] repo/proj/guru:master commit in: media-libs/amdvlk/files/, media-libs/amdvlk/
@ 2025-02-10  9:42 David Roman
  0 siblings, 0 replies; 4+ messages in thread
From: David Roman @ 2025-02-10  9:42 UTC (permalink / raw
  To: gentoo-commits

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

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

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

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

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

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

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


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

end of thread, other threads:[~2025-02-10  9:42 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-10  9:42 [gentoo-commits] repo/proj/guru:master commit in: media-libs/amdvlk/files/, media-libs/amdvlk/ David Roman
  -- strict thread matches above, loose matches on Subject: below --
2024-08-13 19:52 [gentoo-commits] repo/proj/guru:dev commit in: media-libs/amdvlk/, media-libs/amdvlk/files/ David Roman
2024-08-13 19:56 ` [gentoo-commits] repo/proj/guru:master commit in: media-libs/amdvlk/files/, media-libs/amdvlk/ David Roman
2024-01-17 13:51 David Roman
2022-11-16 19:33 Florian Schmaus

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