commit: 39d83bb25e39c09b24e212e90b13e3239267ebe5
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 14 18:28:12 2025 +0000
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sun Dec 14 18:50:30 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39d83bb2
media-libs/vulkan-layers: add 1.4.335.0
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
media-libs/vulkan-layers/Manifest | 1 +
.../vulkan-layers-1.4.335.0-tests-no-static.patch | 42 ++++++++++++++++++++++
...-9999.ebuild => vulkan-layers-1.4.335.0.ebuild} | 10 ++----
media-libs/vulkan-layers/vulkan-layers-9999.ebuild | 2 +-
4 files changed, 47 insertions(+), 8 deletions(-)
diff --git a/media-libs/vulkan-layers/Manifest
b/media-libs/vulkan-layers/Manifest
index ea50647d6f3e..fb1676306be1 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,2 +1,3 @@
DIST vulkan-layers-1.4.321.0.tar.gz 6494385 BLAKE2B
483b41655630967a7a08bf1bb34264a16829f30174eb21f1e5d73e70c69b88f9a4972dbbeb915c754bc88ebe588856a4b1f9f9edcac50aed9fea32fcc7c38196
SHA512
47651166201f06159348c36667097410f9b51c1907754f99b44af58ef0f6b75c47e8b1f31d06b821915589575bd74dcbda927751994b088deeaa1e46ff1653c5
DIST vulkan-layers-1.4.328.0.tar.gz 6765952 BLAKE2B
7b68d635c262f1350f93c5906ccaf9b548ea27ae85210198e02d8cbaee52a9bd080fd9555979a6b26d2d5fe200de8e4a77f938f1a77050b959100b6b82226b10
SHA512
d98ae93e738fee540e4924c887497f06ca7296a22a1a450f08e5278bdc51fb440443361fdf839793bc632b6e6115754621f24a8e7f2548da58d1bf67713ccaf9
+DIST vulkan-layers-1.4.335.0.tar.gz 7035814 BLAKE2B
ee49766f3521db3434dfba793f8cb51d98363610cf85d91f238727c3dd3392743897fe3aa0979956fefcdf86a4e2b0a2de9c0b236473ceba3d7556363e572407
SHA512
5088bfb212595d5c1bd052f3e2e7d52ffa1c329625576116876a248daba51c9ba86297ebf8ffb6bd1e8f78bf161409a603aa4d145032664623292d53ed541514
diff --git
a/media-libs/vulkan-layers/files/vulkan-layers-1.4.335.0-tests-no-static.patch
b/media-libs/vulkan-layers/files/vulkan-layers-1.4.335.0-tests-no-static.patch
new file mode 100644
index 000000000000..92aa8f659cbb
--- /dev/null
+++
b/media-libs/vulkan-layers/files/vulkan-layers-1.4.335.0-tests-no-static.patch
@@ -0,0 +1,42 @@
+diff --git a/tests/framework/CMakeLists.txt b/tests/framework/CMakeLists.txt
+index 1950b4b06..3fee44ae0 100644
+--- a/tests/framework/CMakeLists.txt
++++ b/tests/framework/CMakeLists.txt
+@@ -74,7 +74,6 @@ target_include_directories(vk_test_framework PUBLIC
+
+ find_package(GTest CONFIG)
+ find_package(glslang CONFIG)
+-find_package(SPIRV-Tools CONFIG)
+
+ if(${CMAKE_CXX_COMPILER_ID} MATCHES "(GNU|Clang)")
+ target_compile_options(vk_test_framework PUBLIC
+@@ -103,7 +102,6 @@ endif()
+ target_link_libraries(vk_test_framework PUBLIC
+ VkLayer_utils
+ glslang::SPIRV
+- SPIRV-Tools-static
+ SPIRV-Headers::SPIRV-Headers
+ GTest::gtest
+ GTest::gtest_main
+@@ -112,6 +110,21 @@ target_link_libraries(vk_test_framework PUBLIC
+ $<TARGET_NAME_IF_EXISTS:PkgConfig::WAYlAND_CLIENT>
+ )
+
++find_package(SPIRV-Tools CONFIG QUIET)
++
++# See https://github.com/KhronosGroup/SPIRV-Tools/issues/3909 for background
on this.
++# The targets available from SPIRV-Tools change depending on how
SPIRV_TOOLS_BUILD_STATIC is set.
++# Try to handle all possible combinations so that we work with externally
built packages.
++if (TARGET SPIRV-Tools)
++ target_link_libraries(vk_test_framework PRIVATE SPIRV-Tools)
++elseif(TARGET SPIRV-Tools-static)
++ target_link_libraries(vk_test_framework PRIVATE SPIRV-Tools-static)
++elseif(TARGET SPIRV-Tools-shared)
++ target_link_libraries(vk_test_framework PRIVATE SPIRV-Tools-shared)
++else()
++ message(FATAL_ERROR "Cannot determine SPIRV-Tools target name")
++endif()
++
+ # setup framework/config.h using framework/config.h.in as a source
+ file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/config_$<CONFIG>.h" INPUT
"config.h.in")
+
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
b/media-libs/vulkan-layers/vulkan-layers-1.4.335.0.ebuild
similarity index 91%
copy from media-libs/vulkan-layers/vulkan-layers-9999.ebuild
copy to media-libs/vulkan-layers/vulkan-layers-1.4.335.0.ebuild
index a8935e38b108..eb4c1cde1ff0 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.4.335.0.ebuild
@@ -23,7 +23,8 @@
HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers";
LICENSE="Apache-2.0"
SLOT="0"
IUSE="wayland test X"
-RESTRICT="!test? ( test )"
+# Many segfaults as of 1.4.313.0
+RESTRICT="!test? ( test ) test"
RDEPEND="~dev-util/spirv-tools-${PV}[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}
@@ -42,7 +43,7 @@ DEPEND="${RDEPEND}
QA_SONAME="/usr/lib[^/]*/libVkLayer_khronos_validation.so"
PATCHES=(
- "${FILESDIR}"/${PN}-1.4.328.0-tests-no-static.patch
+ "${FILESDIR}"/${PN}-1.4.335.0-tests-no-static.patch
)
multilib_src_configure() {
@@ -59,11 +60,6 @@ multilib_src_configure() {
cmake_src_configure
}
-multilib_src_test() {
- addwrite "/dev/dri/renderD128"
- cmake_src_test
-}
-
multilib_src_install_all() {
find "${ED}" -type f -name \*.a -delete || die
}
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index a8935e38b108..c82b6a134db4 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -42,7 +42,7 @@ DEPEND="${RDEPEND}
QA_SONAME="/usr/lib[^/]*/libVkLayer_khronos_validation.so"
PATCHES=(
- "${FILESDIR}"/${PN}-1.4.328.0-tests-no-static.patch
+ "${FILESDIR}"/${PN}-1.4.335.0-tests-no-static.patch
)
multilib_src_configure() {
