[gentoo-commits] repo/gentoo:master commit in: dev-util/vulkan-tools/

[Sam James]

commit:     a60156345e2d29576f2ee4624acbd8482dc88fc5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 20 09:18:21 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 20 09:33:02 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6015634

dev-util/vulkan-tools: wire up tests, drop vulkan-loader to test dep

Since upstream commit 134337d7fe8813a041fd66dbde11389ebd7dd874, vulkan-loader
should be a test-only dep for our purposes.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{vulkan-tools-9999.ebuild => vulkan-tools-1.4.313.0-r1.ebuild}  | 6 ++++--
 dev-util/vulkan-tools/vulkan-tools-9999.ebuild                      | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild 
b/dev-util/vulkan-tools/vulkan-tools-1.4.313.0-r1.ebuild
similarity index 92%
copy from dev-util/vulkan-tools/vulkan-tools-9999.ebuild
copy to dev-util/vulkan-tools/vulkan-tools-1.4.313.0-r1.ebuild
index 2be82cd58fef..51733e9afc29 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.4.313.0-r1.ebuild
@@ -22,13 +22,13 @@ HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools";
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="cube wayland X"
+IUSE="cube wayland test X"
+RESTRICT="!test? ( test )"
 
 BDEPEND="${PYTHON_DEPS}
        cube? ( ~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}] )
 "
 RDEPEND="
-       ~media-libs/vulkan-loader-${PV}[${MULTILIB_USEDEP},wayland?,X?]
        wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
        X? (
                x11-libs/libX11[${MULTILIB_USEDEP}]
@@ -38,6 +38,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
        ~dev-util/vulkan-headers-${PV}
        X? ( x11-libs/libXrandr[${MULTILIB_USEDEP}] )
+       test? ( ~media-libs/vulkan-loader-${PV}[${MULTILIB_USEDEP},wayland?,X?] 
)
 "
 
 pkg_setup() {
@@ -60,6 +61,7 @@ multilib_src_configure() {
                -DCMAKE_SKIP_RPATH=ON
                -DBUILD_VULKANINFO=ON
                -DBUILD_CUBE=$(usex cube)
+               -DBUILD_TESTS=$(usex test)
                -DBUILD_WERROR=OFF
                -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
                -DBUILD_WSI_XCB_SUPPORT=$(usex X)

diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild 
b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index 2be82cd58fef..51733e9afc29 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -22,13 +22,13 @@ HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools";
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="cube wayland X"
+IUSE="cube wayland test X"
+RESTRICT="!test? ( test )"
 
 BDEPEND="${PYTHON_DEPS}
        cube? ( ~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}] )
 "
 RDEPEND="
-       ~media-libs/vulkan-loader-${PV}[${MULTILIB_USEDEP},wayland?,X?]
        wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
        X? (
                x11-libs/libX11[${MULTILIB_USEDEP}]
@@ -38,6 +38,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
        ~dev-util/vulkan-headers-${PV}
        X? ( x11-libs/libXrandr[${MULTILIB_USEDEP}] )
+       test? ( ~media-libs/vulkan-loader-${PV}[${MULTILIB_USEDEP},wayland?,X?] 
)
 "
 
 pkg_setup() {
@@ -60,6 +61,7 @@ multilib_src_configure() {
                -DCMAKE_SKIP_RPATH=ON
                -DBUILD_VULKANINFO=ON
                -DBUILD_CUBE=$(usex cube)
+               -DBUILD_TESTS=$(usex test)
                -DBUILD_WERROR=OFF
                -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
                -DBUILD_WSI_XCB_SUPPORT=$(usex X)