[SCM] ffmpeg/master: Disable mips32r6 for all mips architectures

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6df8d3cf8b90a610d4dbf78a86b7a147acccfa8a
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat May 14 00:30:43 2016 +0200

    Disable mips32r6 for all mips architectures

diff --git a/debian/rules b/debian/rules
index aebc197..fb36a54 100755
--- a/debian/rules
+++ b/debian/rules
@@ -177,11 +177,11 @@ endif
 ifneq (,$(filter $(DEB_HOST_ARCH),mips mipsel mips64 mips64el))
 	CONFIG += --disable-mipsdsp \
 		--disable-mipsdspr2 \
-		--disable-loongson3
+		--disable-loongson3 \
+		--disable-mips32r6
 endif
 ifneq (,$(filter $(DEB_HOST_ARCH),mips mipsel))
-	CONFIG += --disable-mipsfpu \
-		--disable-mips32r6
+	CONFIG += --disable-mipsfpu
 endif
 
 # Use the default debhelper scripts, where possible.

-- 
ffmpeg packaging