diff --git a/main/vulkan-tools/APKBUILD b/main/vulkan-tools/APKBUILD index a13d2795eeb..6c3b6336db6 100644 --- a/main/vulkan-tools/APKBUILD +++ b/main/vulkan-tools/APKBUILD @@ -1,8 +1,7 @@ -# Contributor: Bart Ribbers -# Maintainer: Simon Zeni +maintainer="Simon Zeni " pkgname=vulkan-tools _pkgname=Vulkan-Tools -pkgver=1.4.321.0 +pkgver=1.4.347 pkgrel=0 arch="all" url="https://www.khronos.org/vulkan" @@ -22,10 +21,8 @@ makedepends=" wayland-protocols-dev " subpackages="$pkgname-dbg" -source="https://github.com/KhronosGroup/Vulkan-Tools/archive/refs/tags/vulkan-sdk-$pkgver/vulkan-tools-sdk-$pkgver.tar.gz - remove-pkg-config-provided-library-names.patch - " -builddir="$srcdir/$_pkgname-vulkan-sdk-$pkgver" +source="$pkgname-$pkgver.tar.gz::https://github.com/KhronosGroup/Vulkan-Tools/archive/refs/tags/v$pkgver.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver" options="!check" # No tests build() { @@ -47,6 +44,5 @@ package() { } sha512sums=" -163b6348064b807ae22ed14945d558fdb18789af22f4bca4dcd017699eef41bae4ca86114297c02f6caed7206882676fca9bc58b9acdae2db46356d266af307a vulkan-tools-sdk-1.4.321.0.tar.gz -c307bd13db7abe5fd2bbc297fb8011aac94f554c5118e852165c8f43d3fc2fb1b7ef59692222e01e80bba0c8941c835393d75ed387b26e140b4f79893d9256b6 remove-pkg-config-provided-library-names.patch +26eb112f1614ae1b365a8b91a0dbc27d894fe2d10472e65b9b38de92ce5fc70b46d7b3710e12b3d440e3ffb45050df63dd1d50d320ab4d5a5ebdf92b02eb228f vulkan-tools-1.4.347.tar.gz " diff --git a/main/vulkan-tools/remove-pkg-config-provided-library-names.patch b/main/vulkan-tools/remove-pkg-config-provided-library-names.patch deleted file mode 100644 index 74ea330ef59..00000000000 --- a/main/vulkan-tools/remove-pkg-config-provided-library-names.patch +++ /dev/null @@ -1,102 +0,0 @@ -Patch-Source: https://github.com/KhronosGroup/Vulkan-Tools/commit/105d6c1fede00c3a9055e5a531ebf3d99bac406e ---- -From 105d6c1fede00c3a9055e5a531ebf3d99bac406e Mon Sep 17 00:00:00 2001 -From: Charles Giessen -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 _LINK_LIBRARIES can have -more than one library name, the logic to assign _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. ---- - cube/CMakeLists.txt | 20 -------------------- - cube/wayland_loader.h | 3 --- - cube/xcb_loader.h | 3 --- - cube/xlib_loader.h | 3 --- - 4 files changed, 29 deletions(-) - -diff --git a/cube/CMakeLists.txt b/cube/CMakeLists.txt -index 7e135e79b..dac6bfed9 100644 ---- 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 -diff --git a/cube/wayland_loader.h b/cube/wayland_loader.h -index 2afab6e97..7d7d91412 100644 ---- 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); - } -diff --git a/cube/xcb_loader.h b/cube/xcb_loader.h -index a94d5ab56..cecd25402 100644 ---- 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); - } -diff --git a/cube/xlib_loader.h b/cube/xlib_loader.h -index c7874d0e7..881789f18 100644 ---- 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); - }