[SCM] ffmpeg/master: Enable x264 on mips64el and opencv on alpha.

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

The following commit has been merged in the master branch:
commit 115fa9a01ec8faba7ac1d42b7d386a7766f73eb4
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Thu Oct 15 00:21:24 2015 +0200

    Enable x264 on mips64el and opencv on alpha.

diff --git a/debian/control b/debian/control
index ee54935..2fbfe44 100644
--- a/debian/control
+++ b/debian/control
@@ -75,7 +75,7 @@ Build-Depends:
 # --enable-libopencore_amrwb
  libopencore-amrwb-dev,
 # --enable-libopencv
- libopencv-dev [!alpha !sh4 !sparc64 !mips64el],
+ libopencv-dev [!sh4 !sparc64 !mips64el],
 # --enable-libopenjpeg
  libopenjpeg-dev,
 # --enable-libopus
@@ -127,7 +127,7 @@ Build-Depends:
 # --enable-libwebp
  libwebp-dev,
 # --enable-libx264
- libx264-dev [!sparc64 !mips64el],
+ libx264-dev [!sparc64],
 # --enable-libx265
  libx265-dev,
 # --enable-x11grab
diff --git a/debian/rules b/debian/rules
index 66e65e6..8a2cb57 100755
--- a/debian/rules
+++ b/debian/rules
@@ -145,12 +145,12 @@ ifeq (,$(filter $(DEB_HOST_ARCH),mips64el))
 endif
 
 # Some libraries are not available/unusable (#792921) on sparc64/mips64el.
-ifeq (,$(filter $(DEB_HOST_ARCH),sparc64 mips64el))
+ifeq (,$(filter $(DEB_HOST_ARCH),sparc64))
 	CONFIG += --enable-libx264
 endif
 
 # OpenCV is not available on some architectures.
-ifeq (,$(filter $(DEB_HOST_ARCH),alpha sh4 sparc64 mips64el))
+ifeq (,$(filter $(DEB_HOST_ARCH),sh4 sparc64 mips64el))
 	CONFIG += --enable-libopencv
 endif
 

-- 
ffmpeg packaging