[SCM] ffmpeg/master: Disable unavailable frei0r, opencv and x264 on mips64el.

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

The following commit has been merged in the master branch:
commit d4a91baaa754a5f60c84ca9c85decf82dc6bfc82
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Tue Sep 15 20:34:18 2015 +0200

    Disable unavailable frei0r, opencv and x264 on mips64el.

diff --git a/debian/control b/debian/control
index 6baf679..0f11c74 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Build-Depends:
 # --enable-libflite
  flite1-dev,
 # --enable-frei0r
- frei0r-plugins-dev,
+ frei0r-plugins-dev [!mips64el],
 # --enable-ladspa
  ladspa-sdk,
 # --enable-libass
@@ -74,7 +74,7 @@ Build-Depends:
 # --enable-libopencore_amrwb
  libopencore-amrwb-dev,
 # --enable-libopencv
- libopencv-dev [!alpha !sh4 !sparc64],
+ libopencv-dev [!alpha !sh4 !sparc64 !mips64el],
 # --enable-libopenjpeg
  libopenjpeg-dev,
 # --enable-libopus
@@ -124,7 +124,7 @@ Build-Depends:
 # --enable-libwebp
  libwebp-dev,
 # --enable-libx264
- libx264-dev [!sparc64],
+ libx264-dev [!sparc64 !mips64el],
 # --enable-libx265
  libx265-dev,
 # --enable-x11grab
diff --git a/debian/rules b/debian/rules
index a416549..81ff845 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,7 +65,6 @@ CONFIG := --prefix=/usr \
 	--disable-stripping \
 	--enable-avresample \
 	--enable-avisynth \
-	--enable-frei0r \
 	--enable-gnutls \
 	--enable-ladspa \
 	--enable-libass \
@@ -133,13 +132,18 @@ ifneq ($(DEB_HOST_ARCH_OS),hurd)
 	CONFIG += --enable-libzmq
 endif
 
-# Some libraries are not available/unusable (#792921) on sparc64.
-ifneq ($(DEB_HOST_ARCH),sparc64)
+# Some libraries are not available on mips64el.
+ifeq (,$(filter $(DEB_HOST_ARCH),mips64el))
+	CONFIG += --enable-frei0r
+endif
+
+# Some libraries are not available/unusable (#792921) on sparc64/mips64el.
+ifeq (,$(filter $(DEB_HOST_ARCH),sparc64 mips64el))
 	CONFIG += --enable-libx264
 endif
 
 # OpenCV is not available on some architectures.
-ifeq (,$(filter $(DEB_HOST_ARCH),alpha sh4 sparc64))
+ifeq (,$(filter $(DEB_HOST_ARCH),alpha sh4 sparc64 mips64el))
 	CONFIG += --enable-libopencv
 endif
 

-- 
ffmpeg packaging