[SCM] ffmpeg/master: Re-enable chromaprint on sh4 and libx264 on powerpcspe.

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

The following commit has been merged in the master branch:
commit d4092af5b2fd6385ce89b35efff268b04cedfe6b
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Sat Jan 21 22:34:14 2017 +0100

    Re-enable chromaprint on sh4 and libx264 on powerpcspe.

diff --git a/debian/control b/debian/control
index 35d19b8..b8e53f4 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,7 @@ Build-Depends:
 # --enable-libcdio
  libcdio-paranoia-dev,
 # --enable-libchromaprint
- libchromaprint-dev [!sh4] <!stage1>,
+ libchromaprint-dev <!stage1>,
 # autodetected 'crystalhd'
  libcrystalhd-dev [amd64 i386],
 # --enable-libdc1394
@@ -134,7 +134,7 @@ Build-Depends:
 # --enable-libwebp
  libwebp-dev,
 # --enable-libx264
- libx264-dev [!powerpcspe] <!stage1>,
+ libx264-dev <!stage1>,
 # --enable-libx265
  libx265-dev (>= 1.8),
 # autodetected libxcb-shape
diff --git a/debian/rules b/debian/rules
index 391f1eb..d32b4df 100755
--- a/debian/rules
+++ b/debian/rules
@@ -141,14 +141,10 @@ ifneq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
 		--disable-libopencv \
 		--disable-libx264
 else
-	CONFIG += --enable-libopencv \
-		--enable-frei0r
-ifeq (,$(filter $(DEB_HOST_ARCH),powerpcspe))
-	CONFIG += --enable-libx264
-endif
-ifeq (,$(filter $(DEB_HOST_ARCH),sh4))
-	CONFIG += --enable-chromaprint
-endif
+	CONFIG += --enable-chromaprint \
+		--enable-frei0r \
+		--enable-libopencv \
+		--enable-libx264
 endif
 
 # Disable altivec optimizations on powerpc, because they are not always available on this architecture.

-- 
ffmpeg packaging