[SCM] x264/master: Use Build-Profiles to break circular dependency with libav

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 608b497c4f269325f3ebe224e1902d18c9183cc8
Author: Sebastian Ramacher <sebastian at ramacher.at>
Date:   Mon Jul 13 22:09:00 2015 +0200

    Use Build-Profiles to break circular dependency with libav
    
    Thanks to Johannes Schauer for the patch

diff --git a/debian/changelog b/debian/changelog
index 319d867..685300b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+x264 (2:0.146.2538+git121396c-3) UNRELEASED; urgency=medium
+
+  [ Johannes Schauer ]
+  * To avoid a circular build dependency, do not build depend on
+    libavformat-dev, libffms2-dev and libgpac-dev and do not build the x264
+    package when building the stage1 profile. To that end:
+       - add build profile annotations to Build-Depends
+       - add Build-Profiles field so that only the library is built in the
+         stage1 build profile
+       - add --disable-avs --disable-ffms --disable-gpac to common_confflags
+         when building with stage1
+       - depend on the proper versions of debhelper and dpkg-dev for parsing
+         build profile information in debian/control
+    Based on patch by Peter Pentchev
+    (Closes: #752103, #735742)
+
+ -- Sebastian Ramacher <sramacher at debian.org>  Mon, 13 Jul 2015 21:58:43 +0200
+
 x264 (2:0.146.2538+git121396c-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/confflags b/debian/confflags
index 95abb94..88e1cf7 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -20,6 +20,10 @@ endif
 
 common_confflags += --prefix=/usr --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 
+ifneq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
+common_confflags += --disable-avs --disable-ffms --disable-gpac
+endif
+
 # XXX why isn't --enable-visualize used in the static build?
 # TODO --disable-asm when we build an opt flavor?
 static_confflags += \
diff --git a/debian/control b/debian/control
index 3634e39..a412ed8 100644
--- a/debian/control
+++ b/debian/control
@@ -7,11 +7,12 @@ Uploaders:
  Fabian Greffrath <fabian+debian at greffrath.com>,
  Rico Tzschichholz <ricotz at ubuntu.com>
 Build-Depends:
- debhelper (>= 8.1.3~),
+ debhelper (>= 9.20140227~),
  autotools-dev,
- libavformat-dev (>= 6:9),
- libffms2-dev,
- libgpac-dev (>= 0.5.0+svn4288~),
+ dpkg-dev (>= 1.17.14),
+ libavformat-dev (>= 6:9) <!stage1>,
+ libffms2-dev <!stage1>,
+ libgpac-dev (>= 0.5.0+svn4288~) <!stage1>,
  yasm [any-i386 any-amd64]
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-multimedia/x264.git
@@ -21,6 +22,7 @@ Homepage: http://www.videolan.org/developers/x264.html
 Package: x264
 Section: graphics
 Architecture: any
+Build-Profiles: <!stage1>
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
diff --git a/debian/control.in b/debian/control.in
index 491735a..34e32d6 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -7,11 +7,12 @@ Uploaders:
  Fabian Greffrath <fabian+debian at greffrath.com>,
  Rico Tzschichholz <ricotz at ubuntu.com>
 Build-Depends:
- debhelper (>= 8.1.3~),
+ debhelper (>= 9.20140227~),
  autotools-dev,
- libavformat-dev (>= 6:9),
- libffms2-dev,
- libgpac-dev (>= 0.5.0+svn4288~),
+ dpkg-dev (>= 1.17.14),
+ libavformat-dev (>= 6:9) <!stage1>,
+ libffms2-dev <!stage1>,
+ libgpac-dev (>= 0.5.0+svn4288~) <!stage1>,
  yasm [any-i386 any-amd64]
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-multimedia/x264.git
@@ -21,6 +22,7 @@ Homepage: http://www.videolan.org/developers/x264.html
 Package: x264
 Section: graphics
 Architecture: any
+Build-Profiles: <!stage1>
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}

-- 
x264 packaging