CVS commit: pkgsrc/graphics/oculante

["pin" <pin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pin
Date:           Fri Nov 14 10:19:19 UTC 2025

Modified Files:
        pkgsrc/graphics/oculante: distinfo
Added Files:
        pkgsrc/graphics/oculante/patches:
            patch-.._vendor_glsl-to-spirv-0.1.7_glslang_CMakeLists.txt
            patch-.._vendor_libaom-sys-0.17.1-rc.1+libaom.3.10.0_vendor_build_cmake_aom_optimization.cmake
Removed Files:
        pkgsrc/graphics/oculante/patches: patch-aa
            patch-work_vendor_libaom-sys-0.17.1-rc.1+libaom.3.10.0_vendor_build_cmake_aom__optimization.cmake

Log Message:
graphics/oculante: change patch naming


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 pkgsrc/graphics/oculante/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/oculante/patches/patch-.._vendor_glsl-to-spirv-0.1.7_glslang_CMakeLists.txt \
    pkgsrc/graphics/oculante/patches/patch-.._vendor_libaom-sys-0.17.1-rc.1+libaom.3.10.0_vendor_build_cmake_aom_optimization.cmake
cvs rdiff -u -r1.1 -r0 pkgsrc/graphics/oculante/patches/patch-aa
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/graphics/oculante/patches/patch-work_vendor_libaom-sys-0.17.1-rc.1+libaom.3.10.0_vendor_build_cmake_aom__optimization.cmake

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

Modified files:

Index: pkgsrc/graphics/oculante/distinfo
diff -u pkgsrc/graphics/oculante/distinfo:1.77 pkgsrc/graphics/oculante/distinfo:1.78
--- pkgsrc/graphics/oculante/distinfo:1.77      Fri Nov 14 08:28:04 2025
+++ pkgsrc/graphics/oculante/distinfo   Fri Nov 14 10:19:18 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.77 2025/11/14 08:28:04 wiz Exp $
+$NetBSD: distinfo,v 1.78 2025/11/14 10:19:18 pin Exp $
 
 BLAKE2s (ab_glyph-0.2.29.crate) = 7e753e7f4d3c7fb96c56e4ea406e0e19f923e2e40a636e0224a4286378a2e88d
 SHA512 (ab_glyph-0.2.29.crate) = 7549251e27a0b77a86d9c3cf2775a625d5f3bf43840abc85a5937f2393889a5100bb90b2392bcff9d082900dd00bf0211f4feaeea09ec1b01e3925875e529c12
@@ -2670,5 +2670,5 @@ Size (zvariant_derive-4.2.0.crate) = 110
 BLAKE2s (zvariant_utils-2.1.0.crate) = b142d63425365aedf109bafac551bf52a32897836b938d4835a415a0444db92c
 SHA512 (zvariant_utils-2.1.0.crate) = 345b70d1106b37df41426efdb1ba49bf270e00898381c2a8021b5761c59efdea55def45cb2e2598b130b6cba8733503f3997a55578bca90867ab3e8f2346f80e
 Size (zvariant_utils-2.1.0.crate) = 7043 bytes
-SHA1 (patch-aa) = f66825e49bc8a38aca5ddd6c6d352c3d0bd1786c
-SHA1 (patch-work_vendor_libaom-sys-0.17.1-rc.1+libaom.3.10.0_vendor_build_cmake_aom__optimization.cmake) = 83cd0847d2957cee67e4eba17387af22cb19b9bc
+SHA1 (patch-.._vendor_glsl-to-spirv-0.1.7_glslang_CMakeLists.txt) = 2bcdf36eb852b5979f2f8ad855f75889a4d814a7
+SHA1 (patch-.._vendor_libaom-sys-0.17.1-rc.1+libaom.3.10.0_vendor_build_cmake_aom_optimization.cmake) = 194b7891aeea874e99b9e340127be02aeb16f286

Added files:

Index: pkgsrc/graphics/oculante/patches/patch-.._vendor_glsl-to-spirv-0.1.7_glslang_CMakeLists.txt
diff -u /dev/null pkgsrc/graphics/oculante/patches/patch-.._vendor_glsl-to-spirv-0.1.7_glslang_CMakeLists.txt:1.1
--- /dev/null   Fri Nov 14 10:19:19 2025
+++ pkgsrc/graphics/oculante/patches/patch-.._vendor_glsl-to-spirv-0.1.7_glslang_CMakeLists.txt Fri Nov 14 10:19:18 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-.._vendor_glsl-to-spirv-0.1.7_glslang_CMakeLists.txt,v 1.1 2025/11/14 10:19:18 pin Exp $
+
+Fix build with cmake 4.
+
+--- ../vendor/glsl-to-spirv-0.1.7/glslang/CMakeLists.txt.orig  2025-11-14 08:59:24.451378764 +0000
++++ ../vendor/glsl-to-spirv-0.1.7/glslang/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ # increase to 3.1 once all major distributions
+ # include a version of CMake >= 3.1
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 3.5)
+ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+ 
+ # Adhere to GNU filesystem layout conventions
Index: pkgsrc/graphics/oculante/patches/patch-.._vendor_libaom-sys-0.17.1-rc.1+libaom.3.10.0_vendor_build_cmake_aom_optimization.cmake
diff -u /dev/null pkgsrc/graphics/oculante/patches/patch-.._vendor_libaom-sys-0.17.1-rc.1+libaom.3.10.0_vendor_build_cmake_aom_optimization.cmake:1.1
--- /dev/null   Fri Nov 14 10:19:19 2025
+++ pkgsrc/graphics/oculante/patches/patch-.._vendor_libaom-sys-0.17.1-rc.1+libaom.3.10.0_vendor_build_cmake_aom_optimization.cmake     Fri Nov 14 10:19:19 2025
@@ -0,0 +1,26 @@
+$NetBSD: patch-.._vendor_libaom-sys-0.17.1-rc.1+libaom.3.10.0_vendor_build_cmake_aom_optimization.cmake,v 1.1 2025/11/14 10:19:19 pin Exp $
+
+Fix build with nasm 3.0.
+https://aomedia.googlesource.com/aom/+/6d2b7f71b98bfa28e372b1f2d85f137280bdb3de%5E%21/
+
+--- ../vendor/libaom-sys-0.17.1-rc.1+libaom.3.10.0/vendor/build/cmake/aom_optimization.cmake.orig      2025-11-14 09:01:28.320997460 +0000
++++ ../vendor/libaom-sys-0.17.1-rc.1+libaom.3.10.0/vendor/build/cmake/aom_optimization.cmake
+@@ -212,7 +212,7 @@ endfunction()
+ # Currently checks only for presence of required object formats and support for
+ # the -Ox argument (multipass optimization).
+ function(test_nasm)
+-  execute_process(COMMAND ${CMAKE_ASM_NASM_COMPILER} -hf
++  execute_process(COMMAND ${CMAKE_ASM_NASM_COMPILER} -hO
+                   OUTPUT_VARIABLE nasm_helptext)
+ 
+   if(NOT "${nasm_helptext}" MATCHES "-Ox")
+@@ -220,6 +220,9 @@ function(test_nasm)
+       FATAL_ERROR "Unsupported nasm: multipass optimization not supported.")
+   endif()
+ 
++  execute_process(COMMAND ${CMAKE_ASM_NASM_COMPILER} -hf
++                  OUTPUT_VARIABLE nasm_helptext)
++
+   if("${AOM_TARGET_CPU}" STREQUAL "x86")
+     if("${AOM_TARGET_SYSTEM}" STREQUAL "Darwin")
+       if(NOT "${nasm_helptext}" MATCHES "macho32")