Pileus Git - ~andy/sunrise/blob - media-sound/mixxx/files/mixxx-1.9.2-libsoundtouch.patch

   1 --- build/depends.py.orig       2010-12-22 11:13:22.000000000 -0800
   2 +++ build/depends.py    2010-12-22 11:33:29.000000000 -0800
   3 @@ -234,60 +234,16 @@
   4          build.env.Append(CPPPATH="#lib/replaygain")
   5
   6  class SoundTouch(Dependence):
   7 -    SOUNDTOUCH_PATH = 'soundtouch-1.4.1'
   8
   9      def sources(self, build):
  10 -        sources = ['engine/enginebufferscalest.cpp',
  11 -                   '#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH,
  12 -                   '#lib/%s/TDStretch.cpp' % self.SOUNDTOUCH_PATH,
  13 -                   '#lib/%s/RateTransposer.cpp' % self.SOUNDTOUCH_PATH,
  14 -                   '#lib/%s/AAFilter.cpp' % self.SOUNDTOUCH_PATH,
  15 -                   '#lib/%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_PATH,
  16 -                   '#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH,
  17 -                   '#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH,
  18 -                   '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH]
  19 -        if build.platform_is_windows and build.toolchain_is_msvs:
  20 -            if build.machine_is_64bit:
  21 -                sources.append(
  22 -                    '#lib/%s/cpu_detect_x64_win.cpp' % self.SOUNDTOUCH_PATH)
  23 -            elif build.machine == 'x86':
  24 -                sources.append(
  25 -                    '#lib/%s/cpu_detect_x86_win.cpp' % self.SOUNDTOUCH_PATH)
  26 -            else:
  27 -                raise Exception("Unhandled CPU configuration for SoundTouch")
  28 -        elif build.toolchain_is_gnu:
  29 -            if build.machine == 'x86_64':
  30 -                sources.append(
  31 -                    '#lib/%s/cpu_detect_x64_gcc.cpp' % self.SOUNDTOUCH_PATH)
  32 -            else:
  33 -                sources.append(
  34 -                    '#lib/%s/cpu_detect_x86_gcc.cpp' % self.SOUNDTOUCH_PATH)
  35 -        else:
  36 -            raise Exception("Unhandled CPU configuration for SoundTouch")
  37 -
  38 -        # TODO(XXX) when we figure out a better way to represent features, fix
  39 -        # this.
  40 -        optimize = int(util.get_flags(build.env, 'optimize', 1))
  41 -        if build.machine_is_64bit or \
  42 -                (build.toolchain_is_msvs and optimize > 1) or \
  43 -                (build.toolchain_is_gnu and optimize > 2):
  44 -            sources.extend(
  45 -                ['#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH,
  46 -                 '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH,
  47 -                 ])
  48 -        if build.toolchain_is_msvs and not build.machine_is_64bit:
  49 -            sources.append('#lib/%s/3dnow_win.cpp' % self.SOUNDTOUCH_PATH)
  50 -        else:
  51 -            # TODO(XXX) the docs refer to a 3dnow_gcc, but we don't seem to have
  52 -            # it.
  53 -            pass
  54 -
  55 +        sources =  ['engine/enginebufferscalest.cpp']
  56          return sources
  57
  58      def configure(self, build, conf):
  59 -        if build.platform_is_windows:
  60 -            build.env.Append(CPPDEFINES = 'WIN%s' % build.bitwidth)
  61 -        build.env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])
  62 +        if not conf.CheckLib(['SoundTouch','libSoundTouch']):
  63 +            raise Exception('Did not find libSoundTouch.a, libSoundTouch.lib, or the libSoundTouch development header files - exiting!')
  64 +        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix', '/usr/local') + '/include/soundtouch'])
  65 +        build.env.Append(LIBS='SoundTouch')
  66
  67          # TODO(XXX) when we figure out a better way to represent features, fix
  68          # this.