[SCM] mixxx/master: Add patch to fix FTBFS on alpha.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Sun Nov 28 10:14:11 UTC 2010


The following commit has been merged in the master branch:
commit 3854a0f39471c135379e322da40eec32a6666541
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Nov 28 11:14:02 2010 +0100

    Add patch to fix FTBFS on alpha.

diff --git a/debian/patches/40-alpha_ftbfs.patch b/debian/patches/40-alpha_ftbfs.patch
new file mode 100644
index 0000000..26e8fb4
--- /dev/null
+++ b/debian/patches/40-alpha_ftbfs.patch
@@ -0,0 +1,18 @@
+Description: Get rid of the -Dalpha, fixes FTBFS on alpha.
+Author: Alessio Treglia <alessio at debian.org>
+---
+ src/SConscript.env |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- mixxx.orig/src/SConscript.env
++++ mixxx/src/SConscript.env
+@@ -769,7 +769,8 @@ if platformString in ('linux', 'bsd'):
+ 
+ #declare platform specific flags? though we shouldn't really need these, the compilers should Just Know...
+ #on __APPLE__ it works like that. probably we just need to look into what the default __platform__ #defines are and search and replace in the code
+-env.Append(CPPDEFINES=machine)
++if not machine == 'alpha':
++	env.Append(CPPDEFINES=machine)
+ 
+ if platformString == 'linux':
+ 	env.Append(CPPDEFINES='__LINUX__')
diff --git a/debian/patches/ubuntu.series b/debian/patches/ubuntu.series
index e060b29..a8c53c5 100644
--- a/debian/patches/ubuntu.series
+++ b/debian/patches/ubuntu.series
@@ -2,3 +2,4 @@
 #10_soundtouch.dpatch
 20_norpath.patch
 30-disable_soundsourcem4a.patch
+40-alpha_ftbfs.patch

-- 
mixxx packaging



More information about the pkg-multimedia-commits mailing list