Package: mixxx / 2.2.0~dfsg-1

0003-soundtouch.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
From: "Matteo F. Vescovi" <mfv@debian.org>
Date: Thu, 23 Aug 2018 22:58:19 +0200
Subject: soundtouch

---
 build/depends.py | 27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/build/depends.py b/build/depends.py
index e6c4a4d..12055bc 100644
--- a/build/depends.py
+++ b/build/depends.py
@@ -550,31 +550,9 @@ class Ebur128Mit(Dependence):
 
 
 class SoundTouch(Dependence):
-    SOUNDTOUCH_INTERNAL_PATH = '#lib/soundtouch-2.0.0'
     INTERNAL_LINK = True
 
     def sources(self, build):
-        if self.INTERNAL_LINK:
-            return ['engine/enginebufferscalest.cpp',
-                    '%s/AAFilter.cpp' % self.SOUNDTOUCH_INTERNAL_PATH,
-                    '%s/BPMDetect.cpp' % self.SOUNDTOUCH_INTERNAL_PATH,
-                    '%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_INTERNAL_PATH,
-                    '%s/FIRFilter.cpp' % self.SOUNDTOUCH_INTERNAL_PATH,
-                    '%s/InterpolateCubic.cpp' % self.SOUNDTOUCH_INTERNAL_PATH,
-                    '%s/InterpolateLinear.cpp' % self.SOUNDTOUCH_INTERNAL_PATH,
-                    '%s/InterpolateShannon.cpp' % self.SOUNDTOUCH_INTERNAL_PATH,
-                    '%s/PeakFinder.cpp' % self.SOUNDTOUCH_INTERNAL_PATH,
-                    '%s/RateTransposer.cpp' % self.SOUNDTOUCH_INTERNAL_PATH,
-                    '%s/SoundTouch.cpp' % self.SOUNDTOUCH_INTERNAL_PATH,
-                    '%s/TDStretch.cpp' % self.SOUNDTOUCH_INTERNAL_PATH,
-                    # SoundTouch CPU optimizations are only for x86
-                    # architectures. SoundTouch automatically ignores these files
-                    # when it is not being built for an architecture that supports
-                    # them.
-                    '%s/cpu_detect_x86.cpp' % self.SOUNDTOUCH_INTERNAL_PATH,
-                    '%s/mmx_optimized.cpp' % self.SOUNDTOUCH_INTERNAL_PATH,
-                    '%s/sse_optimized.cpp' % self.SOUNDTOUCH_INTERNAL_PATH]
-        else:
             return ['engine/enginebufferscalest.cpp']
 
     def configure(self, build, conf, env=None):
@@ -590,7 +568,10 @@ class SoundTouch(Dependence):
                 self.INTERNAL_LINK = False
 
         if self.INTERNAL_LINK:
-            env.Append(CPPPATH=[self.SOUNDTOUCH_INTERNAL_PATH])
+            if not conf.CheckLib(['SoundTouch','libSoundTouch']):
+                raise Exception('Did not find libSoundTouch.a, libSoundTouch.lib, or the libSoundTouch development header files - exiting!')
+            build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix', '/usr/local') + '/include/soundtouch'])
+            build.env.Append(LIBS='SoundTouch')
 
             # Prevents circular import.
             from features import Optimize