commit: b9f1e2936898522127e599f4ac7cd9975c6ed32b Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Fri Mar 13 16:54:47 2026 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Fri Mar 13 16:59:35 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9f1e293
dev-util/vulkan-tools: Drop old versions Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> dev-util/vulkan-tools/Manifest | 1 - .../vulkan-tools-1.4.321-fix-cube-wayland.patch | 90 ---------------------- .../vulkan-tools/vulkan-tools-1.4.321.0-r1.ebuild | 88 --------------------- 3 files changed, 179 deletions(-) diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest index 72883b5aca05..f61292617f7f 100644 --- a/dev-util/vulkan-tools/Manifest +++ b/dev-util/vulkan-tools/Manifest @@ -1,4 +1,3 @@ -DIST vulkan-tools-1.4.321.0.tar.gz 807441 BLAKE2B 81ead6eabd9089203d4f092693f6aafba0e4ffd4f6e8fa0d8f5442353efdfb390314d366a67d842d87a9cb2db5a0d24d30f1455cfc3eedfe6dffe34f4c79c670 SHA512 163b6348064b807ae22ed14945d558fdb18789af22f4bca4dcd017699eef41bae4ca86114297c02f6caed7206882676fca9bc58b9acdae2db46356d266af307a DIST vulkan-tools-1.4.328.0.tar.gz 798521 BLAKE2B a65a4ff396d8ecb0da4bbf4c3541f1b30b7338d78fe3f348b3fcc564e4d503e23f6101392d3352e823d29286c510b199a6e36599f626c4350b5afa4d6e2ba272 SHA512 61ff1b61efd536c10ab6edc71c56bec9fe5ca42c827fae6dfc5af84c729597143c9530b5a050c95fa4a8c4eb390ad8956bdd8f42d29ffa1da2e53397073fa0b0 DIST vulkan-tools-1.4.335.0.tar.gz 791395 BLAKE2B 9a043e05e44b761a5b23326f33b16429652b11b43c500dd6ff5104c0959dd8bd37f3f75f94827555ddaa99e779eebc508b719f9ebb2945a8a2fb7083db5decbf SHA512 6563105c9ebcd57fea0afeaaf81e03b11dfe893037ca8fd2ae688e0ce4d55b74c274cdf66a207c6bbb67f8e30761976423b1e13ef2e8e3246076de97051e5b6d DIST vulkan-tools-1.4.341.0.tar.gz 804878 BLAKE2B 8701c16818475c0afe5e5b6c8adee2a153c188ed93ea7daf5b1b60ec733e649f8c3ac66b7f51f91c3ced305c752f5e56fc40133382a15d5eeaa616bb4fd0e86d SHA512 0fad33d732e034489acea4745abfb21fb27619114bfdfa0923cc4baa7e22be65c1dfd10309bfdd9926fe943cd1c8d86521fbd7c326ce46a7c468e1428736db29 diff --git a/dev-util/vulkan-tools/files/vulkan-tools-1.4.321-fix-cube-wayland.patch b/dev-util/vulkan-tools/files/vulkan-tools-1.4.321-fix-cube-wayland.patch deleted file mode 100644 index 024d81a7338e..000000000000 --- a/dev-util/vulkan-tools/files/vulkan-tools-1.4.321-fix-cube-wayland.patch +++ /dev/null @@ -1,90 +0,0 @@ -https://bugs.gentoo.org/959725 -https://github.com/KhronosGroup/Vulkan-Tools/issues/1130 -https://github.com/KhronosGroup/Vulkan-Tools/pull/1134 -https://github.com/KhronosGroup/Vulkan-Tools/commit/105d6c1fede00c3a9055e5a531ebf3d99bac406e - -From f546743016f5301c063f2c50af0ea43dd2485ef4 Mon Sep 17 00:00:00 2001 -From: Charles Giessen <[email protected]> -Date: Thu, 17 Jul 2025 09:56:40 -0500 -Subject: [PATCH] build: Remove pkg-config provided library names - -The library names of Xcb, Xlib, and Wayland do not need to be queried from pkg-config, -instead they can be hardcoded to use the fallback names. - -The intent of querying the library names was to prevent issues where the hardcoded name -was not the platform-appropriate name. But because <library>_LINK_LIBRARIES can have -more than one library name, the logic to assign <library>_LINK_LIBRARIES into a compile -definition breaks horribly. While it is possible to handle this in CMake, the dlopen code would -also have to handle it which is much more error prone. ---- a/cube/CMakeLists.txt -+++ b/cube/CMakeLists.txt -@@ -307,16 +307,6 @@ if (ANDROID) - return() - endif() - --if (XCB_LINK_LIBRARIES) -- target_compile_definitions(vkcube PRIVATE "XCB_LIBRARY=\"${XCB_LINK_LIBRARIES}\"") --endif() --if (X11_LINK_LIBRARIES) -- target_compile_definitions(vkcube PRIVATE "XLIB_LIBRARY=\"${X11_LINK_LIBRARIES}\"") --endif() --if (WAYLAND_CLIENT_LINK_LIBRARIES) -- target_compile_definitions(vkcube PRIVATE "WAYLAND_LIBRARY=\"${WAYLAND_CLIENT_LINK_LIBRARIES}\"") --endif() -- - # ---------------------------------------------------------------------------- - # vkcubepp - -@@ -360,16 +350,6 @@ target_include_directories(vkcubepp PRIVATE .) - target_compile_definitions(vkcubepp PRIVATE ${ENABLED_CUBE_PLATFORMS}) - target_link_libraries(vkcubepp ${CMAKE_DL_LIBS} Vulkan::Headers) - --if (XCB_LINK_LIBRARIES ) -- target_compile_definitions(vkcubepp PUBLIC "XCB_LIBRARY=\"${XCB_LINK_LIBRARIES}\"") --endif() --if (X11_LINK_LIBRARIES) -- target_compile_definitions(vkcubepp PUBLIC "XLIB_LIBRARY=\"${X11_LINK_LIBRARIES}\"") --endif() --if (WAYLAND_CLIENT_LINK_LIBRARIES) -- target_compile_definitions(vkcubepp PUBLIC "WAYLAND_LIBRARY=\"${WAYLAND_CLIENT_LINK_LIBRARIES}\"") --endif() -- - if(APPLE) - install( - TARGETS vkcubepp ---- a/cube/wayland_loader.h -+++ b/cube/wayland_loader.h -@@ -80,9 +80,6 @@ static PFN_wl_display_disconnect cube_wl_display_disconnect = NULL; - - static inline void *initialize_wayland() { - void *wayland_library = NULL; --#if defined(WAYLAND_LIBRARY) -- wayland_library = dlopen(WAYLAND_LIBRARY, RTLD_NOW | RTLD_LOCAL); --#endif - if (NULL == wayland_library) { - wayland_library = dlopen("libwayland-client.so.0", RTLD_NOW | RTLD_LOCAL); - } ---- a/cube/xcb_loader.h -+++ b/cube/xcb_loader.h -@@ -88,9 +88,6 @@ static PFN_xcb_screen_next cube_xcb_screen_next = NULL; - - void *initialize_xcb() { - void *xcb_library = NULL; --#if defined(XCB_LIBRARY) -- xcb_library = dlopen(XCB_LIBRARY, RTLD_NOW | RTLD_LOCAL); --#endif - if (NULL == xcb_library) { - xcb_library = dlopen("libxcb.so.1", RTLD_NOW | RTLD_LOCAL); - } ---- a/cube/xlib_loader.h -+++ b/cube/xlib_loader.h -@@ -72,9 +72,6 @@ static PFN_XFlush cube_XFlush = NULL; - - void* initialize_xlib() { - void* xlib_library = NULL; --#if defined(XLIB_LIBRARY) -- xlib_library = dlopen(XLIB_LIBRARY, RTLD_NOW | RTLD_LOCAL); --#endif - if (NULL == xlib_library) { - xlib_library = dlopen("libX11.so.6", RTLD_NOW | RTLD_LOCAL); - } diff --git a/dev-util/vulkan-tools/vulkan-tools-1.4.321.0-r1.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.4.321.0-r1.ebuild deleted file mode 100644 index a49572eff8f0..000000000000 --- a/dev-util/vulkan-tools/vulkan-tools-1.4.321.0-r1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PN=Vulkan-Tools -PYTHON_COMPAT=( python3_{11..14} ) -inherit cmake-multilib python-any-r1 - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"; - EGIT_SUBMODULES=() - inherit git-r3 -else - SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv" - S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV} -fi - -DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS" -HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"; - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="cube wayland test X" -RESTRICT="!test? ( test )" - -BDEPEND="${PYTHON_DEPS} - cube? ( ~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}] ) -" -RDEPEND=" - wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] ) - X? ( - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libxcb:=[${MULTILIB_USEDEP}] - ) -" -DEPEND="${RDEPEND} - ~dev-util/vulkan-headers-${PV} - X? ( x11-libs/libXrandr[${MULTILIB_USEDEP}] ) - test? ( ~media-libs/vulkan-loader-${PV}[${MULTILIB_USEDEP},wayland?,X?] ) -" - -PATCHES=( - "${FILESDIR}"/vulkan-tools-1.4.321-fix-cube-wayland.patch -) - -pkg_setup() { - MULTILIB_CHOST_TOOLS=( - /usr/bin/vulkaninfo - ) - - use cube && MULTILIB_CHOST_TOOLS+=( - /usr/bin/vkcube - /usr/bin/vkcubepp - ) - - python-any-r1_pkg_setup -} - -multilib_src_configure() { - local mycmakeargs=( - -DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG" - -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG -DGIT_BRANCH_NAME=\\\"gentoo\\\" -DGIT_TAG_INFO=\\\"${PV//./_}\\\"" - -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON - -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) - -DBUILD_WSI_XLIB_SUPPORT=$(usex X) - -DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr" - ) - - cmake_src_configure -} - -pkg_postinst() { - if use cube; then - 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 -}
