<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2d398647589b0b0ec5e652e1945e9fcebbfa0f08">https://github.com/macports/macports-ports/commit/2d398647589b0b0ec5e652e1945e9fcebbfa0f08</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 2d398647589 audiowmark: fix build with Clang >=15
</span>2d398647589 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2d398647589b0b0ec5e652e1945e9fcebbfa0f08
</span>Author: aeiouaeiouaeiouaeiouaeiouaeiou <aeioudev@outlook.com>
AuthorDate: Sat Apr 29 10:21:29 2023 +0300
<span style='display:block; white-space:pre;color:#404040;'> audiowmark: fix build with Clang >=15
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * make the ffmpeg dependency permanent
</span>---
audio/audiowmark/Portfile | 20 +++++++-------
audio/audiowmark/files/patch-llvm-random.diff | 38 +++++++++++++++++++++++++++
2 files changed, 47 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audiowmark/Portfile b/audio/audiowmark/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9c92ef1bb98..3644b1b8d27 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audiowmark/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audiowmark/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup compiler_blacklist_versions 1.0
</span>
gitlab.instance https://code.uplex.de
gitlab.setup stefan audiowmark 0.6.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
categories audio
maintainers {@aeiouaeiouaeiouaeiouaeiouaeiou outlook.com:aeioudev} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,23 +35,21 @@ depends_build port:pkgconfig \
</span> port:autoconf-archive
depends_lib port:fftw-3-single \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libavcodec.dylib:ffmpeg \
</span> port:libsndfile \
port:libgcrypt \
port:libzita-resampler \
port:mpg123
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-llvm-random.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> compiler.cxx_standard \
2014
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Random generator is incompatible with LLVM 15;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# also do not use Xcode Clang due to failing buildbots
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/swesterfeld/audiowmark/issues/29
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist {clang} macports-clang-15
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant ffmpeg description {Build with HTTP Live Streaming support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/libavcodec.dylib:ffmpeg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-ffmpeg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# do not use Xcode Clang due to failing buildbots
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist {clang}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# videowmark always requires ffmpeg libraries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --with-ffmpeg
</span>
use_autoreconf yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audiowmark/files/patch-llvm-random.diff b/audio/audiowmark/files/patch-llvm-random.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..be8d983e552
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audiowmark/files/patch-llvm-random.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 99ffa6b4a4f311c88b6b38b31e579b2102453f3a Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Stefan Westerfeld <stefan@space.twc.de>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 28 Jan 2023 20:49:45 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Make random number generator code compile with clang++-15 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libc++-15.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+A uniform random bit generator G needs to have a typedef for G::result_type.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See issue #29.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Stefan Westerfeld <stefan@space.twc.de>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/random.hh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/random.hh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,7 +49,9 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Random (uint64_t seed, Stream stream);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ~Random();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint64_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ typedef uint64_t result_type;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ result_type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ operator()()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (buffer_pos == buffer.size())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -57,12 +59,12 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return buffer[buffer_pos++];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static constexpr uint64_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static constexpr result_type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ min()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static constexpr uint64_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static constexpr result_type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ max()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return UINT64_MAX;
</span></pre><pre style='margin:0'>
</pre>