commit: 453a900984fc09c416c99d6e3b700a333e7beb33 Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> AuthorDate: Sat Jan 18 22:37:46 2025 +0000 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> CommitDate: Sat Jan 18 22:38:35 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=453a9009
dev-util/vulkan-tools: Fix build with USE=cube Closes: https://bugs.gentoo.org/948373 Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org> .../vulkan-tools/vulkan-tools-1.4.304.0.ebuild | 21 +++++++++----------- dev-util/vulkan-tools/vulkan-tools-9999.ebuild | 23 ++++++++++------------ 2 files changed, 19 insertions(+), 25 deletions(-) diff --git a/dev-util/vulkan-tools/vulkan-tools-1.4.304.0.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.4.304.0.ebuild index 28da3ccf7295..1492f1179004 100644 --- a/dev-util/vulkan-tools/vulkan-tools-1.4.304.0.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-1.4.304.0.ebuild @@ -50,9 +50,6 @@ pkg_setup() { /usr/bin/vkcube /usr/bin/vkcubepp ) - use cube && use wayland && MULTILIB_CHOST_TOOLS+=( - /usr/bin/vkcube-wayland - ) python-any-r1_pkg_setup } @@ -71,15 +68,15 @@ multilib_src_configure() { -DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr" ) + cmake_src_configure +} + +pkg_postinst() { if use cube; then - if use X; then - mycmakeargs+=(-DCUBE_WSI_SELECTION=XCB) - elif use wayland; then - mycmakeargs+=(-DCUBE_WSI_SELECTION=WAYLAND) - else - mycmakeargs+=(-DCUBE_WSI_SELECTION=DISPLAY) - fi + einfo "As of version 1.4.304.0, the window system for 'vkcube' and 'vkcubepp'" + einfo "can be selected at runtime using the '--wsi' runtime argument." + einfo "For example, Wayland can be selected using '--wsi wayland'." + einfo "As such, 'vkcube-wayland' has been removed and the runtime argument" + einfo "must be used instead. See 'vkcube --help' for more information." fi - - cmake_src_configure } diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild index 1c19288ef980..1492f1179004 100644 --- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -50,9 +50,6 @@ pkg_setup() { /usr/bin/vkcube /usr/bin/vkcubepp ) - use cube && use wayland && MULTILIB_CHOST_TOOLS+=( - /usr/bin/vkcube-wayland - ) python-any-r1_pkg_setup } @@ -71,15 +68,15 @@ multilib_src_configure() { -DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr" ) + cmake_src_configure +} + +pkg_postinst() { if use cube; then - if use X; then - mycmakeargs+=(-DCUBE_WSI_SELECTION=XCB) - elif use wayland; then - mycmakeargs+=(-DCUBE_WSI_SELECTION=WAYLAND) - else - mycmakeargs+=(-DCUBE_WSI_SELECTION=DISPLAY) - fi + einfo "As of version 1.4.304.0, the window system for 'vkcube' and 'vkcubepp'" + einfo "can be selected at runtime using the '--wsi' runtime argument." + einfo "For example, Wayland can be selected using '--wsi wayland'." + einfo "As such, 'vkcube-wayland' has been removed and the runtime argument" + einfo "must be used instead. See 'vkcube --help' for more information." fi - - cmake_src_configure }
