Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package vulkan-tools for openSUSE:Leap:16.0 checked in at 2025-08-07 19:23:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:16.0/vulkan-tools (Old) and /work/SRC/openSUSE:Leap:16.0/.vulkan-tools.new.1085 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vulkan-tools" Thu Aug 7 19:23:10 2025 rev:3 rq:1298098 version:1.4.304 Changes: -------- --- /work/SRC/openSUSE:Leap:16.0/vulkan-tools/vulkan-tools.changes 2025-03-19 12:00:23.468137131 +0100 +++ /work/SRC/openSUSE:Leap:16.0/.vulkan-tools.new.1085/vulkan-tools.changes 2025-08-07 19:30:09.327144515 +0200 @@ -1,0 +2,7 @@ +Thu Aug 7 09:03:56 UTC 2025 - Antonio Larrosa <[email protected]> + +- Add rebased patch from upstream to fix building with + wayland 1.24: + * 0001-build-Remove-pkg-config-provided-library-names.patch + +------------------------------------------------------------------- New: ---- 0001-build-Remove-pkg-config-provided-library-names.patch ----------(New B)---------- New: wayland 1.24: * 0001-build-Remove-pkg-config-provided-library-names.patch ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vulkan-tools.spec ++++++ --- /var/tmp/diff_new_pack.Yn0A3H/_old 2025-08-07 19:30:09.799164158 +0200 +++ /var/tmp/diff_new_pack.Yn0A3H/_new 2025-08-07 19:30:09.799164158 +0200 @@ -25,6 +25,8 @@ URL: https://github.com/KhronosGroup/Vulkan-Tools Source: https://github.com/KhronosGroup/Vulkan-Tools/archive/refs/tags/v%version.tar.gz Source9: baselibs.conf +# PATCH-FIX-UPSTREAM +Patch0: 0001-build-Remove-pkg-config-provided-library-names.patch BuildRequires: cmake >= 3.17 BuildRequires: gcc-c++ >= 4.8 BuildRequires: glslang-devel ++++++ 0001-build-Remove-pkg-config-provided-library-names.patch ++++++ >From 105d6c1fede00c3a9055e5a531ebf3d99bac406e 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. --- 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) target_compile_definitions(vkcubepp PRIVATE ${ENABLED_CUBE_PLATFORMS}) target_link_libraries(vkcubepp Vulkan::Headers volk::volk_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); }
