[SCM] ffmpeg/master: Update build options and enabled libraries

[jcowgill at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e50db0c9377a27799b6f7c3c515cb5b30da0b78d
Author: James Cowgill <jcowgill at debian.org>
Date:   Tue Oct 17 10:01:32 2017 +0100

    Update build options and enabled libraries
    
    Enable libdrm (linux only), libmysofa, librsvg2, libxml2 (for dash demuxer).
    Disable libnetcdf (removed upstream).
    Update list of libraries not enabled in the Debian package.

diff --git a/debian/control b/debian/control
index 8458fdd..426d8b2 100644
--- a/debian/control
+++ b/debian/control
@@ -47,6 +47,8 @@ Build-Depends:
  libcrystalhd-dev [amd64 i386],
 # --enable-libdc1394
  libdc1394-22-dev [linux-any],
+# --enable-libdrm
+ libdrm-dev [linux-any],
 # --enable-libfontconfig
  libfontconfig1-dev,
 # --enable-libfreetype
@@ -73,8 +75,8 @@ Build-Depends:
  liblzma-dev,
 # --enable-libmp3lame
  libmp3lame-dev,
-# --enable-netcdf
- libnetcdf-dev [!powerpcspe],
+# --enable-libmysofa
+ libmysofa-dev,
 # --enable-openal
  libopenal-dev,
 # --enable-omx
@@ -95,6 +97,8 @@ Build-Depends:
  libpulse-dev,
 # --enable-librubberband
  librubberband-dev,
+# --enable-librsvg
+ librsvg2-dev,
 # autodetected: protocol 'sctp'
  libsctp-dev [linux-any],
 # --enable-sdl2
@@ -142,6 +146,8 @@ Build-Depends:
  libxcb-shm0-dev,
 # autodetected libxcb-xfixes
  libxcb-xfixes0-dev,
+# --enable-libxml2
+ libxml2-dev,
 # autodetected xlib
  libxv-dev,
 # --enable-libxvid
diff --git a/debian/rules b/debian/rules
index fa0d8cf..4314886 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,23 +24,20 @@ FLAVORS = standard extra static
 # 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)
-#   --enable-libdcadec
 #   --enable-libilbc                (see #675959 for the RFP bug)
 #   --enable-libkvazaar
 #   --enable-libmfx
-#   --enable-libmodplug             (see #849840: replaced with libopenmpt)
-#   --enable-libnut
 #   --enable-libopenh264
-#   --enable-libschroedinger        (see #845037: removal due to security issues)
-#   --enable-libutvideo
 #   --enable-libvidstab             (see #709193 for the RFP bug)
+#   --enable-libvmaf
 #   --enable-libxavs
 #   --enable-libzimg
 # The following flags are not added for various reasons:
-#   * --enable-librtmp:             ffmpeg has better built-in RTMP support with listen mode.
-#   * --enable-libv4l2 [!hurd-any]: This is only needed for very old devices and may cause problems for others.
+#   --enable-librtmp                ffmpeg has better built-in RTMP support with listen mode.
+#   --enable-libmodplug             see #849840: replaced with libopenmpt
+#   --enable-libv4l2                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.
-#   * --enable-opencl [!hurd-any]:  This is considered an experimental API.
+#   --enable-opencl                 This is considered an experimental API.
 CONFIG := --prefix=/usr \
 	--extra-version="$(DEB_REVISION)" \
 	--toolchain=hardened \
@@ -64,11 +61,13 @@ CONFIG := --prefix=/usr \
 	--enable-libgme \
 	--enable-libgsm \
 	--enable-libmp3lame \
+	--enable-libmysofa \
 	--enable-libopenjpeg \
 	--enable-libopenmpt \
 	--enable-libopus \
 	--enable-libpulse \
 	--enable-librubberband \
+	--enable-librsvg \
 	--enable-libshine \
 	--enable-libsnappy \
 	--enable-libsoxr \
@@ -81,6 +80,7 @@ CONFIG := --prefix=/usr \
 	--enable-libwavpack \
 	--enable-libwebp \
 	--enable-libx265 \
+	--enable-libxml2 \
 	--enable-libxvid \
 	--enable-libzmq \
 	--enable-libzvbi \
@@ -124,14 +124,10 @@ endif
 # Some libraries are built only on linux.
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 	CONFIG += --enable-libdc1394 \
+		--enable-libdrm \
 		--enable-libiec61883
 endif
 
-# Some build-dependencies are not installable on some architectures.
-ifeq (,$(filter $(DEB_HOST_ARCH),powerpcspe))
-	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)),)

-- 
ffmpeg packaging