diff options
Diffstat (limited to 'media-sound/mixxx/files/mixxx-9999-libsoundtouch.patch')
| -rw-r--r-- | media-sound/mixxx/files/mixxx-9999-libsoundtouch.patch | 63 |
1 files changed, 19 insertions, 44 deletions
diff --git a/media-sound/mixxx/files/mixxx-9999-libsoundtouch.patch b/media-sound/mixxx/files/mixxx-9999-libsoundtouch.patch index d18b7b249..abd779ee3 100644 --- a/media-sound/mixxx/files/mixxx-9999-libsoundtouch.patch +++ b/media-sound/mixxx/files/mixxx-9999-libsoundtouch.patch @@ -1,10 +1,11 @@ ---- build/depends.py.orig 2011-04-26 11:55:25.000000000 -0700 -+++ build/depends.py 2011-04-26 11:58:53.000000000 -0700 -@@ -230,60 +230,16 @@ +=== modified file 'mixxx/build/depends.py' +--- build/depends.py 2011-11-08 20:10:32 +0000 ++++ build/depends.py 2011-11-08 23:38:43 +0000 +@@ -222,33 +222,19 @@ build.env.Append(CPPPATH="#lib/replaygain") class SoundTouch(Dependence): -- SOUNDTOUCH_PATH = 'soundtouch-1.5.0' +- SOUNDTOUCH_PATH = 'soundtouch-1.6.0' def sources(self, build): - sources = ['engine/enginebufferscalest.cpp', @@ -15,54 +16,28 @@ - '#lib/%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_PATH, - '#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH, - '#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH, -- '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH] -- if build.platform_is_windows and build.toolchain_is_msvs: -- if build.machine_is_64bit: -- sources.append( -- '#lib/%s/cpu_detect_x64_win.cpp' % self.SOUNDTOUCH_PATH) -- elif build.machine == 'x86': -- sources.append( -- '#lib/%s/cpu_detect_x86_win.cpp' % self.SOUNDTOUCH_PATH) -- else: -- raise Exception("Unhandled CPU configuration for SoundTouch") -- elif build.toolchain_is_gnu: -- if build.machine == 'x86_64': -- sources.append( -- '#lib/%s/cpu_detect_x64_gcc.cpp' % self.SOUNDTOUCH_PATH) -- else: -- sources.append( -- '#lib/%s/cpu_detect_x86_gcc.cpp' % self.SOUNDTOUCH_PATH) -- else: -- raise Exception("Unhandled CPU configuration for SoundTouch") -- -- # TODO(XXX) when we figure out a better way to represent features, fix -- # this. -- optimize = int(util.get_flags(build.env, 'optimize', 1)) -- if build.machine_is_64bit or \ -- (build.toolchain_is_msvs and optimize > 1) or \ -- (build.toolchain_is_gnu and optimize > 2): -- sources.extend( -- ['#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH, -- '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH, -- ]) -- if build.toolchain_is_msvs and not build.machine_is_64bit: -- sources.append('#lib/%s/3dnow_win.cpp' % self.SOUNDTOUCH_PATH) -- else: -- # TODO(XXX) the docs refer to a 3dnow_gcc, but we don't seem to have -- # it. -- pass +- '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH, +- '#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH, +- '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_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. +- cpu_detection = '#lib/%s/cpu_detect_x86_win.cpp' if build.toolchain_is_msvs else '#lib/%s/cpu_detect_x86_gcc.cpp' +- sources.append(cpu_detection % self.SOUNDTOUCH_PATH) + sources = ['engine/enginebufferscalest.cpp'] return sources def configure(self, build, conf): -- if build.platform_is_windows: -- build.env.Append(CPPDEFINES = 'WIN%s' % build.bitwidth) + if build.platform_is_windows: + # Regardless of the bitwidth, ST checks for WIN32 + build.env.Append(CPPDEFINES = 'WIN32') - build.env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_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') - # TODO(XXX) when we figure out a better way to represent features, fix - # this. + class TagLib(Dependence): + def configure(self, build, conf): + |