[SCM] ffmpeg/master: Add build-profile support for stage1, disabling frei0r, opencv and x264.

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

The following commit has been merged in the master branch:
commit 30a74a3bc9f5eb4651a5b9d9cd97e7f92af99443
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Thu Nov 12 22:47:16 2015 +0100

    Add build-profile support for stage1, disabling frei0r, opencv and x264.

diff --git a/debian/control b/debian/control
index 10118b0..6789f74 100644
--- a/debian/control
+++ b/debian/control
@@ -19,11 +19,13 @@ Build-Depends-Indep:
  node-less
 Build-Depends:
 # needed for dh
- debhelper (>= 9),
+ debhelper (>= 9.20141010),
+# for build-profile support
+ dpkg-dev (>= 1.17.14),
 # --enable-libflite
  flite1-dev,
 # --enable-frei0r
- frei0r-plugins-dev [!mips64el],
+ frei0r-plugins-dev [!mips64el] <!stage1>,
 # --enable-ladspa
  ladspa-sdk,
 # --enable-libass
@@ -75,7 +77,7 @@ Build-Depends:
 # --enable-libopencore_amrwb
  libopencore-amrwb-dev,
 # --enable-libopencv
- libopencv-dev [!sh4 !sparc64 !mips64el],
+ libopencv-dev [!sh4 !sparc64 !mips64el] <!stage1>,
 # --enable-libopenjpeg
  libopenjpeg-dev,
 # --enable-libopus
@@ -127,7 +129,7 @@ Build-Depends:
 # --enable-libwebp
  libwebp-dev,
 # --enable-libx264
- libx264-dev [!sparc64],
+ libx264-dev [!sparc64] <!stage1>,
 # --enable-libx265
  libx265-dev,
 # --enable-x11grab
diff --git a/debian/rules b/debian/rules
index 6c218b4..49ba199 100755
--- a/debian/rules
+++ b/debian/rules
@@ -139,19 +139,25 @@ ifneq ($(DEB_HOST_ARCH_OS),hurd)
 	CONFIG += --enable-libzmq
 endif
 
-# Some libraries are not available on mips64el.
-ifeq (,$(filter $(DEB_HOST_ARCH),mips64el))
-	CONFIG += --enable-frei0r
-endif
+# ffmpeg is involed in build-dependency cycles with opencv and x264, so disable them in stage one.
+# Also disable frei0r, which build-depends on opencv.
+ifneq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
+	CONFIG += --disable-libx264 --disable-libopencv --disable-frei0r
+else
+	# Some libraries are not available on mips64el.
+	ifeq (,$(filter $(DEB_HOST_ARCH),mips64el))
+		CONFIG += --enable-frei0r
+	endif
 
-# Some libraries are not available/unusable (#792921) on sparc64/mips64el.
-ifeq (,$(filter $(DEB_HOST_ARCH),sparc64))
-	CONFIG += --enable-libx264
-endif
+	# Some libraries are not available/unusable (#792921) on sparc64/mips64el.
+	ifeq (,$(filter $(DEB_HOST_ARCH),sparc64))
+		CONFIG += --enable-libx264
+	endif
 
-# OpenCV is not available on some architectures.
-ifeq (,$(filter $(DEB_HOST_ARCH),sh4 sparc64 mips64el))
-	CONFIG += --enable-libopencv
+	# OpenCV is not available on some architectures.
+	ifeq (,$(filter $(DEB_HOST_ARCH),sh4 sparc64 mips64el))
+		CONFIG += --enable-libopencv
+	endif
 endif
 
 # Disable i686 optimizations on i386, because they are not always available on this architecture.

-- 
ffmpeg packaging