From 3e2e3de7e3ea6a57a8f328eb6f548fa1347537fb Mon Sep 17 00:00:00 2001 From: triallax Date: Tue, 15 Aug 2023 14:50:56 +0100 Subject: [PATCH 1/2] rubberband: update to 3.3.0. --- ...6f472e3271ad64ab6c2968920e5e95c17080.patch | 26 ------------------- srcpkgs/rubberband/template | 18 ++++++++----- 2 files changed, 12 insertions(+), 32 deletions(-) delete mode 100644 srcpkgs/rubberband/patches/df596f472e3271ad64ab6c2968920e5e95c17080.patch diff --git a/srcpkgs/rubberband/patches/df596f472e3271ad64ab6c2968920e5e95c17080.patch b/srcpkgs/rubberband/patches/df596f472e3271ad64ab6c2968920e5e95c17080.patch deleted file mode 100644 index 15d5150a48a712..00000000000000 --- a/srcpkgs/rubberband/patches/df596f472e3271ad64ab6c2968920e5e95c17080.patch +++ /dev/null @@ -1,26 +0,0 @@ -From df596f472e3271ad64ab6c2968920e5e95c17080 Mon Sep 17 00:00:00 2001 -From: Chris Cannam -Date: Mon, 26 Jun 2023 11:38:20 +0100 -Subject: [PATCH] Minor threshold tweak - ---- -Remove on next release. - -Source: https://github.com/breakfastquay/rubberband/commit/df596f472e3271ad64ab6c2968920e5e95c17080 - - src/test/TestStretcher.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/test/TestStretcher.cpp b/src/test/TestStretcher.cpp -index 8213dbe4..cbf3ae3c 100644 ---- a/src/test/TestStretcher.cpp -+++ b/src/test/TestStretcher.cpp -@@ -999,7 +999,7 @@ static void impulses_realtime(RubberBandStretcher::Options options, - // These limits aren't alarming, but it may be worth tightening - // them and and taking a look at the waveforms - -- BOOST_TEST(peak0 < int(ceil(200 * timeRatio))); -+ BOOST_TEST(peak0 < int(ceil(210 * timeRatio))); - BOOST_TEST(peak0 > int(ceil(50 * timeRatio))); - - BOOST_TEST(peak1 < int(ceil(5070 * timeRatio))); diff --git a/srcpkgs/rubberband/template b/srcpkgs/rubberband/template index 32f1f9f1607947..66625239d625ee 100644 --- a/srcpkgs/rubberband/template +++ b/srcpkgs/rubberband/template @@ -1,35 +1,39 @@ # Template file for 'rubberband' pkgname=rubberband -version=3.2.1 +version=3.3.0 revision=1 build_style=meson configure_args="-Dfft=fftw" hostmakedepends="pkg-config" -makedepends="ladspa-sdk vamp-plugin-sdk-devel fftw-devel lv2" +makedepends="ladspa-sdk vamp-plugin-sdk-devel lv2" depends="libvamp-plugin-sdk" checkdepends="boost-devel" short_desc="Time-stretching and pitch-shifting audio library" maintainer="Mohammed Anas " license="GPL-2.0-or-later" homepage="https://breakfastquay.com/rubberband/" -changelog="https://breakfastquay.com/news.html" +changelog="https://raw.githubusercontent.com/breakfastquay/rubberband/default/CHANGELOG" distfiles="https://breakfastquay.com/files/releases/rubberband-${version}.tar.bz2" -checksum=82edacd0c50bfe56a6a85db1fcd4ca3346940ffe02843fc50f8b92f99a97d172 +checksum=d9ef89e2b8ef9f85b13ac3c2faec30e20acf2c9f3a9c8c45ce637f2bc95e576c if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then LDFLAGS="-latomic" fi +_dev_depends="fftw-devel" + # On 32-bit targets, the built-in resampler is much slower than libsamplerate. # On 64-bit targets the performance difference is not as pronounced, and the # built-in resampler can, in some situations, sound slightly better, so keep # using it on them. # See https://github.com/breakfastquay/rubberband/issues/87#issuecomment-1607722278. if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then - makedepends+=" libsamplerate-devel" + _dev_depends+=" libsamplerate-devel" configure_args+=" -Dresampler=libsamplerate" fi +makedepends+=" $_dev_depends" + if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -Dtests=enabled" else @@ -42,11 +46,13 @@ librubberband_package() { vmove "usr/lib/*.so.*" vmove usr/lib/vamp vmove usr/lib/ladspa + vmove usr/lib/lv2 + vmove usr/share/ladspa } } rubberband-devel_package() { - depends="librubberband>=${version}_${revision}" + depends="${_dev_depends} librubberband>=${version}_${revision}" short_desc+=" - Development files" pkg_install() { vmove usr/include From e627c9a51a61da93d2b63cf6552c79cc93ca17b1 Mon Sep 17 00:00:00 2001 From: triallax Date: Tue, 15 Aug 2023 16:57:00 +0100 Subject: [PATCH 2/2] mpv: rebuild to properly detect rubberband. --- srcpkgs/mpv/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template index 5770251d33c9cc..933c22bae2ed21 100644 --- a/srcpkgs/mpv/template +++ b/srcpkgs/mpv/template @@ -1,7 +1,7 @@ # Template file for 'mpv' pkgname=mpv version=0.36.0 -revision=1 +revision=2 build_style=meson configure_args="-Dcdda=enabled -Ddvbin=enabled -Ddvdnav=enabled -Dlibmpv=true -Dcplugins=enabled