[SCM] ffmpeg/master: Disable uninstallable BDs on m68k and powerpcspe

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

The following commit has been merged in the master branch:
commit 3837fbc0efc6fb012938b1b9661736262be9259d
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Sun Oct 30 09:56:06 2016 +0100

    Disable uninstallable BDs on m68k and powerpcspe
    
    On powerpcspe libopenal-dev and libnetcdf-dev are currently unavailable
    and thus ffmpeg needs to be bootstrapped again disabling frei0r,
    libopencv, x264 and chromaprint.
    The last one is also currently not installable on m68k, due to ffmpeg
    being outdated and the BD-circularity causes ffmpeg itself to be
    BD-uninstallable.

diff --git a/debian/control b/debian/control
index de416fb..6c7d733 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Build-Depends:
 # --enable-libflite
  flite1-dev,
 # --enable-frei0r
- frei0r-plugins-dev <!stage1>,
+ frei0r-plugins-dev [!powerpcspe] <!stage1>,
 # --enable-ladspa
  ladspa-sdk,
 # --enable-libass
@@ -41,7 +41,7 @@ Build-Depends:
 # --enable-libcdio
  libcdio-paranoia-dev,
 # --enable-libchromaprint
- libchromaprint-dev <!stage1>,
+ libchromaprint-dev [!m68k !powerpcspe] <!stage1>,
 # autodetected 'crystalhd'
  libcrystalhd-dev [amd64 i386],
 # --enable-libdc1394
@@ -77,15 +77,15 @@ Build-Depends:
 # --enable-libmp3lame
  libmp3lame-dev,
 # --enable-netcdf
- libnetcdf-dev,
+ libnetcdf-dev [!powerpcspe],
 # --enable-openal
- libopenal-dev,
+ libopenal-dev [!powerpcspe],
 # --enable-libopencore_amrnb
  libopencore-amrnb-dev,
 # --enable-libopencore_amrwb
  libopencore-amrwb-dev,
 # --enable-libopencv
- libopencv-imgproc-dev <!stage1>,
+ libopencv-imgproc-dev [!powerpcspe] <!stage1>,
 # --enable-libopenjpeg
  libopenjp2-7-dev,
 # --enable-libopus
@@ -134,7 +134,7 @@ Build-Depends:
 # --enable-libwebp
  libwebp-dev,
 # --enable-libx264
- libx264-dev <!stage1>,
+ libx264-dev [!powerpcspe] <!stage1>,
 # --enable-libx265
  libx265-dev (>= 1.8),
 # --enable-x11grab
diff --git a/debian/rules b/debian/rules
index 65b7c23..25460e0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -87,7 +87,6 @@ CONFIG := --prefix=/usr \
 	--enable-libxvid \
 	--enable-libzmq \
 	--enable-libzvbi \
-	--enable-openal \
 	--enable-opengl \
 	--enable-sdl2 \
 	--enable-x11grab
@@ -103,8 +102,7 @@ CONFIG_extra = --enable-shared \
 	--enable-libopencore_amrnb \
 	--enable-libopencore_amrwb \
 	--enable-libtesseract \
-	--enable-libvo_amrwbenc \
-	--enable-netcdf
+	--enable-libvo_amrwbenc
 
 # The static libraries should not be built with PIC.
 CONFIG_static = --disable-pic \
@@ -131,6 +129,12 @@ ifeq ($(DEB_HOST_ARCH_OS),linux)
 		--enable-libiec61883
 endif
 
+# Some build-dependencies are not installable on some architectures.
+ifeq (,$(filter $(DEB_HOST_ARCH),powerpcspe))
+	CONFIG += --enable-openal
+	CONFIG_extra += --enable-netcdf
+endif
+
 # ffmpeg is involed in build-dependency cycles with opencv, x264 and chromaprint, so disable them in stage one.
 # Also disable frei0r, which build-depends on opencv.
 ifneq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
@@ -139,11 +143,15 @@ ifneq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
 		--disable-libopencv \
 		--disable-libx264
 else
+ifeq (,$(filter $(DEB_HOST_ARCH),powerpcspe))
 	CONFIG += --enable-frei0r \
-		--enable-chromaprint \
 		--enable-libopencv \
 		--enable-libx264
 endif
+ifeq (,$(filter $(DEB_HOST_ARCH),m68k powerpcspe))
+	CONFIG += --enable-chromaprint
+endif
+endif
 
 # Disable altivec optimizations on powerpc, because they are not always available on this architecture.
 ifeq ($(DEB_HOST_ARCH),powerpc)

-- 
ffmpeg packaging