[SCM] mixxx/master: Get rid of unneeded patches.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 94baeb05a569fc03da55229504c3e4f7a29c92b5
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Apr 14 20:17:59 2011 +0200

    Get rid of unneeded patches.

diff --git a/debian/patches/10_soundtouch.dpatch b/debian/patches/10_soundtouch.dpatch
deleted file mode 100644
index 2731c00..0000000
--- a/debian/patches/10_soundtouch.dpatch
+++ /dev/null
@@ -1,62 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_soundtouch.dpatch by  <piem at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: use system soundtouch instead of recompiling it 
-
- at DPATCH@
---- a/src/SConscript	2009-10-28 18:08:09.000000000 +0100
-+++ b/src/SConscript	2009-10-28 18:13:40.000000000 +0100
-@@ -771,28 +771,30 @@
- 
- #SoundTouch
- #XXX this should be done with a subsconscript
--env.Append(CPPPATH=['#lib/soundtouch-1.4.1'])
--sources += Split("""engine/enginebufferscalest.cpp
--                    #lib/soundtouch-1.4.1/SoundTouch.cpp
--                    #lib/soundtouch-1.4.1/TDStretch.cpp
--                    #lib/soundtouch-1.4.1/RateTransposer.cpp
--                    #lib/soundtouch-1.4.1/AAFilter.cpp
--                    #lib/soundtouch-1.4.1/FIFOSampleBuffer.cpp
--                    #lib/soundtouch-1.4.1/FIRFilter.cpp
--                    #lib/soundtouch-1.4.1/PeakFinder.cpp
--                    #lib/soundtouch-1.4.1/BPMDetect.cpp
--                    """)
--
--if 'win' in platform:
--	if platform == 'win32':
--		sources += Split("""#lib/soundtouch-1.4.1/cpu_detect_x86_win.cpp""")
--	if platform == 'win64':
--		sources += Split("""#lib/soundtouch-1.4.1/cpu_detect_x64_win.cpp""")
--else:
--	if machine == 'x86_64':
--		sources += Split("""#lib/soundtouch-1.4.1/cpu_detect_x64_gcc.cpp""")
--	else:
--		sources += Split("""#lib/soundtouch-1.4.1/cpu_detect_x86_gcc.cpp""")
-+#env.Append(CPPPATH=['#lib/soundtouch-1.4.1'])
-+#sources += Split("""engine/enginebufferscalest.cpp
-+#                    #lib/soundtouch-1.4.1/SoundTouch.cpp
-+#                    #lib/soundtouch-1.4.1/TDStretch.cpp
-+#                    #lib/soundtouch-1.4.1/RateTransposer.cpp
-+#                    #lib/soundtouch-1.4.1/AAFilter.cpp
-+#                    #lib/soundtouch-1.4.1/FIFOSampleBuffer.cpp
-+#                    #lib/soundtouch-1.4.1/FIRFilter.cpp
-+#                    #lib/soundtouch-1.4.1/PeakFinder.cpp
-+#                    #lib/soundtouch-1.4.1/BPMDetect.cpp
-+#                    """)
-+#
-+#if 'win' in platform:
-+#	if platform == 'win32':
-+#		sources += Split("""#lib/soundtouch-1.4.1/cpu_detect_x86_win.cpp""")
-+#	if platform == 'win64':
-+#		sources += Split("""#lib/soundtouch-1.4.1/cpu_detect_x64_win.cpp""")
-+#else:
-+#	if machine == 'x86_64':
-+#		sources += Split("""#lib/soundtouch-1.4.1/cpu_detect_x64_gcc.cpp""")
-+#	else:
-+#		sources += Split("""#lib/soundtouch-1.4.1/cpu_detect_x86_gcc.cpp""")
-+env.Append(CPPPATH = [ ARGUMENTS.get('prefix', '/usr/local') + '/include/soundtouch' ])
-+env.Append(LIBS = 'SoundTouch')
- 
- 
- #KissFFT
diff --git a/debian/patches/50-soundtouch.patch b/debian/patches/50-soundtouch.patch
deleted file mode 100644
index e93ca39..0000000
--- a/debian/patches/50-soundtouch.patch
+++ /dev/null
@@ -1,41 +0,0 @@
----
- 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'])
diff --git a/debian/patches/series b/debian/patches/series
index 552bfd3..026c43c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 10_uptodate_configure.dpatch
-#10_soundtouch.dpatch
 15-various_archs_support.patch
 20_norpath.patch
 30-disable_soundsourcem4a.patch
diff --git a/debian/patches/ubuntu.series b/debian/patches/ubuntu.series
index 708edcb..a805c48 100644
--- a/debian/patches/ubuntu.series
+++ b/debian/patches/ubuntu.series
@@ -1,5 +1,4 @@
 10_uptodate_configure.dpatch
-#10_soundtouch.dpatch
 15-various_archs_support.patch
 20_norpath.patch
 30-disable_soundsourcem4a.patch

-- 
mixxx packaging