Import openSUSE:Leap:16.0 modifications

remove invalid imported files
Accepting request 1233208 from X11:Wayland
2025-08-12 12:20:16 +02:00 · 2025-08-07 18:29:18 +02:00 · 2024-12-26 11:23:16 +00:00 · 2024-12-24 02:24:41 +00:00 · 2024-10-09 20:03:14 +00:00 · 2024-10-08 17:14:44 +00:00
7 changed files with 131 additions and 13 deletions
--- a/0001-build-Remove-pkg-config-provided-library-names.patch
+++ b/0001-build-Remove-pkg-config-provided-library-names.patch
@@ -0,0 +1,102 @@
+From 105d6c1fede00c3a9055e5a531ebf3d99bac406e Mon Sep 17 00:00:00 2001
+From: Charles Giessen <charles@lunarg.com>
+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);
+     }
--- a/_scmsync.obsinfo
+++ b/_scmsync.obsinfo
@@ -1,4 +0,0 @@
-mtime: 1721712666
-commit: 656e64931fd7f38929b75d46cd35c46cf46f9970afc6a6307c3fdfdc639afb63
-url: https://src.opensuse.org/jengelh/vulkan-tools
-revision: master
--- a/build.specials.obscpio
+++ b/build.specials.obscpio
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:76378d4fe28e60b2036a4e8286c9eb9a24534326cf321a1c4efe3bbb960c50a3
-size 256
--- a/v1.4.304.tar.gz
+++ b/v1.4.304.tar.gz
--- a/vulkan-sdk-1.3.290.0.tar.gz
+++ b/vulkan-sdk-1.3.290.0.tar.gz
--- a/vulkan-tools.changes
+++ b/vulkan-tools.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Thu Aug  7 09:03:56 UTC 2025 - Antonio Larrosa <alarrosa@suse.com>
+
+- Add rebased patch from upstream to fix building with
+  wayland 1.24:
+  * 0001-build-Remove-pkg-config-provided-library-names.patch
+
+-------------------------------------------------------------------
+Tue Dec 24 01:33:04 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to tag 1.4.304
+  * icd: add support for AV1 encode and QP maps
+
+-------------------------------------------------------------------
+Tue Oct  8 17:13:46 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release SDK-1.3.296
+  * vulkaninfo: Add --show-promoted-structs option
+  * vulkaninfo: Only iterate 2-call idiom when needed
+  * vulkaninfo: Correctly query per-surface queue support
+
 -------------------------------------------------------------------
 Tue Jul 23 05:26:36 UTC 2024 - Jan Engelhardt <jengelh@inai.de>

--- a/vulkan-tools.spec
+++ b/vulkan-tools.spec
@@ -17,14 +17,16 @@


 Name:           vulkan-tools
-Version:        1.3.290
+Version:        1.4.304
 Release:        0
 Summary:        Diagnostic utilities for Vulkan
 License:        Apache-2.0
 Group:          Development/Tools/Other
 URL:            https://github.com/KhronosGroup/Vulkan-Tools
-Source:         https://github.com/KhronosGroup/Vulkan-Tools/archive/refs/tags/vulkan-sdk-%version.0.tar.gz
+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
@@ -46,7 +48,7 @@ graphics applications such as games and interactive media.
 This package contains the Khronos official Vulkan tools and utilities.

 %prep
-%autosetup -p1 -n Vulkan-Tools-vulkan-sdk-%version.0
+%autosetup -p1 -n Vulkan-Tools-%version

 %build
 mkdir -p glslang/bin