CVS commit: pkgsrc/graphics

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/graphics
From: "Tobias Nygren" <tnn%netbsd.org@localhost>
Date: Sat, 4 Oct 2025 12:39:56 +0000

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Oct  4 12:39:56 UTC 2025

Modified Files:
        pkgsrc/graphics/vulkan-headers: Makefile PLIST distinfo
        pkgsrc/graphics/vulkan-tools: Makefile distinfo
        pkgsrc/graphics/vulkan-tools/patches: patch-cube_cube.cpp
Added Files:
        pkgsrc/graphics/vulkan-tools/patches: patch-cube_cube.c
Removed Files:
        pkgsrc/graphics/vulkan-tools/patches: patch-CMakeLists.txt

Log Message:
vulkan-{headers,tools}: update to sdk 1.4.321.0

No changelog.
Update prompted by the prior version causing ICE with GCC 14.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/graphics/vulkan-headers/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/vulkan-headers/PLIST
cvs rdiff -u -r1.11 -r1.12 pkgsrc/graphics/vulkan-headers/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/vulkan-tools/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/vulkan-tools/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/graphics/vulkan-tools/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/vulkan-tools/patches/patch-cube_cube.c
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/graphics/vulkan-tools/patches/patch-cube_cube.cpp

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-headers/Makefile
diff -u pkgsrc/graphics/vulkan-headers/Makefile:1.13 pkgsrc/graphics/vulkan-headers/Makefile:1.14
--- pkgsrc/graphics/vulkan-headers/Makefile:1.13        Tue Nov 26 20:30:40 2024
+++ pkgsrc/graphics/vulkan-headers/Makefile     Sat Oct  4 12:39:56 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2024/11/26 20:30:40 triaxx Exp $
+# $NetBSD: Makefile,v 1.14 2025/10/04 12:39:56 tnn Exp $
 
-DISTNAME=      vulkan-headers-1.3.296
+DISTNAME=      vulkan-headers-1.4.321
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=KhronosGroup/}
 GITHUB_PROJECT=        Vulkan-Headers
@@ -15,6 +15,8 @@ LICENSE=      apache-2.0
 WRKSRC=                ${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}
 USE_LANGUAGES= c c++
 
+CMAKE_GENERATOR=       ninja
+
 REPLACE_PYTHON+=       registry/*.py
 REPLACE_PYTHON+=       registry/spec_tools/*.py
 

Index: pkgsrc/graphics/vulkan-headers/PLIST
diff -u pkgsrc/graphics/vulkan-headers/PLIST:1.6 pkgsrc/graphics/vulkan-headers/PLIST:1.7
--- pkgsrc/graphics/vulkan-headers/PLIST:1.6    Fri Apr  5 11:03:42 2024
+++ pkgsrc/graphics/vulkan-headers/PLIST        Sat Oct  4 12:39:56 2025
@@ -1,12 +1,15 @@
-@comment $NetBSD: PLIST,v 1.6 2024/04/05 11:03:42 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2025/10/04 12:39:56 tnn Exp $
 include/vk_video/vulkan_video_codec_av1std.h
 include/vk_video/vulkan_video_codec_av1std_decode.h
+include/vk_video/vulkan_video_codec_av1std_encode.h
 include/vk_video/vulkan_video_codec_h264std.h
 include/vk_video/vulkan_video_codec_h264std_decode.h
 include/vk_video/vulkan_video_codec_h264std_encode.h
 include/vk_video/vulkan_video_codec_h265std.h
 include/vk_video/vulkan_video_codec_h265std_decode.h
 include/vk_video/vulkan_video_codec_h265std_encode.h
+include/vk_video/vulkan_video_codec_vp9std.h
+include/vk_video/vulkan_video_codec_vp9std_decode.h
 include/vk_video/vulkan_video_codecs_common.h
 include/vulkan/vk_icd.h
 include/vulkan/vk_layer.h
@@ -30,6 +33,7 @@ include/vulkan/vulkan_hpp_macros.hpp
 include/vulkan/vulkan_ios.h
 include/vulkan/vulkan_macos.h
 include/vulkan/vulkan_metal.h
+include/vulkan/vulkan_ohos.h
 include/vulkan/vulkan_raii.hpp
 include/vulkan/vulkan_screen.h
 include/vulkan/vulkan_shared.hpp
@@ -37,6 +41,7 @@ include/vulkan/vulkan_static_assertions.
 include/vulkan/vulkan_structs.hpp
 include/vulkan/vulkan_to_string.hpp
 include/vulkan/vulkan_vi.h
+include/vulkan/vulkan_video.cppm
 include/vulkan/vulkan_video.hpp
 include/vulkan/vulkan_wayland.h
 include/vulkan/vulkan_win32.h
@@ -46,6 +51,7 @@ include/vulkan/vulkan_xlib_xrandr.h
 share/cmake/VulkanHeaders/VulkanHeadersConfig.cmake
 share/cmake/VulkanHeaders/VulkanHeadersConfigVersion.cmake
 share/vulkan/registry/apiconventions.py
+share/vulkan/registry/base_generator.py
 share/vulkan/registry/cgenerator.py
 share/vulkan/registry/generator.py
 share/vulkan/registry/parse_dependency.py
@@ -58,3 +64,4 @@ share/vulkan/registry/validusage.json
 share/vulkan/registry/video.xml
 share/vulkan/registry/vk.xml
 share/vulkan/registry/vkconventions.py
+share/vulkan/registry/vulkan_object.py

Index: pkgsrc/graphics/vulkan-headers/distinfo
diff -u pkgsrc/graphics/vulkan-headers/distinfo:1.11 pkgsrc/graphics/vulkan-headers/distinfo:1.12
--- pkgsrc/graphics/vulkan-headers/distinfo:1.11        Tue Nov 26 20:30:40 2024
+++ pkgsrc/graphics/vulkan-headers/distinfo     Sat Oct  4 12:39:56 2025
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2024/11/26 20:30:40 triaxx Exp $
+$NetBSD: distinfo,v 1.12 2025/10/04 12:39:56 tnn Exp $
 
-BLAKE2s (vulkan-headers-1.3.296.tar.gz) = 2a2b144ba37081daefcceac903d7eb522ecb61b4525e253e4bac1e971f0026b5
-SHA512 (vulkan-headers-1.3.296.tar.gz) = 2d63bd858c5bed2b2895af63e778dff09f1f10667ad95f97cdca4bf8dc3b11f9b93e4f1f8475fb9cdedf605fd3e6e76c1b02ed2a0d37bcc237fea1467c40f834
-Size (vulkan-headers-1.3.296.tar.gz) = 2358739 bytes
+BLAKE2s (vulkan-headers-1.4.321.tar.gz) = badbffdf461b8c37dd2a0ef16183f5f3f93513f6a62978e8c290466a7e727a04
+SHA512 (vulkan-headers-1.4.321.tar.gz) = d44c9dd69e5468b4d5f00283b006d7c55e62d74fafaa404ace07dcf0cd0f7594054d1c3a6b5146bf608caf846a695be8e90a35224d7ef1a0610d53922ce1cb4b
+Size (vulkan-headers-1.4.321.tar.gz) = 2760168 bytes

Index: pkgsrc/graphics/vulkan-tools/Makefile
diff -u pkgsrc/graphics/vulkan-tools/Makefile:1.1 pkgsrc/graphics/vulkan-tools/Makefile:1.2
--- pkgsrc/graphics/vulkan-tools/Makefile:1.1   Sat Mar  8 22:57:40 2025
+++ pkgsrc/graphics/vulkan-tools/Makefile       Sat Oct  4 12:39:56 2025
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2025/03/08 22:57:40 jakllsch Exp $
+# $NetBSD: Makefile,v 1.2 2025/10/04 12:39:56 tnn Exp $
 
-DISTNAME=              vulkan-tools-1.3.296.0 # matches vulkan-headers
+DISTNAME=              vulkan-tools-1.4.321.0 # matches vulkan-headers
 CATEGORIES=            graphics
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=KhronosGroup/}
 GITHUB_PROJECT=                Vulkan-Tools
 GITHUB_TAG=            vulkan-sdk-${PKGVERSION_NOREV}
-GITHUB_SUBMODULES=     zeux volk 1.3.295 volk
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/KhronosGroup/Vulkan-Tools/
@@ -20,5 +19,6 @@ USE_TOOLS+=   pkg-config
 
 .include "../../devel/cmake/build.mk"
 .include "../../devel/wayland/buildlink3.mk"
+.include "../../devel/wayland-protocols/buildlink3.mk"
 .include "../../graphics/vulkan-headers/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/vulkan-tools/distinfo
diff -u pkgsrc/graphics/vulkan-tools/distinfo:1.2 pkgsrc/graphics/vulkan-tools/distinfo:1.3
--- pkgsrc/graphics/vulkan-tools/distinfo:1.2   Sun Mar 16 21:48:12 2025
+++ pkgsrc/graphics/vulkan-tools/distinfo       Sat Oct  4 12:39:56 2025
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.2 2025/03/16 21:48:12 wiz Exp $
+$NetBSD: distinfo,v 1.3 2025/10/04 12:39:56 tnn Exp $
 
-BLAKE2s (vulkan-tools-1.3.296.0.tar.gz) = 29e6f612fa7812bf7156a1246c060d16947a14bbdfb29056054461fff05cb5d6
-SHA512 (vulkan-tools-1.3.296.0.tar.gz) = 66bc89272f150198cd52f2971ad67a2fd6c922ac4bafb420c0d54788ca6bab2246e8a153a09eccce15a87e1fe16fdeef16af1c6b6b13386bff79dd73858f3cae
-Size (vulkan-tools-1.3.296.0.tar.gz) = 757355 bytes
-BLAKE2s (zeux-volk-1.3.295.tar.gz) = 403e8df2d3620228fce6b97e618f0785200167ac62a1674c4b528bc140c5847e
-SHA512 (zeux-volk-1.3.295.tar.gz) = 1e0b05f0a7aa9e185b4b7ef42d53c1a23ccb8511cd3c2821e8976c11130ea196a24612ca18319fc2c0ac99bc2b1d334fc62ea9863f45800007b9bc92978da665
-Size (zeux-volk-1.3.295.tar.gz) = 63127 bytes
-SHA1 (patch-CMakeLists.txt) = b8096df88d59fe8771635f0e9a9ac18deca56599
-SHA1 (patch-cube_cube.cpp) = c3340d43b4db29d98e6d9167432248fa23262364
+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_cube.c) = 662d641041852e2fc049abba57623ca52a88eb5b
+SHA1 (patch-cube_cube.cpp) = 8e960de47586bf0bc8e148b1c3b288d305c58831

Index: pkgsrc/graphics/vulkan-tools/patches/patch-cube_cube.cpp
diff -u pkgsrc/graphics/vulkan-tools/patches/patch-cube_cube.cpp:1.1 pkgsrc/graphics/vulkan-tools/patches/patch-cube_cube.cpp:1.2
--- pkgsrc/graphics/vulkan-tools/patches/patch-cube_cube.cpp:1.1        Sun Mar 16 21:48:13 2025
+++ pkgsrc/graphics/vulkan-tools/patches/patch-cube_cube.cpp    Sat Oct  4 12:39:56 2025
@@ -1,15 +1,53 @@
-$NetBSD: patch-cube_cube.cpp,v 1.1 2025/03/16 21:48:13 wiz Exp $
+$NetBSD: patch-cube_cube.cpp,v 1.2 2025/10/04 12:39:56 tnn Exp $
 
 Allow building on NetBSD.
 
---- cube/cube.cpp.orig 2025-03-16 21:47:14.580034359 +0000
+--- cube/cube.cpp.orig 2025-10-04 12:29:34.996749955 +0000
 +++ cube/cube.cpp
-@@ -3387,7 +3387,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
-     return static_cast<int>(msg.wParam);
+@@ -40,7 +40,9 @@
+ #include "xcb_loader.h"
+ #endif
+ #if defined(VK_USE_PLATFORM_WAYLAND_KHR)
++#if defined(__linux__)
+ #include <linux/input.h>
++#endif
+ #include "wayland_loader.h"
+ #endif
+ #if defined(VK_USE_PLATFORM_FUCHSIA)
+@@ -578,9 +580,11 @@ static void pointer_handle_motion(void *
+ static void pointer_handle_button(void *data, struct wl_pointer *wl_pointer, uint32_t serial, uint32_t time, uint32_t button,
+                                   uint32_t state) {
+     Demo &demo = *static_cast<Demo *>(data);
++#if defined(__linux__)
+     if (button == BTN_LEFT && state == WL_POINTER_BUTTON_STATE_PRESSED) {
+         xdg_toplevel_move(demo.window_toplevel, demo.seat, serial);
+     }
++#endif
  }
  
--#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__QNX__) || defined(__GNU__)
-+#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__QNX__) || defined(__GNU__) || defined(__NetBSD__)
+ static void pointer_handle_axis(void *data, struct wl_pointer *wl_pointer, uint32_t time, uint32_t axis, wl_fixed_t value) {}
+@@ -600,6 +604,7 @@ static void keyboard_handle_key(void *da
+                                 uint32_t state) {
+     if (state != WL_KEYBOARD_KEY_STATE_RELEASED) return;
+     Demo &demo = *static_cast<Demo *>(data);
++#if defined(__linux__)
+     switch (key) {
+         case KEY_ESC:  // Escape
+             demo.quit = true;
+@@ -614,6 +619,7 @@ static void keyboard_handle_key(void *da
+             demo.pause = !demo.pause;
+             break;
+     }
++#endif
+ }
+ 
+ static void keyboard_handle_modifiers(void *data, wl_keyboard *keyboard, uint32_t serial, uint32_t mods_depressed,
+@@ -4133,7 +4139,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
+ }
+ 
+ #elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__QNX__) || defined(__GNU__) || \
+-    defined(__Fuchsia__)
++    defined(__Fuchsia__) || defined(__NetBSD__)
  
- int main(int argc, char **argv) {
-     Demo demo;
+ template <WsiPlatform WSI_PLATFORM>
+ void Demo::execute() {

Added files:

Index: pkgsrc/graphics/vulkan-tools/patches/patch-cube_cube.c
diff -u /dev/null pkgsrc/graphics/vulkan-tools/patches/patch-cube_cube.c:1.1
--- /dev/null   Sat Oct  4 12:39:56 2025
+++ pkgsrc/graphics/vulkan-tools/patches/patch-cube_cube.c      Sat Oct  4 12:39:56 2025
@@ -0,0 +1,53 @@
+$NetBSD: patch-cube_cube.c,v 1.1 2025/10/04 12:39:56 tnn Exp $
+
+Allow building on NetBSD.
+
+--- cube/cube.c.orig   2025-10-04 12:29:59.680457395 +0000
++++ cube/cube.c
+@@ -44,7 +44,9 @@
+ #include "xcb_loader.h"
+ #endif
+ #if defined(VK_USE_PLATFORM_WAYLAND_KHR)
++#if defined(__linux__)
+ #include <linux/input.h>
++#endif
+ #include "wayland_loader.h"
+ #endif
+ 
+@@ -3581,9 +3583,11 @@ static void pointer_handle_motion(void *
+ static void pointer_handle_button(void *data, struct wl_pointer *wl_pointer, uint32_t serial, uint32_t time, uint32_t button,
+                                   uint32_t state) {
+     struct demo *demo = data;
++#if defined(__linux__)
+     if (button == BTN_LEFT && state == WL_POINTER_BUTTON_STATE_PRESSED) {
+         xdg_toplevel_move(demo->xdg_toplevel, demo->seat, serial);
+     }
++#endif
+ }
+ 
+ static void pointer_handle_axis(void *data, struct wl_pointer *wl_pointer, uint32_t time, uint32_t axis, wl_fixed_t value) {}
+@@ -3603,6 +3607,7 @@ static void keyboard_handle_key(void *da
+                                 uint32_t state) {
+     if (state != WL_KEYBOARD_KEY_STATE_RELEASED) return;
+     struct demo *demo = data;
++#if defined(__linux__)
+     switch (key) {
+         case KEY_ESC:  // Escape
+             demo->quit = true;
+@@ -3617,6 +3622,7 @@ static void keyboard_handle_key(void *da
+             demo->pause = !demo->pause;
+             break;
+     }
++#endif
+ }
+ 
+ static void keyboard_handle_modifiers(void *data, struct wl_keyboard *keyboard, uint32_t serial, uint32_t mods_depressed,
+@@ -5079,7 +5085,7 @@ void android_main(struct android_app *ap
+         }
+     }
+ }
+-#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__QNX__) || defined(__GNU__)
++#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__QNX__) || defined(__GNU__) || defined(__NetBSD__)
+ int main(int argc, char **argv) {
+     struct demo demo;
+

Prev by Date: CVS commit: pkgsrc/parallel/spirv-llvm-translator
Next by Date: CVS commit: pkgsrc/graphics/vulkan-headers
Previous by Thread: CVS commit: pkgsrc/parallel/spirv-llvm-translator
Next by Thread: CVS commit: pkgsrc/graphics/vulkan-headers
Indexes:

Home | Main Index | Thread Index | Old Index