[SCM] mixxx/master: Link against libsoundtouch provided systemwide

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit fb5b5e0ca81fcb9315e4ad469656684731907f93
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jan 17 02:13:59 2011 +0100

    Link against libsoundtouch provided systemwide

diff --git a/debian/patches/50-soundtouch.patch b/debian/patches/50-soundtouch.patch
new file mode 100644
index 0000000..e93ca39
--- /dev/null
+++ b/debian/patches/50-soundtouch.patch
@@ -0,0 +1,41 @@
+---
+ src/SConscript.env |   27 +++------------------------
+ 1 file changed, 3 insertions(+), 24 deletions(-)
+
+--- mixxx.orig/src/SConscript.env
++++ mixxx/src/SConscript.env
+@@ -876,31 +876,10 @@ if 'win' in platformString:
+ #SoundTouch
+ #XXX this should be done with a subsconscript
+ 
+-soundtouch_path = 'soundtouch-1.4.1'
+-
+-env.Append(CPPPATH=['#lib/'+soundtouch_path])
+-sources += Split("""engine/enginebufferscalest.cpp
+-                    #lib/""" + soundtouch_path + """/SoundTouch.cpp
+-                    #lib/""" + soundtouch_path + """/TDStretch.cpp
+-                    #lib/""" + soundtouch_path + """/RateTransposer.cpp
+-                    #lib/""" + soundtouch_path + """/AAFilter.cpp
+-                    #lib/""" + soundtouch_path + """/FIFOSampleBuffer.cpp
+-                    #lib/""" + soundtouch_path + """/FIRFilter.cpp
+-                    #lib/""" + soundtouch_path + """/PeakFinder.cpp
+-                    #lib/""" + soundtouch_path + """/BPMDetect.cpp
+-                    """)
+-
+-if 'win' in platformString:
+-	if bitwidth == '64':
+-		sources += Split("""#lib/""" + soundtouch_path + """/cpu_detect_x64_win.cpp""")
+-	else:
+-		sources += Split("""#lib/""" + soundtouch_path + """/cpu_detect_x86_win.cpp""")
+-else:
+-	if bitwidth == '64':
+-		sources += Split("""#lib/""" + soundtouch_path + """/cpu_detect_x64_gcc.cpp""")
+-	else:
+-		sources += Split("""#lib/""" + soundtouch_path + """/cpu_detect_x86_gcc.cpp""")
++soundtouch_path = '/usr/include/soundtouch'
+ 
++env.Append(CPPPATH=['/usr/include/soundtouch'])
++env.Append(LIBS= 'SoundTouch')
+ 
+ #KissFFT
+ env.Append(CPPPATH=['#lib/kissfft'])

-- 
mixxx packaging