[SCM] mixxx/master: Refresh patch.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 04d7370040e69c3203c3ad2e162b1562c455aaef
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Nov 8 13:31:56 2011 +0100

    Refresh patch.

diff --git a/debian/patches/15-various_archs_support.patch b/debian/patches/15-various_archs_support.patch
index 3f4cf42..1966b4c 100644
--- a/debian/patches/15-various_archs_support.patch
+++ b/debian/patches/15-various_archs_support.patch
@@ -1,41 +1,25 @@
-Description: Allow the compilation on several architectures.
- Get rid of the -Dalpha, fixes FTBFS on alpha.
+Description: Allow compilation on more Debian ports.
 Author: Alessio Treglia <alessio at debian.org>
 Bug: https://launchpad.net/bugs/683029
 Bug-Debian: http://bugs.debian.org/598749
 Bug-Debian: http://bugs.debian.org/616177
 Forwarded: https://bugs.launchpad.net/mixxx/+bug/683029/comments/3
 ---
- build/depends.py |    3 ++-
- build/mixxx.py   |    7 ++++++-
- 2 files changed, 8 insertions(+), 2 deletions(-)
+ build/mixxx.py |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
 
 --- mixxx.orig/build/mixxx.py
 +++ mixxx/build/mixxx.py
-@@ -39,8 +39,13 @@ class MixxxBuild(object):
-             raise Exception("invalid target platform")
+@@ -41,9 +41,11 @@ class MixxxBuild(object):
  
          if machine not in ['x86_64', 'x86', 'i686', 'i586',
-+                           'alpha', 'hppa', 'mips', 'mipsel', 's390',
+                            'alpha', 'hppa', 'mips', 'mipsel', 's390',
+-                           'sparc', 'ia64', 'armel', 'hurd-i386',
 +                           'sparc', 'ia64', 'armel', 'armhf', 'hurd-i386',
 +                           'sh3', 'sh4',
-+                           'kfreebsd-amd64', 'kfreebsd-i386',
+                            'kfreebsd-amd64', 'kfreebsd-i386',
                             'i486', 'i386', 'powerpc', 'powerpc64',
--                           'AMD64', 'EM64T', 'INTEL64']:
 +                           'powerpcspe', 's390x',
-+                           'amd64', 'EM64T', 'INTEL64']:
+                            'amd64', 'AMD64', 'EM64T', 'INTEL64']:
              raise Exception("invalid machine type")
  
-         if toolchain not in ['gnu', 'msvs']:
---- mixxx.orig/build/depends.py
-+++ mixxx/build/depends.py
-@@ -591,7 +591,8 @@ class MixxxCore(Feature):
-         # Evaluate this define. There are a lot of different things around the
-         # codebase that use different defines. (AMD64, x86_64, x86, i386, i686,
-         # EM64T). We need to unify them together.
--        build.env.Append(CPPDEFINES=build.machine)
-+        if not build.machine=='alpha':
-+            build.env.Append(CPPDEFINES=build.machine)
- 
-         if build.toolchain_is_gnu:
-             # Default GNU Options

-- 
mixxx packaging