[SCM] ffmpeg/master: Enable the now available opencv and frei0r on mips64el.

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

The following commit has been merged in the master branch:
commit 6f5e66ba103c6263d01a424ec68002804306ad58
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Fri Jan 15 20:06:59 2016 +0100

    Enable the now available opencv and frei0r on mips64el.

diff --git a/debian/control b/debian/control
index 9532312..461b636 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Build-Depends:
 # --enable-libflite
  flite1-dev,
 # --enable-frei0r
- frei0r-plugins-dev [!mips64el] <!stage1>,
+ frei0r-plugins-dev <!stage1>,
 # --enable-ladspa
  ladspa-sdk,
 # --enable-libass
@@ -77,7 +77,7 @@ Build-Depends:
 # --enable-libopencore_amrwb
  libopencore-amrwb-dev,
 # --enable-libopencv
- libopencv-dev [!sh4 !sparc64 !mips64el] <!stage1>,
+ libopencv-dev [!sh4 !sparc64] <!stage1>,
 # --enable-libopenjpeg
  libopenjpeg-dev,
 # --enable-libopus
diff --git a/debian/rules b/debian/rules
index 310700f..24d6136 100755
--- a/debian/rules
+++ b/debian/rules
@@ -146,18 +146,15 @@ endif
 ifneq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
 	CONFIG += --disable-libx264 --disable-libopencv --disable-frei0r
 else
-	# Some libraries are not available on mips64el.
-	ifeq (,$(filter $(DEB_HOST_ARCH),mips64el))
-		CONFIG += --enable-frei0r
-	endif
+	CONFIG += --enable-frei0r
 
-	# Some libraries are not available/unusable (#792921) on sparc64/mips64el.
+	# Some libraries are unusable (#792921) on sparc64.
 	ifeq (,$(filter $(DEB_HOST_ARCH),sparc64))
 		CONFIG += --enable-libx264
 	endif
 
 	# OpenCV is not available on some architectures.
-	ifeq (,$(filter $(DEB_HOST_ARCH),sh4 sparc64 mips64el))
+	ifeq (,$(filter $(DEB_HOST_ARCH),sh4 sparc64))
 		CONFIG += --enable-libopencv
 	endif
 endif

-- 
ffmpeg packaging