[SCM] flac packaging branch, master, updated. debian/1.2.1-2-10-g5d49876

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

The following commit has been merged in the master branch:
commit e7bcaeae1b2cd136765884705c7404882c69175e
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Tue Jun 15 13:38:16 2010 +0200

    Consider \*gnuspe which matches powerpc-unknown-linux-gnuspe where AltiVec is not available at all (Closes: #585518), thanks Sebastian Andrzej Siewior.

diff --git a/debian/patches/11_no-altivec-on-SPE.dpatch b/debian/patches/11_no-altivec-on-SPE.dpatch
new file mode 100755
index 0000000..66e82c9
--- /dev/null
+++ b/debian/patches/11_no-altivec-on-SPE.dpatch
@@ -0,0 +1,60 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11_no-altivec-on-SPE.dpatch by Fabian Greffrath <fabian+debian at greffrath.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' flac~/configure.in flac/configure.in
+--- flac~/configure.in	2010-06-15 13:14:45.000000000 +0200
++++ flac/configure.in	2010-06-15 13:35:12.000000000 +0200
+@@ -82,6 +82,14 @@
+ 	*) OBJ_FORMAT=elf ;;
+ esac
+ AC_SUBST(OBJ_FORMAT)
++case "$host" in
++	*-gnuspe)
++		abi_spe=true
++		AC_DEFINE(FLAC__CPU_PPC_SPE)
++		AH_TEMPLATE(FLAC__CPU_PPC_SPE, [define if building for PowerPC with SPE ABI])
++		;;
++esac
++AM_CONDITIONAL(FLaC__CPU_PPC_SPE, test "x$abi_spe" = xtrue)
+ 
+ # only needed because of ntohl() usage, can get rid of after that's gone:
+ case "$host" in
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' flac~/src/libFLAC/Makefile.am flac/src/libFLAC/Makefile.am
+--- flac~/src/libFLAC/Makefile.am	2010-06-15 13:14:45.000000000 +0200
++++ flac/src/libFLAC/Makefile.am	2010-06-15 13:35:12.000000000 +0200
+@@ -40,8 +40,13 @@
+ CPUCFLAGS = -faltivec -force_cpusubtype_ALL -DFLAC__NO_ASM
+ else
+ # Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific
++CPUCFLAGS =
++if FLaC__CPU_PPC_SPE
++else
++CPUCFLAGS += -maltivec -mabi=altivec
++endif
+ #@@@ PPC optimizations temporarily disabled
+-CPUCFLAGS = -maltivec -mabi=altivec -DFLAC__NO_ASM
++CPUCFLAGS += -DFLAC__NO_ASM
+ endif
+ endif
+ 
+@@ -58,6 +63,8 @@
+ if FLaC__CPU_PPC
+ ARCH_SUBDIRS = ppc
+ if FLaC__HAS_AS__TEMPORARILY_DISABLED
++if FLaC__CPU_PPC_SPE
++else
+ LOCAL_EXTRA_LIBADD = ppc/as/libFLAC-asm.la
+ LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning"
+ else
+@@ -67,6 +74,7 @@
+ endif
+ endif
+ endif
++endif
+ endif
+ 
+ libFLAC_la_LIBADD = $(LOCAL_EXTRA_LIBADD) @OGG_LIBS@

-- 
flac packaging