[SCM] ffmpeg/experimental: Update B-D and --enable switches

[sramacher at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit a4bc07421cdbcc695fae8e5cb5cf4952a2c63bbc
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Tue Mar 8 00:52:54 2016 +0100

    Update B-D and --enable switches

diff --git a/debian/control b/debian/control
index 2c917d2..815afcd 100644
--- a/debian/control
+++ b/debian/control
@@ -40,6 +40,8 @@ Build-Depends:
  libcaca-dev,
 # --enable-libcdio
  libcdio-paranoia-dev,
+# --enable-libchromaprint
+ libchromaprint-dev <!stage1>,
 # autodetected 'crystalhd'
  libcrystalhd-dev [amd64 i386],
 # --enable-libdc1394
@@ -84,6 +86,8 @@ Build-Depends:
  libopus-dev,
 # --enable-libpulse
  libpulse-dev,
+# --enable-librubberband
+ librubberband-dev,
 # --enable-librtmp
  librtmp-dev,
 # --enable-libschroedinger
diff --git a/debian/rules b/debian/rules
index fc27269..b481b6d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,8 @@ FLAVORS = standard extra
 # Enable as many features as possible, as long as the result is still GPLv2+ (a GPLv3+ variant is built as libavcodec-extra flavor).
 # The following flags (and build-dependencies) are not added, because they would require a libavformat-extra flavor:
 #   --enable-libsmbclient           (libsmbclient-dev [!hurd-i386 !m68k !sparc64])
+#   --enable-libtesseract
+#   --enable-netcdf
 # The following flags are not added, because the necessary libraries are not in Debian:
 #   --enable-decklink
 #   --enable-libcelt                (see #676592: removed from Debian as abandoned upstream, replaced by opus)
@@ -38,6 +40,7 @@ FLAVORS = standard extra
 #   --enable-libutvideo
 #   --enable-libvidstab             (see #709193 for the RFP bug)
 #   --enable-libxavs
+#   --enable-libzimg
 # The following flags are not added for various reasons:
 #   * --enable-libv4l2 [!hurd-any]: This is only needed for very old devices and may cause problems for others.
 #                                   Should anyone need it, using LD_PRELOAD pointing on libv4l2 has the same effect.
@@ -80,6 +83,7 @@ CONFIG := --prefix=/usr \
 	--enable-libopenjpeg \
 	--enable-libopus \
 	--enable-libpulse \
+	--enable-librubberband \
 	--enable-librtmp \
 	--enable-libschroedinger \
 	--enable-libshine \
@@ -133,12 +137,13 @@ ifneq ($(DEB_HOST_ARCH_OS),hurd)
 	CONFIG += --enable-libzmq
 endif
 
-# ffmpeg is involed in build-dependency cycles with opencv and x264, so disable them in stage one.
+# ffmpeg is involed in build-dependency cycles with opencv, x264 and chromapint, 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
-	CONFIG += --enable-frei0r
+	CONFIG += --enable-frei0r \
+		--enable-chromaprint
 
 	# Some libraries are unusable (#792921) on sparc64.
 	ifeq (,$(filter $(DEB_HOST_ARCH),sparc64))

-- 
ffmpeg packaging