<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9a0ce15df5115c453e280b1083ae6409f5398e15">https://github.com/macports/macports-ports/commit/9a0ce15df5115c453e280b1083ae6409f5398e15</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 9a0ce15df51 openal-soft: Try to fix build on macOS 10.15
</span>9a0ce15df51 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9a0ce15df5115c453e280b1083ae6409f5398e15
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Wed Dec 11 13:58:06 2024 -0600
<span style='display:block; white-space:pre;color:#404040;'> openal-soft: Try to fix build on macOS 10.15
</span>---
audio/openal-soft/Portfile | 2 ++
audio/openal-soft/files/spans.patch | 50 +++++++++++++++++++++++++++++++++++++
2 files changed, 52 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/openal-soft/Portfile b/audio/openal-soft/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 41e883dcddc..d0a4b5cd971 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/openal-soft/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/openal-soft/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,6 +67,8 @@ if {[vercmp ${version} < 1.24.0]} {
</span>
compiler.cxx_standard 2014
} else {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append spans.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> compiler.cxx_standard 2017
}
compiler.thread_local_storage yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/openal-soft/files/spans.patch b/audio/openal-soft/files/spans.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..afc2521d1ef
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/openal-soft/files/spans.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,50 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+alc/alu.cpp:2148:9: error: member reference base type 'al::span' is not a structure or union
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .subspan(Offset*FrameStep);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^~~~~~~~
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+alc/alu.cpp:2179:79: error: member reference base type 'al::span' is not a structure or union
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const auto dst = al::span{static_cast<T*>(dstbuf), Offset+SamplesToDo}.subspan(Offset);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/kcat/openal-soft/issues/1064
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/kcat/openal-soft/commit/808bb2269ac8eb64ff5fbc030525740f003feb7a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/kcat/openal-soft/commit/5050d34920e8426d6f1c569567e94c45d2a9400f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- alc/alu.cpp.orig 2024-11-27 21:21:16.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ alc/alu.cpp 2024-12-11 13:54:53.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2142,8 +2142,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ASSUME(FrameStep > 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ASSUME(SamplesToDo > 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const auto output = al::span{static_cast<T*>(OutBuffer), (Offset+SamplesToDo)*FrameStep}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .subspan(Offset*FrameStep);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* Some Clang versions don't like calling subspan on an rvalue here. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const auto output_ = al::span{static_cast<T*>(OutBuffer), (Offset+SamplesToDo)*FrameStep};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const auto output = output_.subspan(Offset*FrameStep);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_t c{0};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for(const FloatBufferLine &inbuf : InBuffer)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2174,7 +2175,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for(auto *dstbuf : OutBuffers)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const auto src = al::span{*srcbuf}.first(SamplesToDo);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const auto dst = al::span{static_cast<T*>(dstbuf), Offset+SamplesToDo}.subspan(Offset);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* Some Clang versions don't like calling subspan on an rvalue here. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const auto dst_ = al::span{static_cast<T*>(dstbuf), Offset+SamplesToDo};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const auto dst = dst_.subspan(Offset);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::transform(src.cbegin(), src.end(), dst.begin(), SampleConv<T>);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ++srcbuf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- core/uhjfilter.cpp.orig 2024-11-27 21:21:16.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ core/uhjfilter.cpp 2024-12-11 13:54:53.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -216,7 +216,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const size_t todo{std::min(sSegmentSize-mFifoPos, SamplesToDo-base)};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto wseg = winput.subspan(base, todo);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto xseg = xinput.subspan(base, todo);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- auto wxio = al::span{mWXInOut}.subspan(mFifoPos, todo);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* Some Clang versions don't like calling subspan on an rvalue here. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const auto wxio_ = al::span{mWXInOut};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ auto wxio = wxio_.subspan(mFifoPos, todo);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Copy out the samples that were previously processed by the FFT. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dstore = std::copy_n(wxio.begin(), todo, dstore);
</span></pre><pre style='margin:0'>
</pre>