From 788deb64dc0695e8d04afb32ed904947f2a7591b Mon Sep 17 00:00:00 2001
From: Ryan Carsten Schmidt <ryandesign@macports.org>
Date: Sat, 8 Feb 2025 20:15:47 -0600
Subject: [PATCH] openal-soft: Update to 1.24.2

---
 audio/openal-soft/Portfile          | 17 +++-------
 audio/openal-soft/files/spans.patch | 50 -----------------------------
 2 files changed, 5 insertions(+), 62 deletions(-)
 delete mode 100644 audio/openal-soft/files/spans.patch

diff --git a/audio/openal-soft/Portfile b/audio/openal-soft/Portfile
index d0a4b5cd97105..c4c65de09ca8c 100644
--- a/audio/openal-soft/Portfile
+++ b/audio/openal-soft/Portfile
@@ -9,18 +9,13 @@ PortGroup               legacysupport 1.1
 legacysupport.newest_darwin_requires_legacy 14
 
 name                    openal-soft
-if {${os.platform} ne "darwin" || ${os.major} >= 19} {
-    version             1.24.1
+if {${os.platform} ne "darwin" || ${os.major} >= 17} {
+    version             1.24.2
     revision            0
-    checksums           rmd160  dd1cdf0610fe16b079bb540ecb0694f247302376 \
-                        sha256  0b9883d2e372d4ce66d37b142ab10b606a8a0ed3e873d1e070b1c878b695425a \
-                        size    991155
+    checksums           rmd160  8469975aa3192c68678db050b56ae17c26e04758 \
+                        sha256  cd4c88c9b7311cb6785db71c0ed64f5430c9d5b3454e0158314b2ef25ace3e61 \
+                        size    1020760
 } else {
-    # macOS 10.14:
-    # https://build.macports.org/builders/ports-10.14_x86_64-builder/builds/223612/steps/install-port/logs/stdio
-    # utils/makemhr/loaddef.cpp:33:10: fatal error: 'filesystem' file not found
-    # https://github.com/kcat/openal-soft/issues/1065
-    #
     # macOS 10.12:
     # https://build.macports.org/builders/ports-10.12_x86_64-builder/builds/291362/steps/install-port/logs/stdio
     # common/almalloc.h:78:46: error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer
@@ -67,8 +62,6 @@ if {[vercmp ${version} < 1.24.0]} {
 
     compiler.cxx_standard       2014
 } else {
-    patchfiles-append   spans.patch
-
     compiler.cxx_standard       2017
 }
 compiler.thread_local_storage   yes
diff --git a/audio/openal-soft/files/spans.patch b/audio/openal-soft/files/spans.patch
deleted file mode 100644
index afc2521d1ef20..0000000000000
--- a/audio/openal-soft/files/spans.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Fix:
-
-alc/alu.cpp:2148:9: error: member reference base type 'al::span' is not a structure or union
-        .subspan(Offset*FrameStep);
-        ^~~~~~~~
-alc/alu.cpp:2179:79: error: member reference base type 'al::span' is not a structure or union
-        const auto dst = al::span{static_cast<T*>(dstbuf), Offset+SamplesToDo}.subspan(Offset);
-                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~
-
-https://github.com/kcat/openal-soft/issues/1064
-https://github.com/kcat/openal-soft/commit/808bb2269ac8eb64ff5fbc030525740f003feb7a
-https://github.com/kcat/openal-soft/commit/5050d34920e8426d6f1c569567e94c45d2a9400f
---- alc/alu.cpp.orig	2024-11-27 21:21:16.000000000 -0600
-+++ alc/alu.cpp	2024-12-11 13:54:53.000000000 -0600
-@@ -2142,8 +2142,9 @@
-     ASSUME(FrameStep > 0);
-     ASSUME(SamplesToDo > 0);
- 
--    const auto output = al::span{static_cast<T*>(OutBuffer), (Offset+SamplesToDo)*FrameStep}
--        .subspan(Offset*FrameStep);
-+    /* Some Clang versions don't like calling subspan on an rvalue here. */
-+    const auto output_ = al::span{static_cast<T*>(OutBuffer), (Offset+SamplesToDo)*FrameStep};
-+    const auto output = output_.subspan(Offset*FrameStep);
-     size_t c{0};
-     for(const FloatBufferLine &inbuf : InBuffer)
-     {
-@@ -2174,7 +2175,9 @@
-     for(auto *dstbuf : OutBuffers)
-     {
-         const auto src = al::span{*srcbuf}.first(SamplesToDo);
--        const auto dst = al::span{static_cast<T*>(dstbuf), Offset+SamplesToDo}.subspan(Offset);
-+        /* Some Clang versions don't like calling subspan on an rvalue here. */
-+        const auto dst_ = al::span{static_cast<T*>(dstbuf), Offset+SamplesToDo};
-+        const auto dst = dst_.subspan(Offset);
-         std::transform(src.cbegin(), src.end(), dst.begin(), SampleConv<T>);
-         ++srcbuf;
-     }
---- core/uhjfilter.cpp.orig	2024-11-27 21:21:16.000000000 -0600
-+++ core/uhjfilter.cpp	2024-12-11 13:54:53.000000000 -0600
-@@ -216,7 +216,9 @@
-         const size_t todo{std::min(sSegmentSize-mFifoPos, SamplesToDo-base)};
-         auto wseg = winput.subspan(base, todo);
-         auto xseg = xinput.subspan(base, todo);
--        auto wxio = al::span{mWXInOut}.subspan(mFifoPos, todo);
-+        /* Some Clang versions don't like calling subspan on an rvalue here. */
-+        const auto wxio_ = al::span{mWXInOut};
-+        auto wxio = wxio_.subspan(mFifoPos, todo);
- 
-         /* Copy out the samples that were previously processed by the FFT. */
-         dstore = std::copy_n(wxio.begin(), todo, dstore);