CVS commit: pkgsrc/audio/rubberband

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Apr  9 10:32:28 UTC 2021

Modified Files:
        pkgsrc/audio/rubberband: Makefile PLIST distinfo
Added Files:
        pkgsrc/audio/rubberband/patches: patch-meson.build

Log Message:
rubberband: update to 1.9.1

Changes in Rubber Band v1.9.1

 * Switch build system from Makefiles and Visual Studio project to
   Meson/Ninja for all platforms. There are still Makefiles and VS
   projects included in otherbuilds/ for those who wish to use them to
   build the static library directly
 * Make various fixes to improve sound quality when pitch-shifting
   dynamically in real-time (requires libsamplerate)
 * Fix floating-point exception when a very very long stretch factor
   is presented
 * Move the two directories that together provide the .NET interface
   (rubberband-sharp and rubberband-dll) into their own subdir (dotnet)
 * Ensure the library builds and runs correctly on ARM Mac (Apple
   Silicon, M1), and also on Windows using the Visual C++ Clang
   front-end

The API is unchanged and the library is binary compatible with
version 1.7.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/audio/rubberband/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/rubberband/PLIST \
    pkgsrc/audio/rubberband/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/rubberband/patches/patch-meson.build

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/rubberband/Makefile
diff -u pkgsrc/audio/rubberband/Makefile:1.5 pkgsrc/audio/rubberband/Makefile:1.6
--- pkgsrc/audio/rubberband/Makefile:1.5        Tue Nov 24 17:17:53 2020
+++ pkgsrc/audio/rubberband/Makefile    Fri Apr  9 10:32:28 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2020/11/24 17:17:53 nia Exp $
+# $NetBSD: Makefile,v 1.6 2021/04/09 10:32:28 nia Exp $
 
-DISTNAME=      rubberband-1.9.0
+DISTNAME=      rubberband-1.9.1
 CATEGORIES=    audio
 MASTER_SITES=  https://breakfastquay.com/files/releases/
 EXTRACT_SUFX=  .tar.bz2
@@ -10,16 +10,22 @@ HOMEPAGE=   https://breakfastquay.com/rubb
 COMMENT=       Audio time-stretching and pitch-shifting library
 LICENSE=       gnu-gpl-v2
 
-GNU_CONFIGURE= yes
-USE_TOOLS+=    pkg-config gmake
+USE_TOOLS+=    pkg-config
 USE_LANGUAGES= c c++
 
-PKGCONFIG_OVERRIDE+=   rubberband.pc.in
+MESON_ARGS+=   -Dfft=fftw
+MESON_ARGS+=   -Dresampler=libsamplerate
+
+PYTHON_FOR_BUILD_ONLY= tool
+
+PKGCONFIG_OVERRIDE_STAGE=      pre-install
+PKGCONFIG_OVERRIDE+=           output/meson-private/rubberband.pc
 
 .include "../../audio/ladspa/buildlink3.mk"
 .include "../../audio/libsamplerate/buildlink3.mk"
 .include "../../audio/libsndfile/buildlink3.mk"
 .include "../../audio/vamp-plugin-sdk/buildlink3.mk"
+.include "../../devel/meson/build.mk"
 .include "../../math/fftw/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/rubberband/PLIST
diff -u pkgsrc/audio/rubberband/PLIST:1.3 pkgsrc/audio/rubberband/PLIST:1.4
--- pkgsrc/audio/rubberband/PLIST:1.3   Tue Nov 24 17:17:54 2020
+++ pkgsrc/audio/rubberband/PLIST       Fri Apr  9 10:32:28 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2020/11/24 17:17:54 nia Exp $
+@comment $NetBSD: PLIST,v 1.4 2021/04/09 10:32:28 nia Exp $
 bin/rubberband
 include/rubberband/RubberBandStretcher.h
 include/rubberband/rubberband-c.h
@@ -7,7 +7,7 @@ lib/ladspa/ladspa-rubberband.so
 lib/librubberband.a
 lib/librubberband.so
 lib/librubberband.so.2
-lib/librubberband.so.2.1.2
+lib/librubberband.so.2.1.3
 lib/pkgconfig/rubberband.pc
 lib/vamp/vamp-rubberband.cat
 lib/vamp/vamp-rubberband.so
Index: pkgsrc/audio/rubberband/distinfo
diff -u pkgsrc/audio/rubberband/distinfo:1.3 pkgsrc/audio/rubberband/distinfo:1.4
--- pkgsrc/audio/rubberband/distinfo:1.3        Tue Nov 24 17:17:54 2020
+++ pkgsrc/audio/rubberband/distinfo    Fri Apr  9 10:32:28 2021
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2020/11/24 17:17:54 nia Exp $
+$NetBSD: distinfo,v 1.4 2021/04/09 10:32:28 nia Exp $
 
-SHA1 (rubberband-1.9.0.tar.bz2) = fa6e69b1fabada44cd270cea2911f989c1071f15
-RMD160 (rubberband-1.9.0.tar.bz2) = ef9a525b9c90ca54b43bb09fcb96cabbaf533399
-SHA512 (rubberband-1.9.0.tar.bz2) = 2226cfec98f280a12f874f60620c3bf09f7399a7808af5e9f5c9a5154b989cfbf3c4220e162d722e319a4ef046f81c6a07eac2b8c6035c8f6230f0a20b1577a8
-Size (rubberband-1.9.0.tar.bz2) = 192240 bytes
+SHA1 (rubberband-1.9.1.tar.bz2) = f612b25ba76138f720fe64a8f300510989534927
+RMD160 (rubberband-1.9.1.tar.bz2) = ee2e37b8b7b442b6601f5c5cd93728456566ad07
+SHA512 (rubberband-1.9.1.tar.bz2) = cb20ef8fb717a9e6b5b0b921541bd701e94326e12cdb20d50bed344d12fa1b4fd731335c3a0a7f2d2a5ce96031d965b209e7667c4d55fd8494b8e20d3409f0d3
+Size (rubberband-1.9.1.tar.bz2) = 164644 bytes
+SHA1 (patch-meson.build) = 065ee7b50549924c16d3d76c78aad8603e562d28

Added files:

Index: pkgsrc/audio/rubberband/patches/patch-meson.build
diff -u /dev/null pkgsrc/audio/rubberband/patches/patch-meson.build:1.1
--- /dev/null   Fri Apr  9 10:32:28 2021
+++ pkgsrc/audio/rubberband/patches/patch-meson.build   Fri Apr  9 10:32:28 2021
@@ -0,0 +1,40 @@
+$NetBSD: patch-meson.build,v 1.1 2021/04/09 10:32:28 nia Exp $
+
+- Support systems without sincos.
+- Avoid building JNI interface.
+
+https://todo.sr.ht/~breakfastquay/rubberband/16
+
+--- meson.build.orig   2021-03-12 12:03:24.000000000 +0000
++++ meson.build
+@@ -20,6 +20,7 @@ rubberband_dynamic_library_version = '2.
+ system = build_machine.system()
+ architecture = host_machine.cpu_family()
+ cpp = meson.get_compiler('cpp')
++cc = meson.get_compiler('c')
+ 
+ pkg = import('pkgconfig')
+ 
+@@ -101,7 +102,10 @@ sndfile_dep = dependency('sndfile', vers
+ vamp_dep = dependency('vamp-sdk', version: '>= 2.9', required: false)
+ thread_dep = dependency('threads')
+ have_ladspa = cpp.has_header('ladspa.h', args: extra_include_args)
+-have_jni = cpp.has_header('jni.h', args: extra_include_args)
++have_sincos = cc.has_function('sincos',
++                               prefix: '#define _GNU_SOURCE\n#include <math.h>',
++                               args: '-lm')
++have_jni = false
+ 
+ javac = find_program('javac', required: false)
+ jar = find_program('jar', required: false)
+@@ -223,6 +227,10 @@ else
+ 
+ endif # resampler
+ 
++if not have_sincos
++  feature_defines += [ '-DLACK_SINCOS' ]
++endif
++
+ if ipp_needed
+   feature_defines += [
+     '-DHAVE_IPP',