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

   1 === modified file 'mixxx/build/depends.py'\r
   2 --- build/depends.py    2012-03-12 05:23:47 +0000\r
   3 +++ build/depends.py    2012-03-16 04:18:42 +0000\r
   4 @@ -218,34 +218,20 @@\r
   5          build.env.Append(CPPPATH="#lib/replaygain")\r
   6  \r
   7  class SoundTouch(Dependence):\r
   8 -    SOUNDTOUCH_PATH = 'soundtouch-1.6.0'\r
   9  \r
  10      def sources(self, build):\r
  11 -        sources = ['engine/enginebufferscalest.cpp',\r
  12 -                   '#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH,\r
  13 -                   '#lib/%s/TDStretch.cpp' % self.SOUNDTOUCH_PATH,\r
  14 -                   '#lib/%s/RateTransposer.cpp' % self.SOUNDTOUCH_PATH,\r
  15 -                   '#lib/%s/AAFilter.cpp' % self.SOUNDTOUCH_PATH,\r
  16 -                   '#lib/%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_PATH,\r
  17 -                   '#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH,\r
  18 -                   '#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH,\r
  19 -                   '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH,\r
  20 -                   '#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH,\r
  21 -                   '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH,]\r
  22 -\r
  23 -        # SoundTouch CPU optimizations are only for x86\r
  24 -        # architectures. SoundTouch automatically ignores these files when it is\r
  25 -        # not being built for an architecture that supports them.\r
  26 -        cpu_detection = '#lib/%s/cpu_detect_x86_win.cpp' if build.toolchain_is_msvs else \\r
  27 -                '#lib/%s/cpu_detect_x86_gcc.cpp'\r
  28 -        sources.append(cpu_detection % self.SOUNDTOUCH_PATH)\r
  29 +        sources =  ['engine/enginebufferscalest.cpp']\r
  30          return sources\r
  31  \r
  32      def configure(self, build, conf):\r
  33          if build.platform_is_windows:\r
  34              # Regardless of the bitwidth, ST checks for WIN32\r
  35              build.env.Append(CPPDEFINES = 'WIN32')\r
  36 -        build.env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])\r
  37 +        if not conf.CheckLib(['SoundTouch','libSoundTouch']):\r
  38 +            raise Exception('Did not find libSoundTouch.a, libSoundTouch.lib, or the libSoundTouch development header files - exiting!')\r
  39 +        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix', '/usr/local') + '/include/soundtouch'])\r
  40 +        build.env.Append(LIBS='SoundTouch')\r
  41 +\r
  42  \r
  43  class TagLib(Dependence):\r
  44      def configure(self, build, conf):\r
  45 \r