media-sound/mixxx: Patch offset and consistency adjustments due to upstream modifications.

svn path=/sunrise/; revision=12804

4 files changed, 66 insertions, 60 deletions

diff --git a/media-sound/mixxx/ChangeLog b/media-sound/mixxx/ChangeLog
index dd1be0b5d..afb0248cf 100644
--- a/media-sound/mixxx/ChangeLog
+++ b/media-sound/mixxx/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for media-sound/mixxx
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Mar 2012; Alex Barker (KWhat) <alex@1stleg.com>
+  files/mixxx-9999-flags.patch, files/mixxx-9999-libsoundtouch.patch:
+  Patch offset and consistency adjustments due to upstream modifications.
+
   24 Dec 2011; Alex Barker (KWhat) <alex@1stleg.com> -mixxx-1.9.2.ebuild,
   -files/mixxx-1.9.2-flags.patch, -files/mixxx-1.9.2-libsoundtouch.patch,
   +mixxx-1.10.0.ebuild, +files/mixxx-1.10.0-flags.patch,
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index d3f84a323..7a5b96d8c 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,9 +1,9 @@
 AUX mixxx-1.10.0-flags.patch 624 RMD160 b10c1e796fd71c35c24781cfbdbb33f7955cc4ac SHA1 f9d8e2eb698b90a50b2c110902b94ddb6300b847 SHA256 1387d7c8e886d5c98b48639628b6ec5c73bcb507b92e0220ee8648a3c7b08dd5
 AUX mixxx-1.10.0-libsoundtouch.patch 3342 RMD160 fc1b83da83abe8e872b9d436421a2b8e1fbe61de SHA1 6736c6909edbb7aaf684ba3512064b0a32c27632 SHA256 d28f3332ccaa2aef9f595ef54de9b424e44d0a4f4d94b581b0210a8250d5a310
-AUX mixxx-9999-flags.patch 624 RMD160 b10c1e796fd71c35c24781cfbdbb33f7955cc4ac SHA1 f9d8e2eb698b90a50b2c110902b94ddb6300b847 SHA256 1387d7c8e886d5c98b48639628b6ec5c73bcb507b92e0220ee8648a3c7b08dd5
-AUX mixxx-9999-libsoundtouch.patch 2233 RMD160 e64e4ebe0241d3be2a691ed819b0beb7bd7db5f1 SHA1 3560630ab5bd9716fc54a104edadd15478ff2a27 SHA256 35abe2708d701a7cfaade4b33e76657a11bb620f73d484126d53c5ae95424759
+AUX mixxx-9999-flags.patch 632 RMD160 30a8467012ac311c23b080a2a6358ed410cc630e SHA1 f82c73c10bd0166944d2b2f0e81a77c7f195bd81 SHA256 83284a59147950dafcc014929f56ced1f454aa174ccc74877ef30f2b67f7a524
+AUX mixxx-9999-libsoundtouch.patch 2299 RMD160 9c802f00736108579a1e0bb4c874f90bee2b6f6d SHA1 49c8ebe4342258ca0bcb031dede74b900a23f807 SHA256 be1dc9430264f48ab20cda901c235f2ab406a9ab434fa0281eb9748e4eb8ac83
 DIST mixxx-1.10.0-src.tar.gz 15852338 RMD160 dde454d7ff6200e33c401e87313ad399ff751d53 SHA1 b01ab69c0eeca99fa6b1da472cfede01bda71328 SHA256 9135f814262bf42eb05bf5d56c760ab462329c06785271d570be6a9d14ab1e97
 EBUILD mixxx-1.10.0.ebuild 1897 RMD160 1f911eb96b344f80dad37ec46cc5f1464dfa8801 SHA1 67352b78ed803c63d8bd0f364ac5229aafee73c9 SHA256 4f4c190326e47e7a3beb0847a272c12065bcf2196975b53623a54eb6976e00ff
 EBUILD mixxx-9999.ebuild 1895 RMD160 92bd160304f0ee22b8ebb3f15fb7b232faa4b768 SHA1 e4a14e4a2b59aa52ccf7586822ab3bb92b9cd1cd SHA256 560aa639e69ce4ae151a24fcac9298e80e0d62a5bbc1ef3af152fe34ad7f648f
-MISC ChangeLog 2814 RMD160 f11af97027f36948a76a91c40b3d9bc3c0778c59 SHA1 648621597e9b3eba6182bb1bad48b2bb80b4f277 SHA256 0e473c71058c5490f0b33e99c35d94c898bee82956c7e1869b0da3865d622cfa
+MISC ChangeLog 3012 RMD160 75d9a94f9e2fc0f2e3e2e9ec5b7301dc1f43735c SHA1 495170d92f07a37f7b36224ea3cc0463fc725ed6 SHA256 2733d434542eb09f70f25e687105f2819fdec9cc8dbdb89824fa5e13aa39c45e
 MISC metadata.xml 410 RMD160 8b5dee500da763730f1ffd02863d23221cb4f04b SHA1 e09418482c729b27b392f42ecf3e4344f71c56b9 SHA256 812fc2fb4d75f2035068cd2f547174c6aedf91799a1fc64ef54d15c611a28128
diff --git a/media-sound/mixxx/files/mixxx-9999-flags.patch b/media-sound/mixxx/files/mixxx-9999-flags.patch
index c543e76cb..1b92840df 100644
--- a/media-sound/mixxx/files/mixxx-9999-flags.patch
+++ b/media-sound/mixxx/files/mixxx-9999-flags.patch
@@ -1,13 +1,13 @@
---- build/depends.py.orig	2010-12-22 11:13:22.000000000 -0800
-+++ build/depends.py	2010-12-22 11:14:02.000000000 -0800
-@@ -587,10 +587,8 @@
-         if build.toolchain_is_gnu:
-             # Default GNU Options
-             # TODO(XXX) always generate debugging info?
--            build.env.Append(CCFLAGS = '-pipe')
-             build.env.Append(CCFLAGS = '-Wall')
-             build.env.Append(CCFLAGS = '-Wextra')
--            build.env.Append(CCFLAGS = '-g')
- 
-             # Check that g++ is present (yeah, SCONS is a bit dumb here)
-             if os.system("which g++ > /dev/null"): #Checks for non-zero return code
+--- build/depends.py	2010-12-22 11:13:22.000000000 -0800

++++ build/depends.py	2010-12-22 11:14:02.000000000 -0800

+@@ -587,10 +587,8 @@

+         if build.toolchain_is_gnu:

+             # Default GNU Options

+             # TODO(XXX) always generate debugging info?

+-            build.env.Append(CCFLAGS = '-pipe')

+             build.env.Append(CCFLAGS = '-Wall')

+             build.env.Append(CCFLAGS = '-Wextra')

+-            build.env.Append(CCFLAGS = '-g')

+ 

+             # Check that g++ is present (yeah, SCONS is a bit dumb here)

+             if os.system("which g++ > /dev/null"): #Checks for non-zero return code

diff --git a/media-sound/mixxx/files/mixxx-9999-libsoundtouch.patch b/media-sound/mixxx/files/mixxx-9999-libsoundtouch.patch
index abd779ee3..44c2168bc 100644
--- a/media-sound/mixxx/files/mixxx-9999-libsoundtouch.patch
+++ b/media-sound/mixxx/files/mixxx-9999-libsoundtouch.patch
@@ -1,43 +1,45 @@
-=== 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.6.0'
- 
-     def sources(self, build):
--        sources = ['engine/enginebufferscalest.cpp',
--                   '#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/TDStretch.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/RateTransposer.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/AAFilter.cpp' % self.SOUNDTOUCH_PATH,
--                   '#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,
--                   '#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:
-             # 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')
- 
- class TagLib(Dependence):
-     def configure(self, build, conf):
-
+=== modified file 'mixxx/build/depends.py'

+--- build/depends.py	2012-03-12 05:23:47 +0000

++++ build/depends.py	2012-03-16 04:18:42 +0000

+@@ -218,34 +218,20 @@

+         build.env.Append(CPPPATH="#lib/replaygain")

+ 

+ class SoundTouch(Dependence):

+-    SOUNDTOUCH_PATH = 'soundtouch-1.6.0'

+ 

+     def sources(self, build):

+-        sources = ['engine/enginebufferscalest.cpp',

+-                   '#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH,

+-                   '#lib/%s/TDStretch.cpp' % self.SOUNDTOUCH_PATH,

+-                   '#lib/%s/RateTransposer.cpp' % self.SOUNDTOUCH_PATH,

+-                   '#lib/%s/AAFilter.cpp' % self.SOUNDTOUCH_PATH,

+-                   '#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,

+-                   '#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:

+             # 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')

++

+ 

+ class TagLib(Dependence):

+     def configure(self, build, conf):

+