[SCM] ffmpeg/master: adapt debian/rules to changes in configure

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

The following commit has been merged in the master branch:
commit 0fcf11f28349b59894f022a4290784acbfa93aeb
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Wed Jun 10 22:24:03 2015 +0200

    adapt debian/rules to changes in configure

diff --git a/debian/changelog b/debian/changelog
index 3cb180b..e8c516b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ ffmpeg (7:2.7-1) UNRELEASED; urgency=medium
   * Restrict shlib-with-non-pic-code lintian override to i386.
     Thanks to Jakub Wilk for the hint.
   * Use '-strict -2' in the encdec autopkgtest also for probing/decoding.
+  * Disable loongson3 optimizations on mips, because they are not always
+    available.
 
  -- Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>  Fri, 05 Jun 2015 14:23:01 +0200
 
diff --git a/debian/rules b/debian/rules
index 1613313..ac4c9cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,6 +32,7 @@ LDFLAGS := $(filter-out %-Bsymbolic-functions,$(shell dpkg-buildflags --get LDFL
 # The following flags are not added, because the necessary libraries are not in Debian:
 #   --enable-decklink
 #   --enable-libcelt                (see #676592: removed from Debian as abandoned upstream, replaced by opus)
+#   --enable-libdcadec
 #   --enable-libilbc                (see #675959 for the RFP bug)
 #   --enable-libmfx
 #   --enable-libnut
@@ -160,7 +161,8 @@ 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-mipsdspr1 \
-	--disable-mipsdspr2
+	--disable-mipsdspr2 \
+	--disable-loongson3
 endif
 ifneq (,$(filter $(DEB_HOST_ARCH),mips mipsel))
 	CONFIG += --disable-mipsfpu

-- 
ffmpeg packaging