[SCM] SETI at home packaging branch, master, updated. debian/6.12_svn1305-2-41-gae41c20

[Guo Yixuan]

The following commit has been merged in the master branch:
commit ae41c202a6a3ba2cfd3d84bcd01a7d371ab58c13
Author: Guo Yixuan <culu.gyx at gmail.com>
Date:   Sun Aug 19 14:50:15 2012 +0800

    Disable altivec on PPC in the case of LINUX
    
    Thanks to Ben Collins <bcollins at ubuntu.com>

diff --git a/debian/changelog b/debian/changelog
index a26248e..4ac416f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+boinc-app-seti (6.12~svn1385-2) UNRELEASED; urgency=low
+
+  * debian/patches/004_disable_altivec_on_ppc_linux.patch: Disable use of
+    altivec on PPC in the case of LINUX. Fixes FTBFS, thanks to Ben Collins
+    <bcollins at ubuntu.com>.
+
+ -- Guo Yixuan <culu.gyx at gmail.com>  Sun, 19 Aug 2012 14:56:37 +0800
+
 boinc-app-seti (6.12~svn1385-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/patches/004_disable_altivec_on_ppc_linux.patch b/debian/patches/004_disable_altivec_on_ppc_linux.patch
new file mode 100644
index 0000000..dc7ec1c
--- /dev/null
+++ b/debian/patches/004_disable_altivec_on_ppc_linux.patch
@@ -0,0 +1,24 @@
+Description: Disable altivec on PPC if !LINUX
+ Taken from Ubuntu's 6.12~svn1305-2ubuntu1, at Tue, 12 Jun 2012 22:28:38 -0400.
+Author: Ben Collins <bcollins at ubuntu.com>
+
+--- boinc-app-seti-6.12~svn1305.orig/client/Makefile.am
++++ boinc-app-seti-6.12~svn1305/client/Makefile.am
+@@ -161,7 +161,8 @@ seti_boinc-analyzeFuncs_vector.o:  vecto
+ endif
+ 
+ if PPC
+-# allow use of altivec instructions on PPC
++if !LINUX
++# allow use of altivec instructions on PPC/MacOS
+ seti_boinc-analyzeFuncs_altivec.o:  vector/analyzeFuncs_altivec.cpp
+ 	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(seti_boinc_CXXFLAGS) $(CXXFLAGS) -DUSE_ALTIVEC \
+@@ -175,6 +176,7 @@ seti_boinc-analyzeFuncs_vector.o:  vecto
+ 	-c -o $@ $<; then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+ 	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ endif
++endif
+ 
+ 
+ if LINUX
diff --git a/debian/patches/series b/debian/patches/series
index 61e0a69..c8e29ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,9 @@
 #002_disable_static_linkage.patch
 #003_dont_use_own_jpeglib.patch
 101_freebsd_build.patch
-102_powerpc_altivec.patch
+#102_powerpc_altivec.patch
 210_fix_fgets_warning.patch
 211_give_stderr_some_output.patch
 212_increase_buffers.patch
 omitting_archs.patch
+004_disable_altivec_on_ppc_linux.patch

-- 
SETI at home packaging