<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e2ebda7bb07a4a5dd823440f0b55d3e3544f53f0">https://github.com/macports/macports-ports/commit/e2ebda7bb07a4a5dd823440f0b55d3e3544f53f0</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 e2ebda7bb07 openal-soft: patch to fix template-related build errors
</span>e2ebda7bb07 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e2ebda7bb07a4a5dd823440f0b55d3e3544f53f0
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Mon Jan 11 14:12:02 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> openal-soft: patch to fix template-related build errors
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/61431
</span>---
audio/openal-soft/Portfile | 3 +-
.../files/openal-soft-alnumeric-templates.patch | 90 ++++++++++++++++++++++
2 files changed, 92 insertions(+), 1 deletion(-)
<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 66983b9af03..5a4a3cccb25 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;'>@@ -45,7 +45,8 @@ depends_lib-append port:libmysofa \
</span> port:zlib
patchfiles ${name}-uint64_t-header-check.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${name}-add-missing-include-coreaudio.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${name}-add-missing-include-coreaudio.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${name}-alnumeric-templates.patch
</span> patch.pre_args -p1
compiler.cxx_standard 2014
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/openal-soft/files/openal-soft-alnumeric-templates.patch b/audio/openal-soft/files/openal-soft-alnumeric-templates.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7ffdb33133e
</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/openal-soft-alnumeric-templates.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,90 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/common/alnumeric.h b/common/alnumeric.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e16d7c1c..b9384a7f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/common/alnumeric.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/common/alnumeric.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -107,28 +107,17 @@ inline size_t RoundUp(size_t value, size_t r) noexcept
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * and PopCount (population count/count 1 bits) methods, for 32- and 64-bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * integers. The CountTrailingZeros results are *UNDEFINED* if the value is 0.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-template<typename T>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-inline int PopCount(T val) = delete;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-template<typename T>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-inline int CountTrailingZeros(T val) = delete;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __GNUC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Define variations for unsigned (long (long)) int, since we don't know what
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * uint32/64_t are typedef'd to.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-template<>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline int PopCount(unsigned long long val) { return __builtin_popcountll(val); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-template<>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline int PopCount(unsigned long val) { return __builtin_popcountl(val); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-template<>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline int PopCount(unsigned int val) { return __builtin_popcount(val); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-template<>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline int CountTrailingZeros(unsigned long long val) { return __builtin_ctzll(val); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-template<>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline int CountTrailingZeros(unsigned long val) { return __builtin_ctzl(val); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-template<>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline int CountTrailingZeros(unsigned int val) { return __builtin_ctz(val); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -140,7 +129,6 @@ inline int CountTrailingZeros(unsigned int val) { return __builtin_ctz(val); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * as the ntz2 variant. These likely aren't the most efficient methods, but
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * they're good enough if the GCC built-ins aren't available.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-template<>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline int PopCount(uint32_t v)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ v = v - ((v >> 1) & 0x55555555u);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -148,7 +136,6 @@ inline int PopCount(uint32_t v)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ v = (v + (v >> 4)) & 0x0f0f0f0fu;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return static_cast<int>((v * 0x01010101u) >> 24);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-template<>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline int PopCount(uint64_t v)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ v = v - ((v >> 1) & 0x5555555555555555_u64);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -159,14 +146,12 @@ inline int PopCount(uint64_t v)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(_WIN64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-template<>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline int CountTrailingZeros(uint32_t v)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned long idx = 32;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _BitScanForward(&idx, v);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return static_cast<int>(idx);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-template<>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline int CountTrailingZeros(uint64_t v)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned long idx = 64;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -176,14 +161,12 @@ inline int CountTrailingZeros(uint64_t v)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(_WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-template<>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline int CountTrailingZeros(uint32_t v)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned long idx = 32;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _BitScanForward(&idx, v);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return static_cast<int>(idx);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-template<>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline int CountTrailingZeros(uint64_t v)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned long idx = 64;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -197,10 +180,8 @@ inline int CountTrailingZeros(uint64_t v)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-template<>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline int CountTrailingZeros(uint32_t value)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { return PopCount(~value & (value - 1)); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-template<>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline int CountTrailingZeros(uint64_t value)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { return PopCount(~value & (value - 1)); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>