# HG changeset patch
# User Chris Cannam
# Date 1548930822 0
# Node ID 8fd5183efbd6040346f499e9db1fd3403def6541
# Parent  252c7c8a1a37653a92e5575064f50a5da0deb295
Undo bundling of Rubber Band. Will try a different approach in which the single offending package is linked statically against that library only.

diff -r 252c7c8a1a37 -r 8fd5183efbd6 base.pri
--- a/base.pri	Thu Jan 31 10:32:45 2019 +0000
+++ b/base.pri	Thu Jan 31 10:33:42 2019 +0000
@@ -20,9 +20,7 @@
 	svcore/plugin/api/alsa \
 	svgui \
 	svapp \
-	vamp-plugin-sdk \
-        rubberband \
-        rubberband/src
+	vamp-plugin-sdk
 
 DEPENDPATH += $$SV_INCLUDEPATH
 INCLUDEPATH += $$SV_INCLUDEPATH
@@ -36,8 +34,4 @@
 # Defines for Dataquay
 DEFINES += USE_SORD
 
-# Defines for Rubber Band
-linux*:   DEFINES += USE_PTHREADS
-macx*:    DEFINES += USE_PTHREADS
-
 CONFIG += qt thread warn_on stl rtti exceptions
diff -r 252c7c8a1a37 -r 8fd5183efbd6 bq-files.pri
--- a/bq-files.pri	Thu Jan 31 10:32:45 2019 +0000
+++ b/bq-files.pri	Thu Jan 31 10:33:42 2019 +0000
@@ -27,8 +27,7 @@
         bqaudiostream/bqaudiostream/AudioReadStream.h \
         bqaudiostream/bqaudiostream/AudioReadStreamFactory.h \
         bqaudiostream/bqaudiostream/Exceptions.h \
-        bqthingfactory/bqthingfactory/ThingFactory.h \
-	rubberband/rubberband/RubberBandStretcher.h
+        bqthingfactory/bqthingfactory/ThingFactory.h
 
 BQ_SOURCES += \
 	bqvec/src/Allocators.cpp \
@@ -46,6 +45,5 @@
 	bqaudioio/src/SystemRecordSource.cpp \
         bqaudiostream/src/AudioReadStream.cpp \
         bqaudiostream/src/AudioReadStreamFactory.cpp \
-        bqaudiostream/src/AudioStreamExceptions.cpp \
-        rubberband-all.cpp
+        bqaudiostream/src/AudioStreamExceptions.cpp
         
diff -r 252c7c8a1a37 -r 8fd5183efbd6 configure.ac
--- a/configure.ac	Thu Jan 31 10:32:45 2019 +0000
+++ b/configure.ac	Thu Jan 31 10:33:42 2019 +0000
@@ -94,6 +94,7 @@
 SV_MODULE_REQUIRED([fftw3f],[fftw3f >= 3.0.0],[fftw3.h],[fftw3f],[fftwf_execute])
 SV_MODULE_REQUIRED([sndfile],[sndfile >= 1.0.16],[sndfile.h],[sndfile],[sf_open])
 SV_MODULE_REQUIRED([libsamplerate],[samplerate >= 0.1.2],[samplerate.h],[samplerate],[src_new])
+SV_MODULE_REQUIRED([rubberband],[rubberband],[rubberband/RubberBandStretcher.h],[rubberband],[rubberband_new])
 SV_MODULE_REQUIRED([sord],[sord-0 >= 0.5],[sord/sord.h],[sord-0],[sord_world_new])
 SV_MODULE_REQUIRED([serd],[serd-0 >= 0.5],[serd/serd.h],[serd-0],[serd_reader_read_file])
 
diff -r 252c7c8a1a37 -r 8fd5183efbd6 noconfig.pri
--- a/noconfig.pri	Thu Jan 31 10:32:45 2019 +0000
+++ b/noconfig.pri	Thu Jan 31 10:33:42 2019 +0000
@@ -33,6 +33,7 @@
 LIBS += \
         -lbase \
         -lbz2 \
+        -lrubberband \
 	-lfftw3 \
 	-lfftw3f \
 	-lsndfile \
diff -r 252c7c8a1a37 -r 8fd5183efbd6 repoint-project.json
--- a/repoint-project.json	Thu Jan 31 10:32:45 2019 +0000
+++ b/repoint-project.json	Thu Jan 31 10:33:42 2019 +0000
@@ -76,11 +76,6 @@
             "service": "bitbucket",
             "owner": "breakfastquay"
         },
-        "rubberband": {
-            "vcs": "hg",
-            "service": "bitbucket",
-            "owner": "breakfastquay"
-        },
         "sv-dependency-builds": {
             "vcs": "hg",
             "service": "soundsoftware"