Remove bundled libSoundTouch

.travis.yml

@@ -34,6 +34,7 @@ addons:
       - librubberband-dev
       - libshout3-dev
       - libsndfile1-dev
+      - libsoundtouch-dev
       - libsqlite3-dev
       - libtag1-dev
       - libupower-glib-dev
@@ -53,7 +54,7 @@ before_install:
   # Virtual X, needed for analyzer waveform tests
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export DISPLAY=:99.0         ; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sh -e /etc/init.d/xvfb start ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install scons portaudio libsndfile libogg libvorbis portmidi taglib libshout protobuf flac ffmpeg qt chromaprint rubberband libmodplug libid3tag libmad mp4v2 faad2 wavpack opusfile lilv lame; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install scons portaudio libsndfile libogg libvorbis portmidi taglib libshout protobuf flac ffmpeg qt chromaprint rubberband libmodplug libid3tag libmad mp4v2 faad2 wavpack opusfile lilv lame sound-touch; fi
 
 install:
   ####

appveyor.yml

@@ -50,7 +50,7 @@ for:
 
   install:
     - sudo apt-get update
-    - sudo apt-get -y install gdb libavformat-dev libchromaprint-dev libfaad-dev libfftw3-dev libflac-dev libid3tag0-dev libmad0-dev libmodplug-dev libmp3lame-dev libmp4v2-dev libopusfile-dev libportmidi-dev libprotobuf-dev libqt5opengl5-dev libqt5sql5-sqlite libqt5svg5-dev librubberband-dev libshout3-dev libsndfile1-dev libsqlite3-dev libtag1-dev libupower-glib-dev libusb-1.0-0-dev libwavpack-dev portaudio19-dev protobuf-compiler qt5-default qtscript5-dev scons vamp-plugin-sdk qtkeychain-dev liblilv-dev
+    - sudo apt-get -y install gdb libavformat-dev libchromaprint-dev libfaad-dev libfftw3-dev libflac-dev libid3tag0-dev libmad0-dev libmodplug-dev libmp3lame-dev libmp4v2-dev libopusfile-dev libportmidi-dev libprotobuf-dev libqt5opengl5-dev libqt5sql5-sqlite libqt5svg5-dev librubberband-dev libshout3-dev libsndfile1-dev libsqlite3-dev libtag1-dev libupower-glib-dev libusb-1.0-0-dev libwavpack-dev portaudio19-dev protobuf-compiler qt5-default qtscript5-dev scons vamp-plugin-sdk qtkeychain-dev liblilv-dev libsoundtouch-dev
 
   build_script:
     - scons -j4 test=1 mad=1 faad=1 ffmpeg=1 opus=1 modplug=1 wv=1 hss1394=0 virtualize=0 debug_assertions_fatal=1 verbose=0 localecompare=1

build/depends.py

@@ -487,43 +487,17 @@ def configure(self, build, conf, env=None):
 
 
 class SoundTouch(Dependence):
-    SOUNDTOUCH_INTERNAL_PATH = 'lib/soundtouch'
-    INTERNAL_LINK = True
-
     def sources(self, build):
-        if self.INTERNAL_LINK:
-            env = build.env.Clone()
-            soundtouch_dir = env.Dir(self.SOUNDTOUCH_INTERNAL_PATH)
-            SCons.Export('env')
-            SCons.Export('build')
-            env.SConscript(env.File('SConscript', soundtouch_dir))
-
-            build.env.Append(LIBPATH=self.SOUNDTOUCH_INTERNAL_PATH)
-            build.env.Append(LIBS=['soundtouch'])
         return ['src/engine/enginebufferscalest.cpp']
 
     def configure(self, build, conf, env=None):
         if env is None:
             env = build.env
+        if not conf.CheckForPKG('soundtouch', '2.0.0'):
+            raise Exception(
+                "Could not find libsoundtouch >= 2.0.0 or its development headers.")
+        build.env.ParseConfig('pkg-config soundtouch --silence-errors --cflags --libs')
 
-        if build.platform_is_linux:
-            # Try using system lib
-            if conf.CheckForPKG('soundtouch', '2.0.0'):
-                # System Lib found
-                build.env.ParseConfig('pkg-config soundtouch --silence-errors --cflags --libs')
-                self.INTERNAL_LINK = False
-
-        if self.INTERNAL_LINK:
-            env.Append(CPPPATH=['#' + self.SOUNDTOUCH_INTERNAL_PATH])
-
-            # Prevents circular import.
-            from .features import Optimize
-
-            # If we do not want optimizations then disable them.
-            optimize = (build.flags['optimize'] if 'optimize' in build.flags
-                        else Optimize.get_optimization_level(build))
-            if optimize == Optimize.LEVEL_OFF:
-                env.Append(CPPDEFINES='SOUNDTOUCH_DISABLE_X86_OPTIMIZATIONS')
 
 class RubberBand(Dependence):
     def sources(self, build):