<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7132745bc362fe40057a5edc8bbd341ffb41b363">https://github.com/macports/macports-ports/commit/7132745bc362fe40057a5edc8bbd341ffb41b363</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7132745bc362fe40057a5edc8bbd341ffb41b363
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Dec 22 08:53:38 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> rubberband: Use the right deployment target
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Set -mmacosx-version-min to prevent the build system from setting its
</span><span style='display:block; white-space:pre;color:#404040;'> own value.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/64268
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Patch the build system so it doesn't request C++14 for no reason.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Patch the build system so it doesn't add -arch flags that might be
</span><span style='display:block; white-space:pre;color:#404040;'> different from the ones MacPorts wants to use.
</span>---
audio/rubberband/Portfile | 14 ++++++++++----
audio/rubberband/files/arch.patch | 21 +++++++++++++++++++++
audio/rubberband/files/cxx_standard.patch | 14 ++++++++++++++
3 files changed, 45 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/rubberband/Portfile b/audio/rubberband/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 770735ed563..897fec25466 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/rubberband/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/rubberband/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup meson 1.0
</span>
name rubberband
version 2.0.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> checksums rmd160 eca44efc013839a745d558a762a716db0465a2b3 \
sha256 eccbf0545496ce3386a2433ceec31e6576a76ed6884310e4b465003bfe260286 \
size 175527
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,9 +25,6 @@ homepage https://breakfastquay.com/rubberband/
</span> master_sites https://breakfastquay.com/files/releases/
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# meson.build:103:0: ERROR: C++ Compiler does not support -std=c++14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2014
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build-append \
port:cctools \
port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,9 +32,18 @@ depends_build-append \
</span> depends_lib-append port:libsamplerate \
port:libsndfile
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles arch.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cxx_standard.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 1998
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args -Dfft=vdsp \
-Dresampler=libsamplerate
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# meson.build sets -mmacosx-version-min to a value we didn't ask for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# unless we set it ourselves.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cxxflags-append -mmacosx-version-min=${macosx_deployment_target}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {[string match *clang* ${configure.cxx}]} {
configure.ldflags-append -stdlib=${configure.cxx_stdlib}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/rubberband/files/arch.patch b/audio/rubberband/files/arch.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..903498ebdf7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/rubberband/files/arch.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Do not set -arch flags. MacPorts will do that.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2021-10-22 08:03:36.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2021-12-22 08:44:08.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -333,17 +333,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '-exported_symbols_list', meson.source_root() / 'vamp/vamp-plugin.list'
</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;'>+- if architecture == 'aarch64'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- arch_flags += [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '-arch', 'arm64',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elif architecture == 'x86_64'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- arch_flags += [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '-arch', 'x86_64',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else # begin architecture != 'aarch64' or 'x86_64'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- error('Build for architecture ' + architecture + ' is not supported on this platform')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif # end architecture
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ have_version_min = false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arg: get_option('cpp_args')
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/rubberband/files/cxx_standard.patch b/audio/rubberband/files/cxx_standard.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..583c604f7c5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/rubberband/files/cxx_standard.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Do not require C++14 for no reason.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2021-10-22 08:03:36.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2021-12-22 08:46:23.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,9 +5,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version: '2.0.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ license: 'GPL-2.0-or-later',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_options: [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # All Rubber Band code is actually C++98, but some compilers no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # longer support that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'cpp_std=c++14',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'cpp_std=c++98',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'buildtype=release',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'b_ndebug=if-release',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'b_lundef=true',
</span></pre><pre style='margin:0'>
</pre>