media-sound/mixxx: Live ebuild update to depend on qt 4.6 or later and fixed the libsoundtouch externalization patch broken by upstream updates.

svn path=/sunrise/; revision=12507

4 files changed, 33 insertions, 53 deletions

diff --git a/media-sound/mixxx/ChangeLog b/media-sound/mixxx/ChangeLog
index 49e84b3ae..5d271bc88 100644
--- a/media-sound/mixxx/ChangeLog
+++ b/media-sound/mixxx/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Nov 2011; Alex Barker (KWhat) <alex@1stleg.com> mixxx-9999.ebuild,
+  files/mixxx-9999-libsoundtouch.patch:
+  Live ebuild update to depend on qt 4.6 or later and fixed the libsoundtouch
+  externalization patch broken by upstream updates.
+
   03 Nov 2011; Alex Barker (KWhat) <alex@1stleg.com> -mixxx-1.9.0-r2.ebuild,
   -files/mixxx-1.9.0-flags.patch, -files/mixxx-1.9.0-libsoundtouch.patch,
   -files/mixxx-1.9.0-linux3.patch, +mixxx-1.9.2.ebuild,
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index aa009a235..ce01f2cd2 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,9 +1,9 @@
 AUX mixxx-1.9.2-flags.patch 624 RMD160 b10c1e796fd71c35c24781cfbdbb33f7955cc4ac SHA1 f9d8e2eb698b90a50b2c110902b94ddb6300b847 SHA256 1387d7c8e886d5c98b48639628b6ec5c73bcb507b92e0220ee8648a3c7b08dd5
 AUX mixxx-1.9.2-libsoundtouch.patch 3342 RMD160 a85ff591389c9fa6b25de55f3cda7e8e0ea6fcbe SHA1 212673d3b024934ca7c8c39591055e66b6d5016f SHA256 234e058145ca14bbbbb0f34fe1c07e5d0ff55999d952547b054744edc5feaa0d
 AUX mixxx-9999-flags.patch 624 RMD160 b10c1e796fd71c35c24781cfbdbb33f7955cc4ac SHA1 f9d8e2eb698b90a50b2c110902b94ddb6300b847 SHA256 1387d7c8e886d5c98b48639628b6ec5c73bcb507b92e0220ee8648a3c7b08dd5
-AUX mixxx-9999-libsoundtouch.patch 3342 RMD160 ecfb3bb0b9f356a5f937a8f9162c8b23fad1da92 SHA1 7ae36d669ff1359fd457be012940c6fb1ce8c2a8 SHA256 fde2401da761e7ea808378dc6df9b49d3858f8c964ebe9a373719559b51ecb71
+AUX mixxx-9999-libsoundtouch.patch 2233 RMD160 e64e4ebe0241d3be2a691ed819b0beb7bd7db5f1 SHA1 3560630ab5bd9716fc54a104edadd15478ff2a27 SHA256 35abe2708d701a7cfaade4b33e76657a11bb620f73d484126d53c5ae95424759
 DIST mixxx-1.9.2-src.tar.gz 7444069 RMD160 4062fb626f5ce49c2081b57641fb6bc7ba52a540 SHA1 41cc27b5fd7a7b2e999ba337114f5e6b4fa9d7be SHA256 2cefee1f5cf91344f12df5c1e9320e30d5ad29361a0bc590e6f5b9d2e969af77
 EBUILD mixxx-1.9.2.ebuild 1770 RMD160 ce05bfc60f3df3613fbae72425c7ad060c53bacf SHA1 413c29c549b7fdacd36ebcc5dd0e7e961a04f87c SHA256 9f8cd3b6ed81d2501dc11c05057d9ddfdb4f0d0ff8c17beae45686119c3cb775
-EBUILD mixxx-9999.ebuild 1732 RMD160 c8736787c76d6de1c07f97ab35a512fff8203110 SHA1 0088664d8f9b4aa6d605ffc398d70f49118d8d20 SHA256 a37c953b5433e3e700a5a09e23f2381946e74095c9dda3026b6c7462d8cb9d56
-MISC ChangeLog 2145 RMD160 3ca39ee2c8155a6e486bf773ae441fcef2fec4e9 SHA1 4d024fd5bc4365870d3169d8e5b0930435a19786 SHA256 200d02c526bf4bd07cb375e22b54f009a332bbaa2d424d0b39c2a2745c305247
+EBUILD mixxx-9999.ebuild 1768 RMD160 c4885620611a722dff19e101e78326c4a121ffc4 SHA1 6bd00841dc6555401bca5529bdc64b95ff808635 SHA256 d9541f2141f8883e267e7f9c51651ded29151c3eabe3f298b07a1373b48ca7cd
+MISC ChangeLog 2388 RMD160 f572d8c92cdd2d985672b6eb128f0e0beb0195ba SHA1 ca2dbb2b3eebe466452150ebb728589e27b315fb SHA256 9f19e891e8b89815b1ad99891ed78651c28b9369f647ca411a89d6c932c0311c
 MISC metadata.xml 410 RMD160 8b5dee500da763730f1ffd02863d23221cb4f04b SHA1 e09418482c729b27b392f42ecf3e4344f71c56b9 SHA256 812fc2fb4d75f2035068cd2f547174c6aedf91799a1fc64ef54d15c611a28128
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):
+
diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
index 7286a4f92..7fc697e15 100644
--- a/media-sound/mixxx/mixxx-9999.ebuild
+++ b/media-sound/mixxx/mixxx-9999.ebuild
@@ -26,12 +26,12 @@ RDEPEND="media-libs/flac
 	media-libs/taglib
 	virtual/opengl
 	virtual/glu
-	x11-libs/qt-gui:4
-	x11-libs/qt-svg:4
-	x11-libs/qt-opengl:4
-	x11-libs/qt-qt3support:4
-	x11-libs/qt-webkit:4
-	x11-libs/qt-xmlpatterns:4
+	>=x11-libs/qt-gui-4.6:4
+	>=x11-libs/qt-svg-4.6:4
+	>=x11-libs/qt-opengl-4.6:4
+	>=x11-libs/qt-qt3support-4.6:4
+	>=x11-libs/qt-webkit-4.6:4
+	>=x11-libs/qt-xmlpatterns-4.6:4
 	mp4? (	media-libs/faad2
 		media-libs/libmp4v2
 	)