commit 0f5bfb068bdded7d0de92e884dc310d45e92055c
from: sthen <sthen@openbsd.org>
date: Wed Jan 29 10:59:26 2025 UTC

update to openal-1.24.2 and patch to fix 32-bit archs, from Brad, ok
David Carlier (maintainer)

commit - d88ecdbbbe27f90e6c89e3860363fc0c14ca9ef5
commit + 0f5bfb068bdded7d0de92e884dc310d45e92055c
blob - f0997f255e4552b7a8b2bd512af778a8d0089902
blob + c9eaca90d7ce3848b28c734fbe931a7c876e28c0
--- audio/openal/Makefile
+++ audio/openal/Makefile
@@ -1,6 +1,6 @@
 COMMENT =	cross-platform 3D audio API
 
-V =		1.24.1
+V =		1.24.2
 DISTNAME =	openal-soft-$V
 PKGNAME =	openal-$V
 EPOCH =		0
blob - dd0827a0677479415822d56dc7cf2d550f4ca547
blob + 25b4c473bd98ad420d8637c0c00ed1f07cf152e5
--- audio/openal/distinfo
+++ audio/openal/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openal-soft-1.24.1.tar.bz2) = C5iD0uNy1M5m03sUKrELYGqKDtPoc9HgcLHIeLaVQlo=
-SIZE (openal-soft-1.24.1.tar.bz2) = 991155
+SHA256 (openal-soft-1.24.2.tar.bz2) = zUyIybcxHLZ4XbccDtZPVDDJ1bNFTgFYMUsu8lrOPmE=
+SIZE (openal-soft-1.24.2.tar.bz2) = 1020760
blob - cd53043d12df2ac98cb19adaf7dc5898a3d08b63
blob + 7aa60019bd68e97333e7961ee10e6082efcb3b48
--- audio/openal/patches/patch-CMakeLists_txt
+++ audio/openal/patches/patch-CMakeLists_txt
@@ -1,7 +1,7 @@
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -1616,7 +1616,7 @@ endif()
+@@ -1649,7 +1649,7 @@ endif()
  
  if(ALSOFT_INSTALL_CONFIG)
      install(FILES alsoftrc.sample
blob - 86842e0b0d022440e6846aa03fe7e2b49d8bcdcb
blob + 3b7f13849bf545464c16e3d8b1363d6b1a895b29
--- audio/openal/patches/patch-alc_alconfig_cpp
+++ audio/openal/patches/patch-alc_alconfig_cpp
@@ -1,12 +1,12 @@
 Index: alc/alconfig.cpp
 --- alc/alconfig.cpp.orig
 +++ alc/alconfig.cpp
-@@ -384,7 +384,7 @@ void ReadALConfig()
+@@ -381,7 +381,7 @@ void ReadALConfig()
+ 
  void ReadALConfig()
  {
-     namespace fs = std::filesystem;
 -    fs::path path{"/etc/openal/alsoft.conf"};
 +    fs::path path{"${SYSCONFDIR}/openal/alsoft.conf"};
  
-     TRACE("Loading config %s...\n", reinterpret_cast<const char*>(path.u8string().c_str()));
-     if(std::ifstream f{path}; f.is_open())
+     TRACE("Loading config {}...", al::u8_as_char(path.u8string()));
+     if(fs::ifstream f{path}; f.is_open())
blob - db435bd57b0e0bd599e03a2fb9b211ae7eb7f6ce (mode 644)
blob + /dev/null
--- audio/openal/patches/patch-common_althreads_h
+++ /dev/null
@@ -1,24 +0,0 @@
-- Don't assume only Apple can't use C11 threads
-  563a1c2e75622a05afdaf0fc139c70c25f86b7a5
-
-Index: common/althreads.h
---- common/althreads.h.orig
-+++ common/althreads.h
-@@ -9,7 +9,7 @@
- #define WIN32_LEAN_AND_MEAN
- #include <windows.h>
- 
--#elif defined(__APPLE__)
-+#elif defined(__STDC_NO_THREADS__) || !__has_include(<threads.h>)
- 
- #include <pthread.h>
- 
-@@ -79,7 +79,7 @@ class tss { (public)
-     [[nodiscard]]
-     auto get() const noexcept -> T { return from_ptr(TlsGetValue(mTss)); }
- 
--#elif defined(__APPLE__)
-+#elif defined(__STDC_NO_THREADS__) || !__has_include(<threads.h>)
- 
-     pthread_key_t mTss{};
- 
blob - /dev/null
blob + 4881e7ddaa517fe99ce56e54e96009f7d9d2b3b2 (mode 644)
--- /dev/null
+++ audio/openal/patches/patch-utils_makemhr_loaddef_cpp
@@ -0,0 +1,17 @@
+Fix some casts for some 32-bit platforms
+9fdf662bcbd86cf26202f8718d6c5ca24655652e
+
+Index: utils/makemhr/loaddef.cpp
+--- utils/makemhr/loaddef.cpp.orig
++++ utils/makemhr/loaddef.cpp
+@@ -209,8 +209,8 @@ auto TrLoad(TokenReaderT *tr) -> int
+         // Load TRLoadSize (or less if at the end of the file) per read.
+         toLoad = TRLoadSize;
+ 
+-        const auto in = tr->mIn&TRRingMask;
+-        std::streamsize count{TRRingSize - in};
++        const auto in = tr->mIn & std::streamsize{TRRingMask};
++        const auto count = std::streamsize{TRRingSize} - in;
+         if(count < toLoad)
+         {
+             istream.read(al::to_address(tr->mRing.begin() + in), count);