[SCM] ffmpeg/master: Update build-dependencies for some ports.

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

The following commit has been merged in the master branch:
commit eff56d42dd3c6f7b1eadcd6d6fe3cc8e17eee86f
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Sun Nov 27 00:05:18 2016 +0100

    Update build-dependencies for some ports.
    
     - m68k: enable chromaprint
     - powerpcspe: enable chromaprint, openal, opencv
     - sh4: disable chromaprint

diff --git a/debian/control b/debian/control
index 72a78fc..361b1b5 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,7 @@ Build-Depends:
 # --enable-libcdio
  libcdio-paranoia-dev,
 # --enable-libchromaprint
- libchromaprint-dev [!m68k !powerpcspe] <!stage1>,
+ libchromaprint-dev [!sh4] <!stage1>,
 # autodetected 'crystalhd'
  libcrystalhd-dev [amd64 i386],
 # --enable-libdc1394
@@ -79,7 +79,7 @@ Build-Depends:
 # --enable-netcdf
  libnetcdf-dev [!powerpcspe],
 # --enable-openal
- libopenal-dev [!powerpcspe],
+ libopenal-dev,
 # --enable-omx
  libomxil-bellagio-dev,
 # --enable-libopencore_amrnb
@@ -87,7 +87,7 @@ Build-Depends:
 # --enable-libopencore_amrwb
  libopencore-amrwb-dev,
 # --enable-libopencv
- libopencv-imgproc-dev [!powerpcspe] <!stage1>,
+ libopencv-imgproc-dev <!stage1>,
 # --enable-libopenjpeg
  libopenjp2-7-dev,
 # --enable-libopus
diff --git a/debian/rules b/debian/rules
index 64b8648..174ed47 100755
--- a/debian/rules
+++ b/debian/rules
@@ -87,6 +87,7 @@ CONFIG := --prefix=/usr \
 	--enable-libzmq \
 	--enable-libzvbi \
 	--enable-omx \
+	--enable-openal \
 	--enable-opengl \
 	--enable-sdl2
 
@@ -130,7 +131,6 @@ endif
 
 # Some build-dependencies are not installable on some architectures.
 ifeq (,$(filter $(DEB_HOST_ARCH),powerpcspe))
-	CONFIG += --enable-openal
 	CONFIG_extra += --enable-netcdf
 endif
 
@@ -142,12 +142,12 @@ ifneq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
 		--disable-libopencv \
 		--disable-libx264
 else
+	CONFIG += --enable-libopencv
 ifeq (,$(filter $(DEB_HOST_ARCH),powerpcspe))
 	CONFIG += --enable-frei0r \
-		--enable-libopencv \
 		--enable-libx264
 endif
-ifeq (,$(filter $(DEB_HOST_ARCH),m68k powerpcspe))
+ifeq (,$(filter $(DEB_HOST_ARCH),sh4))
 	CONFIG += --enable-chromaprint
 endif
 endif

-- 
ffmpeg packaging