CVS commit: pkgsrc/graphics/oculante

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Nov 14 08:22:21 UTC 2025

Modified Files:
        pkgsrc/graphics/oculante: distinfo
Added Files:
        pkgsrc/graphics/oculante/patches:
            patch-work_vendor_libaom-sys-0.17.1-rc.1+libaom.3.10.0_vendor_build_cmake_aom__optimization.cmake

Log Message:
oculante: fix build with nasm 3.0


To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 pkgsrc/graphics/oculante/distinfo
cvs rdiff -u -r0 -r1.1 \
    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.75 pkgsrc/graphics/oculante/distinfo:1.76
--- pkgsrc/graphics/oculante/distinfo:1.75      Thu Aug 21 18:46:33 2025
+++ pkgsrc/graphics/oculante/distinfo   Fri Nov 14 08:22:20 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.75 2025/08/21 18:46:33 wiz Exp $
+$NetBSD: distinfo,v 1.76 2025/11/14 08:22:20 wiz Exp $
 
 BLAKE2s (ab_glyph-0.2.29.crate) = 7e753e7f4d3c7fb96c56e4ea406e0e19f923e2e40a636e0224a4286378a2e88d
 SHA512 (ab_glyph-0.2.29.crate) = 7549251e27a0b77a86d9c3cf2775a625d5f3bf43840abc85a5937f2393889a5100bb90b2392bcff9d082900dd00bf0211f4feaeea09ec1b01e3925875e529c12
@@ -2671,3 +2671,4 @@ BLAKE2s (zvariant_utils-2.1.0.crate) = b
 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) = ad6e7a591a911d41fc8a7593d7837d0447f10aab

Added files:

Index: pkgsrc/graphics/oculante/patches/patch-work_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-work_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 08:22:21 2025
+++ pkgsrc/graphics/oculante/patches/patch-work_vendor_libaom-sys-0.17.1-rc.1+libaom.3.10.0_vendor_build_cmake_aom__optimization.cmake  Fri Nov 14 08:22:20 2025
@@ -0,0 +1,25 @@
+$NetBSD: patch-work_vendor_libaom-sys-0.17.1-rc.1+libaom.3.10.0_vendor_build_cmake_aom__optimization.cmake,v 1.1 2025/11/14 08:22:20 wiz Exp $
+
+Fix build with nasm 3.0.
+
+--- work/vendor/libaom-sys-0.17.1-rc.1+libaom.3.10.0/vendor/build/cmake/aom_optimization.cmake.orig    2006-07-24 01:21:28.000000000 +0000
++++ work/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")