<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/64b49eea64333a0c944d0c47b5f09318ece7a665">https://github.com/macports/macports-ports/commit/64b49eea64333a0c944d0c47b5f09318ece7a665</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 64b49eea64333a0c944d0c47b5f09318ece7a665
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Dec 6 09:42:17 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> rubberband: Update to 3.1.2
</span>---
audio/rubberband/Portfile | 12 ++---
audio/rubberband/files/arch.patch | 6 +--
audio/rubberband/files/meson-options.patch | 79 ------------------------------
audio/rubberband/files/meson-version.patch | 12 -----
audio/rubberband/files/version.patch | 22 ---------
5 files changed, 7 insertions(+), 124 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 7f5fd259fca..b0517b8cb8b 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;'>@@ -4,11 +4,11 @@ PortSystem 1.0
</span> PortGroup meson 1.0
name rubberband
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.1.2
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 6937ba41027b3987e26cb0ca6b38d40a7e2c8798 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a442551fe7d26fb4a54dd1c34178733dc9c76ac9ce051a02325f5cb35d154381 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 217586
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ebe50b64abe3ad03dcca3b77b75a9ce65825b191 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 dda7e257b14c59a1f59c5ccc4d6f19412039f77834275955aa0ff511779b98d2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 218361
</span>
categories audio
maintainers {ryandesign @ryandesign} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,10 +32,6 @@ depends_lib-append port:libsamplerate \
</span> port:libsndfile
patchfiles arch.patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://todo.sr.ht/~breakfastquay/rubberband/26
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append meson-options.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append meson-version.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append version.patch
</span>
# /usr/bin/../lib/c++/v1/atomic:535:2: error: <atomic> is not implemented
# https://hg.sr.ht/~breakfastquay/rubberband/rev/812a666b042abf0e41465bee9924c7ffc8532bbf
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/rubberband/files/arch.patch b/audio/rubberband/files/arch.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 025f08782d8..72a696470a7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/rubberband/files/arch.patch
</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;'>@@ -1,7 +1,7 @@
</span> Do not set -arch flags. MacPorts will do that.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson.build.orig 2022-10-21 08:51:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build 2022-10-30 03:50:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -430,17 +430,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2022-12-02 10:46:43.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2022-12-06 09:39:16.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -428,17 +428,6 @@
</span> '-exported_symbols_list', meson.current_source_dir() / 'vamp/vamp-plugin.list'
]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/rubberband/files/meson-options.patch b/audio/rubberband/files/meson-options.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6f562d925b1..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/rubberband/files/meson-options.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,79 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Experiment with Meson's built-in features support for optional targets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://todo.sr.ht/~breakfastquay/rubberband/26
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://hg.sr.ht/~breakfastquay/rubberband/rev/84170fc586a99b01c5e520f1026fb622484dc1a0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson.build.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -117,13 +117,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sleefdft_dep = dependency('sleefdft', version: '>= 3.3.0', required: false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- samplerate_dep = dependency('samplerate', version: '>= 0.1.8', required: false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- speexdsp_dep = dependency('speexdsp', version: '>= 1.0.0', required: false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--sndfile_dep = dependency('sndfile', version: '>= 1.0.16', required: false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--vamp_dep = dependency('vamp-sdk', version: '>= 2.9', required: false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--boost_unit_test_dep = dependency('boost', modules: ['unit_test_framework'], version: '>= 1.73', required: false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+sndfile_dep = dependency('sndfile', version: '>= 1.0.16', required: get_option('cmdline'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+vamp_dep = dependency('vamp-sdk', version: '>= 2.9', required: get_option('vamp'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+boost_unit_test_dep = dependency('boost', modules: ['unit_test_framework'], version: '>= 1.73', required: get_option('tests'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- thread_dep = dependency('threads')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--have_ladspa = cpp.has_header('ladspa.h', args: extra_include_args)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--have_lv2 = cpp.has_header('lv2.h', args: extra_include_args)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+have_ladspa = cpp.has_header('ladspa.h', args: extra_include_args, required: get_option('ladspa'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+have_lv2 = cpp.has_header('lv2.h', args: extra_include_args, required: get_option('lv2'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- have_sincos = cpp.has_function('sincos',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- prefix: '#define _GNU_SOURCE\n#include <math.h>',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- args: '-lm')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -142,7 +144,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # language pack, optionally, and only go on to JNI if that succeeds,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # making sure that nothing "clever" happens if Java is not found.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--have_java = add_languages('java', required: false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+have_java = add_languages('java', required: get_option('jni'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if have_java
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- jni_dep = dependency('jni', version: '>= 7.0.0', required: false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if not jni_dep.found()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -375,13 +377,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dirs: get_option('extra_lib_dirs'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- has_headers: ['vamp-sdk.h'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- header_args: extra_include_args,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- required: false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ required: get_option('vamp'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if not vamp_dep.found()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vamp_dep = cpp.find_library('vamp-sdk',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dirs: get_option('extra_lib_dirs'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- has_headers: ['vamp-sdk.h'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- header_args: extra_include_args,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- required: false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ required: get_option('vamp'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- have_vamp = vamp_dep.found()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -391,13 +393,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dirs: get_option('extra_lib_dirs'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- has_headers: ['sndfile.h'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- header_args: extra_include_args,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- required: false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ required: get_option('cmdline'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if not sndfile_dep.found()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sndfile_dep = cpp.find_library('sndfile-1',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dirs: get_option('extra_lib_dirs'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- has_headers: ['sndfile.h'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- header_args: extra_include_args,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- required: false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ required: get_option('cmdline'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- have_sndfile = sndfile_dep.found()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson_options.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson_options.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,3 +26,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- value: [],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description: 'Additional local library directories to search for dependencies.')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+option('jni', type: 'feature', value: 'auto')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+option('ladspa', type: 'feature', value: 'auto')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+option('lv2', type: 'feature', value: 'auto')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+option('vamp', type: 'feature', value: 'auto')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+option('cmdline', type: 'feature', value: 'auto')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+option('tests', type: 'feature', value: 'auto')
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/rubberband/files/meson-version.patch b/audio/rubberband/files/meson-version.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c864c6e91f2..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/rubberband/files/meson-version.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-meson.build:147: WARNING: Project targets '>= 0.53.0' but uses feature introduced in '0.62.0': dep 'jni' custom lookup.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson.build.orig 2022-10-21 08:51:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build 2022-10-30 04:11:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12,7 +12,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'b_ndebug=if-release',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'b_lundef=true',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- meson_version: '>= 0.53.0'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ meson_version: '>= 0.62.0'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rubberband_dynamic_library_version = '2.2.1'
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/rubberband/files/version.patch b/audio/rubberband/files/version.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 11c470de025..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/rubberband/files/version.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- rubberband/RubberBandStretcher.h.orig 2022-10-21 08:51:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ rubberband/RubberBandStretcher.h 2022-11-01 18:51:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,7 +24,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef RUBBERBAND_STRETCHER_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define RUBBERBAND_STRETCHER_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define RUBBERBAND_VERSION "3.1.0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define RUBBERBAND_VERSION "3.1.1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define RUBBERBAND_API_MAJOR_VERSION 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define RUBBERBAND_API_MINOR_VERSION 7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- rubberband/rubberband-c.h.orig 2022-10-21 08:51:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ rubberband/rubberband-c.h 2022-11-01 18:51:05.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,7 +28,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern "C" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define RUBBERBAND_VERSION "3.1.0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define RUBBERBAND_VERSION "3.1.1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define RUBBERBAND_API_MAJOR_VERSION 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define RUBBERBAND_API_MINOR_VERSION 7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>