[SCM] ffmpeg/master: Fix FTBFS on powerpc and arch-independent build.

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

The following commit has been merged in the master branch:
commit 1ee3e235566956116d95aeaa0279355979957274
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Tue Nov 1 00:32:40 2016 +0100

    Fix FTBFS on powerpc and arch-independent build.

diff --git a/debian/rules b/debian/rules
index 5ca733a..c69cfbc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -159,7 +159,8 @@ ifeq ($(DEB_HOST_ARCH),powerpc)
 	# Build an altivec flavor of the libraries on powerpc.
 	# This works around the problem that runtime cpu detection on powerpc currently does not work,
 	# because, if altivec is enabled, all files are build with '-maltivec' so that the compiler inserts altivec instructions, wherever it likes.
-	CONFIG_altivec = --enable-altivec \
+	CONFIG_altivec = --enable-shared \
+		--enable-altivec \
 		--disable-doc \
 		--disable-programs
 	CONFIG_altivec-extra = $(CONFIG_altivec) $(CONFIG_extra)
@@ -240,7 +241,7 @@ override_dh_auto_test-arch:
 # No tests for indep build.
 override_dh_auto_test-indep:
 
-override_dh_auto_install:
+override_dh_auto_install-arch:
 	dh_auto_install --sourcedirectory=debian/standard
 ifeq ($(DEB_HOST_ARCH),powerpc)
 	install -d debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/altivec
@@ -254,6 +255,9 @@ endif
 	# Use the static libraries from the --disable-pic build
 	install -m 644 debian/static/*/lib*.a debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
 
+override_dh_auto_install-indep:
+	dh_auto_install --sourcedirectory=debian/standard
+
 override_dh_install:
 	dh_install $(addprefix -p,$(EXTRA_PKGS)) --sourcedir=debian/tmp/extra
 	dh_install --remaining-packages

-- 
ffmpeg packaging