[SCM] ffmpeg/master: Build with --disable-mips32r6 on mips(el) to fix FTBFS there

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 80adc029774ebccc762e64613106471b15617998
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Fri May 13 16:44:45 2016 +0200

    Build with --disable-mips32r6 on mips(el) to fix FTBFS there

diff --git a/debian/rules b/debian/rules
index c7e4b82..aebc197 100755
--- a/debian/rules
+++ b/debian/rules
@@ -176,11 +176,12 @@ endif
 # Disable optimizations on mips(el) and some on mips64(el), because they are not always available on these architectures.
 ifneq (,$(filter $(DEB_HOST_ARCH),mips mipsel mips64 mips64el))
 	CONFIG += --disable-mipsdsp \
-	--disable-mipsdspr2 \
-	--disable-loongson3
+		--disable-mipsdspr2 \
+		--disable-loongson3
 endif
 ifneq (,$(filter $(DEB_HOST_ARCH),mips mipsel))
-	CONFIG += --disable-mipsfpu
+	CONFIG += --disable-mipsfpu \
+		--disable-mips32r6
 endif
 
 # Use the default debhelper scripts, where possible.

-- 
ffmpeg packaging