CVS commit: pkgsrc/graphics/vulkan-tools

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Nov 24 20:52:56 UTC 2025

Modified Files:
        pkgsrc/graphics/vulkan-tools: distinfo
Added Files:
        pkgsrc/graphics/vulkan-tools/patches: patch-cube_CMakeLists.txt

Log Message:
vulkan-tools: try to fix sh syntax error on NetBSD due to CMake abuse


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/vulkan-tools/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/vulkan-tools/patches/patch-cube_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/vulkan-tools/distinfo
diff -u pkgsrc/graphics/vulkan-tools/distinfo:1.3 pkgsrc/graphics/vulkan-tools/distinfo:1.4
--- pkgsrc/graphics/vulkan-tools/distinfo:1.3   Sat Oct  4 12:39:56 2025
+++ pkgsrc/graphics/vulkan-tools/distinfo       Mon Nov 24 20:52:55 2025
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.3 2025/10/04 12:39:56 tnn Exp $
+$NetBSD: distinfo,v 1.4 2025/11/24 20:52:55 tnn Exp $
 
 BLAKE2s (vulkan-tools-1.4.321.0.tar.gz) = fe0751c267a45a60b5b477b3ab7bf316868b033fb0563bcd7b39be0f3a70fc9d
 SHA512 (vulkan-tools-1.4.321.0.tar.gz) = 163b6348064b807ae22ed14945d558fdb18789af22f4bca4dcd017699eef41bae4ca86114297c02f6caed7206882676fca9bc58b9acdae2db46356d266af307a
 Size (vulkan-tools-1.4.321.0.tar.gz) = 807441 bytes
+SHA1 (patch-cube_CMakeLists.txt) = 12be43fe76672724a01116f91b02b4c72a5ca2ec
 SHA1 (patch-cube_cube.c) = 662d641041852e2fc049abba57623ca52a88eb5b
 SHA1 (patch-cube_cube.cpp) = 8e960de47586bf0bc8e148b1c3b288d305c58831

Added files:

Index: pkgsrc/graphics/vulkan-tools/patches/patch-cube_CMakeLists.txt
diff -u /dev/null pkgsrc/graphics/vulkan-tools/patches/patch-cube_CMakeLists.txt:1.1
--- /dev/null   Mon Nov 24 20:52:56 2025
+++ pkgsrc/graphics/vulkan-tools/patches/patch-cube_CMakeLists.txt      Mon Nov 24 20:52:56 2025
@@ -0,0 +1,32 @@
+$NetBSD: patch-cube_CMakeLists.txt,v 1.1 2025/11/24 20:52:56 tnn Exp $
+
+On NetBSD wayland-client.pc has:
+Libs: -Wl,-R${libdir} -L${libdir} -lwayland-client -lm
+
+We need to pull out the first library in the list for dlopen purposes
+and skip the rest.
+
+--- cube/CMakeLists.txt.orig   2025-11-24 20:44:04.253915997 +0000
++++ cube/CMakeLists.txt
+@@ -314,7 +314,9 @@ 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}\"")
++    #target_compile_definitions(vkcube PRIVATE "WAYLAND_LIBRARY=\"${WAYLAND_CLIENT_LINK_LIBRARIES}\"")
++    list(GET WAYLAND_CLIENT_LINK_LIBRARIES 0 WAYLAND_CLIENT_LIB)
++    target_compile_definitions(vkcube PRIVATE "WAYLAND_LIBRARY=\"${WAYLAND_CLIENT_LIB}\"")
+ endif()
+ 
+ # ----------------------------------------------------------------------------
+@@ -367,7 +369,9 @@ 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}\"")
++    #target_compile_definitions(vkcubepp PUBLIC "WAYLAND_LIBRARY=\"${WAYLAND_CLIENT_LINK_LIBRARIES}\"")
++    list(GET WAYLAND_CLIENT_LINK_LIBRARIES 0 WAYLAND_CLIENT_LIB)
++    target_compile_definitions(vkcubepp PUBLIC "WAYLAND_LIBRARY=\"${WAYLAND_CLIENT_LIB}\"")
+ endif()
+ 
+ if(APPLE)