CVS commit: pkgsrc/audio/openal-soft

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Wed Oct 29 07:54:22 UTC 2025

Modified Files:
        pkgsrc/audio/openal-soft: distinfo
        pkgsrc/audio/openal-soft/patches: patch-CMakeLists.txt
Added Files:
        pkgsrc/audio/openal-soft/patches: patch-common_althrd__setname.cpp

Log Message:
openal-soft: deal with pthread_setname_np(3) fallout


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/audio/openal-soft/distinfo
cvs rdiff -u -r1.7 -r1.8 \
    pkgsrc/audio/openal-soft/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/openal-soft/patches/patch-common_althrd__setname.cpp

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

Modified files:

Index: pkgsrc/audio/openal-soft/distinfo
diff -u pkgsrc/audio/openal-soft/distinfo:1.22 pkgsrc/audio/openal-soft/distinfo:1.23
--- pkgsrc/audio/openal-soft/distinfo:1.22      Mon Apr  7 11:47:57 2025
+++ pkgsrc/audio/openal-soft/distinfo   Wed Oct 29 07:54:22 2025
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.22 2025/04/07 11:47:57 adam Exp $
+$NetBSD: distinfo,v 1.23 2025/10/29 07:54:22 tnn Exp $
 
 BLAKE2s (openal-soft-1.24.3.tar.bz2) = f2383ecb76336685d3a5aeac432d3f20ec1417859f4b6f9612cdfee030de6dfc
 SHA512 (openal-soft-1.24.3.tar.bz2) = fab41a031f0f52aa0d5803d22722084885c1dd43727895ccd090b29fd3476621a97a5031b21e507d5175372dca910450b728a04fc65857698e1296831db8a6fe
 Size (openal-soft-1.24.3.tar.bz2) = 1025568 bytes
-SHA1 (patch-CMakeLists.txt) = 4821a484cc7f3315bae044df9959a46894f905cf
+SHA1 (patch-CMakeLists.txt) = 261937ed45ce36a88ce0fcea6d494a31ee05eeb6
 SHA1 (patch-alc_alconfig.cpp) = e8664e499dd23edd07bd0e4c42451013a1518c2b
 SHA1 (patch-alc_backends_alsa.cpp) = 3ee7f86e544d9b33ccbe9422eb87b9540623053a
+SHA1 (patch-common_althrd__setname.cpp) = f9bbe4f977497efdc2d847f0b972e15aea892521
 SHA1 (patch-include_AL_al.h) = e11858155db9d48ca8ae0d4e28479ec4d674411b

Index: pkgsrc/audio/openal-soft/patches/patch-CMakeLists.txt
diff -u pkgsrc/audio/openal-soft/patches/patch-CMakeLists.txt:1.7 pkgsrc/audio/openal-soft/patches/patch-CMakeLists.txt:1.8
--- pkgsrc/audio/openal-soft/patches/patch-CMakeLists.txt:1.7   Wed Nov 20 09:33:00 2024
+++ pkgsrc/audio/openal-soft/patches/patch-CMakeLists.txt       Wed Oct 29 07:54:22 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-CMakeLists.txt,v 1.7 2024/11/20 09:33:00 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.8 2025/10/29 07:54:22 tnn Exp $
 
-Disable libsndfile.
+Fix building.
 
---- CMakeLists.txt.orig        2024-11-16 12:20:51.000000000 +0000
+--- CMakeLists.txt.orig        2025-03-29 04:08:24.000000000 +0000
 +++ CMakeLists.txt
-@@ -1626,7 +1626,7 @@ if(ALSOFT_UTILS)
+@@ -1708,7 +1708,7 @@ if(ALSOFT_UTILS)
          set(EXTRA_INSTALLS ${EXTRA_INSTALLS} openal-info)
      endif()
  
@@ -13,7 +13,7 @@ Disable libsndfile.
          add_executable(uhjdecoder utils/uhjdecoder.cpp)
          target_compile_definitions(uhjdecoder PRIVATE ${CPP_DEFS})
          target_include_directories(uhjdecoder
-@@ -1729,7 +1729,7 @@ if(ALSOFT_EXAMPLES)
+@@ -1813,7 +1813,7 @@ if(ALSOFT_EXAMPLES)
  
      message(STATUS "Building example programs")
  

Added files:

Index: pkgsrc/audio/openal-soft/patches/patch-common_althrd__setname.cpp
diff -u /dev/null pkgsrc/audio/openal-soft/patches/patch-common_althrd__setname.cpp:1.1
--- /dev/null   Wed Oct 29 07:54:22 2025
+++ pkgsrc/audio/openal-soft/patches/patch-common_althrd__setname.cpp   Wed Oct 29 07:54:22 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-common_althrd__setname.cpp,v 1.1 2025/10/29 07:54:22 tnn Exp $
+
+NetBSD 11.99.3 changed the pthread_setname_np(3) prototype.
+
+--- common/althrd_setname.cpp.orig     2025-10-29 07:44:05.365440664 +0000
++++ common/althrd_setname.cpp
+@@ -50,6 +50,7 @@ using setname_t1 = int(*)(const char*);
+ using setname_t2 = int(*)(pthread_t, const char*);
+ using setname_t3 = void(*)(pthread_t, const char*);
+ using setname_t4 = int(*)(pthread_t, const char*, void*);
++using setname_t5 = int(*)(pthread_t, const char*, ...);
+ 
+ [[maybe_unused]] void setname_caller(setname_t1 func, const char *name)
+ { func(name); }
+@@ -63,6 +64,9 @@ using setname_t4 = int(*)(pthread_t, con
+ [[maybe_unused]] void setname_caller(setname_t4 func, const char *name)
+ { func(pthread_self(), "%s", const_cast<char*>(name)); /* NOLINT(*-const-cast) */ }
+ 
++[[maybe_unused]] void setname_caller(setname_t5 func, const char *name)
++{ func(pthread_self(), "%s", const_cast<char*>(name)); }
++
+ } // namespace
+ 
+ void althrd_setname(const char *name [[maybe_unused]])