[SCM] supercollider/master: Include altivec.h on powerpc, fixing FTBFS

[danstowell-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 10a1b146399455904d329c5bc60d369d74c3b0ce
Author: Michael Terry <michael.terry at canonical.com>
Date:   Sat Nov 19 13:28:04 2011 +0000

    Include altivec.h on powerpc, fixing FTBFS

diff --git a/debian/patches/12_ppc_altivec.patch b/debian/patches/12_ppc_altivec.patch
new file mode 100644
index 0000000..6d81749
--- /dev/null
+++ b/debian/patches/12_ppc_altivec.patch
@@ -0,0 +1,31 @@
+Description: Include altivec.h on powerpc, fixing FTBFS
+Origin: http://www.listarc.bham.ac.uk/lists/sc-users-2008/msg62313.html
+From: dmotd <inaudible at xxxxxxxxxxxxxxxxxxx>
+Forwarded: yes
+
+Index: supercollider/common/Headers/common/SC_Altivec.h
+===================================================================
+--- supercollider.orig/common/Headers/common/SC_Altivec.h	2011-11-19 13:27:22.930624357 +0000
++++ supercollider/common/Headers/common/SC_Altivec.h	2011-11-19 13:28:48.206624314 +0000
+@@ -21,7 +21,7 @@
+ #ifndef _SC_Altivec_
+ #define _SC_Altivec_
+ 
+-#if defined(__ALTIVEC__) && !defined(__APPLE_ALTIVEC__)
++#if defined(HAS_ALTIVEC) || defined(__ALTIVEC__) && !defined(__APPLE_ALTIVEC__)
+ # include <altivec.h>
+ /* From <altivec.h>:
+    You are allowed to undef these for C++ compatibility. */
+Index: supercollider/common/SConstruct
+===================================================================
+--- supercollider.orig/common/SConstruct	2011-11-19 13:28:48.198624314 +0000
++++ supercollider/common/SConstruct	2011-11-19 13:28:48.206624314 +0000
+@@ -603,7 +603,7 @@
+     libraries['altivec'] = env.Clone()
+     libraries['altivec'].Append(
+         CCFLAGS = altivec_flags,
+-        CPPDEFINES = [('SC_MEMORY_ALIGNMENT', 16)])
++        CPPDEFINES = [('SC_MEMORY_ALIGNMENT', 16), 'HAS_ALTIVEC'])
+     altiConf = Configure(libraries['altivec'])
+     features['altivec'] = altiConf.CheckCHeader('altivec.h')
+     altiConf.Finish()
diff --git a/debian/patches/series b/debian/patches/series
index 856cf08..d5ee5fb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 07_deb_sced.diff
 10_fix_rpath.diff
 11_fix_linkingorder.diff
+12_ppc_altivec.patch

-- 
supercollider packaging