[proaudio] [2110] mixxx-9999.ebuild: system-libs.patch is updated.

[subversion@xxxxxxxxxxxxx]

Revision: 2110
Author:   keenblade
Date:     2012-04-24 04:33:48 +0200 (Tue, 24 Apr 2012)
Log Message:
-----------
mixxx-9999.ebuild: system-libs.patch is updated. Thanks to Alex Barker

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/mixxx/ChangeLog
    trunk/overlays/proaudio/media-sound/mixxx/Manifest
    trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-system-libs.patch

Modified: trunk/overlays/proaudio/media-sound/mixxx/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/ChangeLog	2012-04-21 01:07:00 UTC (rev 2109)
+++ trunk/overlays/proaudio/media-sound/mixxx/ChangeLog	2012-04-24 02:33:48 UTC (rev 2110)
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  24 Apr 2012; Hakan Demiralp <keenblade@xxxxxxxxxxxxx>
+  files/mixxx-9999-system-libs.patch:
+  mixxx-9999.ebuild: system-libs.patch is updated. Thanks to Alex Barker
+
   21 Apr 2012; Hakan Demiralp <keenblade@xxxxxxxxxxxxx> mixxx-9999.ebuild,
   +files/mixxx-9999-m4a.patch, +files/mixxx-9999-wavpack.patch:
   mixxx-9999.ebuild: ebuild updated and new patches. Thanks to Alex Barker

Modified: trunk/overlays/proaudio/media-sound/mixxx/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/Manifest	2012-04-21 01:07:00 UTC (rev 2109)
+++ trunk/overlays/proaudio/media-sound/mixxx/Manifest	2012-04-24 02:33:48 UTC (rev 2110)
@@ -9,10 +9,10 @@
 AUX mixxx-9999-docs.patch 323 RMD160 953d86c79cd920f0366963152e40099ed1d8b5ea SHA1 5403af1456b57017fbb9d1f28fa273a4dab74e15 SHA256 5bf3ed311fa6832b5f4f0378e702a1ccab4f9a08c9fa4587fd501754577b5dc7
 AUX mixxx-9999-m4a.patch 703 RMD160 2677c7ff74312ed1c2bc9c1e0286ca30ed08458b SHA1 fd36cb69cb26ee95af3192ba6be5073041589144 SHA256 4d80a6dd4cfd64c1ebedd6a9514824329c5c8f8d7ad4e26bd44c9aeba12d11a0
 AUX mixxx-9999-no-bzr.patch 1496 RMD160 2f10537abe9fe373d791e77984c3abc1b9f7f82c SHA1 245b85509d038ada45612c64781875e049331b61 SHA256 b50722573af57129892a92f9e7502ddc2d679f29435b27581352dc075d40c5c0
-AUX mixxx-9999-system-libs.patch 5878 RMD160 3349088b72e854bf06a1e22cfda3bbbb8f292e4a SHA1 4538ec5d125da83fb173980a912a8998c80e1793 SHA256 35f4a30e2aa6a6c66f175d2223e74fcb49407339cea60040da753199c9070b93
+AUX mixxx-9999-system-libs.patch 6157 RMD160 944982b976ecd5d22f9f2caf53f24836c9240ac1 SHA1 3a25864da30e38410ac8ddb093f70aa479aa0e8e SHA256 a9b4737a03a1a4c6c32a1ebc2f501cf2fe74354b5ea09010b59cf9cc360a04fd
 AUX mixxx-9999-wavpack.patch 2020 RMD160 708427c50256f2fa9f0e9eaa2f5717cb46aacbb9 SHA1 707a120641681821f8f278bdd89171313feebd9f SHA256 5589578406062f11f426401262d6198777b68d52595618071a2fa7203ff3112b
 DIST mixxx-1.10.0-src.tar.gz 15852338 RMD160 dde454d7ff6200e33c401e87313ad399ff751d53 SHA1 b01ab69c0eeca99fa6b1da472cfede01bda71328 SHA256 9135f814262bf42eb05bf5d56c760ab462329c06785271d570be6a9d14ab1e97
 EBUILD mixxx-1.10.0.ebuild 2443 RMD160 21e6b1d930dae41451a639b9a40088ca90665ed6 SHA1 809bbd8067f5f6820f44e9bf4ced35bab4b32bfe SHA256 6f8ebe0b50eebffdce728c02f4501de4dc1c245775cf7e1e1bfb346950f46243
 EBUILD mixxx-9999.ebuild 2279 RMD160 a86db305e0a515ba3dcb284f52b1b2a058509304 SHA1 153a768cf9e9528beb5b1826de2a9d8fd62453bf SHA256 d06c6ca9e1dfc4e4a0c56733e2cc15a2e1c5f28429f3751f162cc2419d9b0f4a
-MISC ChangeLog 3382 RMD160 430e11960635d3f4d484f82ce36fbde53c6813f5 SHA1 2657f83a5541a4e76afc7fe25f0f82ab34a82c51 SHA256 1881e820a312d4699ccddbbdae74bdfb137fd6df478fe5e35b19da68dbdb848a
+MISC ChangeLog 3550 RMD160 1c449e654fbf318161d570f6050e870225c27d30 SHA1 c7a7c48bab1d0ea611f7a4d51b89060dac4ed9d8 SHA256 b793613e84edad1d5db444b80c5c6b23dd359706ab8d1e0a3d025bf68a67801a
 MISC metadata.xml 754 RMD160 3a4507c7280aeba4befbf07479cc3149526ec968 SHA1 07e5cb6c41989b25648616b5e0fc702addb8e312 SHA256 83057c5b52668f9b0a507bf324a031a7714f83390bd43752b94df888a1e85141

Modified: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-system-libs.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-system-libs.patch	2012-04-21 01:07:00 UTC (rev 2109)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-system-libs.patch	2012-04-24 02:33:48 UTC (rev 2110)
@@ -1,14 +1,6 @@
---- mixxx-9999/build/depends.py	2012-03-12 05:23:47 +0000
-+++ mixxx-9999/build/depends.py	2012-03-21 20:41:47 +0000
-@@ -21,7 +21,7 @@
- 
-     def configure(self, build, conf):
-         #Check for PortTime
--        if not conf.CheckLib(['porttime', 'libporttime']) and \
-+        if not conf.CheckLib(['porttime', 'libportmidi']) and \
-                 not conf.CheckHeader(['porttime.h']):
-             raise Exception("Did not find PortTime or its development headers.")
-         if not conf.CheckLib(['portmidi', 'libportmidi']) and \
+=== modified file 'mixxx/build/depends.py'
+--- mixxx-9999/build/depends.py	2012-04-22 17:33:25 +0000
++++ mixxx-9999/build/depends.py	2012-04-23 23:49:03 +0000
 @@ -189,25 +189,10 @@
  
  class FidLib(Dependence):
@@ -38,12 +30,17 @@
  
  class ReplayGain(Dependence):
  
-@@ -218,34 +203,15 @@
+@@ -218,7 +203,6 @@
          build.env.Append(CPPPATH="#lib/replaygain")
  
  class SoundTouch(Dependence):
 -    SOUNDTOUCH_PATH = 'soundtouch-1.6.0'
  
+     def sse_enabled(self, build):
+         optimize = int(util.get_flags(build.env, 'optimize', 1))
+@@ -227,42 +211,13 @@
+                 (build.toolchain_is_gnu and optimize > 1))
+ 
      def sources(self, build):
 -        sources = ['engine/enginebufferscalest.cpp',
 -                   '#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH,
@@ -53,16 +50,21 @@
 -                   '#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,]
+-                   '#lib/%s/BPMDetect.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'
+-            '#lib/%s/cpu_detect_x86_gcc.cpp'
 -        sources.append(cpu_detection % self.SOUNDTOUCH_PATH)
+-
+-        # Check if the compiler has SSE extention enabled
+-        # Allways the case on x64 (core instructions)
+-        if self.sse_enabled(build):
+-            sources.extend(
+-                ['#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH,
+-                 '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH,])
 -        return sources
 +        return ['engine/enginebufferscalest.cpp']
  
@@ -71,6 +73,12 @@
 -            # Regardless of the bitwidth, ST checks for WIN32
 -            build.env.Append(CPPDEFINES = 'WIN32')
 -        build.env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])
+-
+-        # Check if the compiler has SSE extention enabled
+-        # Allways the case on x64 (core instructions)
+-        optimize = int(util.get_flags(build.env, 'optimize', 1))
+-        if self.sse_enabled(build):
+-            build.env.Append(CPPDEFINES='SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS')
 +        if not conf.CheckLib(['SoundTouch','libSoundTouch']):
 +            raise Exception('Did not find SoundTouch library, exiting!')
 +        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/soundtouch'])