[SCM] mixxx/master: Allow ALLOW_X86_OPTIMIZATIONS on amd64 only, fixes FTBFS on ia64 (Closes: #599978).

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 505715bcc6a5aecb2fd72c63e7c35f3c08f4f86a
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Oct 16 09:44:00 2010 +0200

    Allow ALLOW_X86_OPTIMIZATIONS on amd64 only, fixes FTBFS on ia64 (Closes: #599978).

diff --git a/debian/patches/20_norpath.patch b/debian/patches/20_norpath.patch
index d361a56..0bc94e9 100644
--- a/debian/patches/20_norpath.patch
+++ b/debian/patches/20_norpath.patch
@@ -1,16 +1,31 @@
+Description: Drop -Wl,-rpath from LINKFLAGS.
+ Allow ALLOW_X86_OPTIMIZATIONS on amd64 only, fixes FTBFS on ia64.
+Origin: Debian
+Bug-Debian: http://bugs.debian.org/599978
+Forwarded: no
 ---
- src/SConscript.env |    3 ---
- 1 file changed, 3 deletions(-)
+ src/SConscript.env |    6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
 
 --- mixxx.orig/src/SConscript.env
 +++ mixxx/src/SConscript.env
 @@ -837,9 +837,6 @@ if 'win' in platformString:
- else:
- 	env.Append(CCFLAGS = Split(""" -pipe -Wall -W -g """)) # omghax
- 	env.Append(LINKFLAGS = Split(""" -pipe -Wall -W -g"""))
--	if platformString != 'osx':
--		env.Append(LINKFLAGS = "-Wl,-rpath,$QTDIR/lib")
--	env.Append(LINKFLAGS = "-Wl,-rpath,$QTDIR/lib")
- 	env.Append(CPPDEFINES = "_REENTRANT")
- 
- #Uic these guys (they're moc'd automatically after this) - Generates the code for the QT UI forms
+ else:
+ 	env.Append(CCFLAGS = Split(""" -pipe -Wall -W -g """)) # omghax
+ 	env.Append(LINKFLAGS = Split(""" -pipe -Wall -W -g"""))
+-	if platformString != 'osx':
+-		env.Append(LINKFLAGS = "-Wl,-rpath,$QTDIR/lib")
+-	env.Append(LINKFLAGS = "-Wl,-rpath,$QTDIR/lib")
+ 	env.Append(CPPDEFINES = "_REENTRANT")
+ 
+ #Uic these guys (they're moc'd automatically after this) - Generates the code for the QT UI forms
+@@ -1335,7 +1332,8 @@ else:
+ # enabled. It's dumb that they appear here, but they make the most sense next to
+ # the optimization stuff. It's safe to assume that if opt > 1, then MMX and SSE
+ # are enabled. All 64-bit CPUs have MMX and SSE as well.
+-if bitwidth == '64' or (not 'win' in platformString and int(flags['optimize']) > 1) \
++if bitwidth == '64' and (machine == 'AMD64' or machine == 'EM64T') \
++    or (not 'win' in platformString and int(flags['optimize']) > 1) \
+     or ('win' in platformString and int(flags['optimize']) > 2):
+     sources += Split("""#lib/""" + soundtouch_path + """/mmx_optimized.cpp #lib/""" + soundtouch_path + """/sse_optimized.cpp""")
+     env.Append(CPPDEFINES='ALLOW_X86_OPTIMIZATIONS')

-- 
mixxx packaging