[SCM] ffmpeg/master: Enable frei0r, opencv, x264, x265 on x32, x265 on sparc64 and disable x264 on sparc64 due to #792921.

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

The following commit has been merged in the master branch:
commit 4d4e41d6268238c62f8a54e93bfb896f2a175a63
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Mon Jul 20 09:48:18 2015 +0200

    Enable frei0r, opencv, x264, x265 on x32, x265 on sparc64 and disable x264 on sparc64 due to #792921.

diff --git a/debian/control b/debian/control
index a47195e..92cc69e 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Build-Depends:
 # --enable-libflite
  flite1-dev,
 # --enable-frei0r
- frei0r-plugins-dev [!x32],
+ frei0r-plugins-dev,
 # --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 !x32],
+ libopencv-dev [!alpha !sh4 !sparc64],
 # --enable-libopenjpeg
  libopenjpeg-dev,
 # --enable-libopus
@@ -124,9 +124,9 @@ Build-Depends:
 # --enable-libwebp
  libwebp-dev,
 # --enable-libx264
- libx264-dev [!x32],
+ libx264-dev [!sparc64],
 # --enable-libx265
- libx265-dev [!sparc64 !x32 !alpha],
+ libx265-dev [!alpha],
 # --enable-x11grab
  libxext-dev,
 # --enable-libxvid
diff --git a/debian/rules b/debian/rules
index 0976825..4ebcf28 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,6 +64,7 @@ CONFIG := --prefix=/usr \
 	--disable-stripping \
 	--enable-avresample \
 	--enable-avisynth \
+	--enable-frei0r \
 	--enable-gnutls \
 	--enable-ladspa \
 	--enable-libass \
@@ -134,24 +135,19 @@ ifneq ($(DEB_HOST_ARCH),sparc)
 	CONFIG += --enable-libssh
 endif
 
-# Some libraries are not available on x32.
-ifneq ($(DEB_HOST_ARCH),x32)
-	CONFIG += --enable-frei0r \
-	--enable-libx264
-endif
-
-# Some libraries are not available on sparc64.
+# Some libraries are not available/unusable (#792921) on sparc64.
 ifneq ($(DEB_HOST_ARCH),sparc64)
-	CONFIG += --enable-libsoxr
+	CONFIG += --enable-libsoxr \
+	--enable-libx264
 endif
 
 # OpenCV is not available on some architectures.
-ifeq (,$(filter $(DEB_HOST_ARCH),alpha sh4 sparc64 x32))
+ifeq (,$(filter $(DEB_HOST_ARCH),alpha sh4 sparc64))
 	CONFIG += --enable-libopencv
 endif
 
-# X265 is not (yet) available on some architectures.
-ifeq (,$(filter $(DEB_HOST_ARCH),sparc64 x32 alpha))
+# Recent x265 is not available on alpha due to #789807.
+ifeq (,$(filter $(DEB_HOST_ARCH),alpha))
 	CONFIG += --enable-libx265
 endif
 

-- 
ffmpeg packaging