[SCM] ffmpeg/master: Enable netcdf

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ca7c123f6e1c6a306263e76a85ec49f732e3dd69
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Sep 28 21:13:07 2016 +0200

    Enable netcdf

diff --git a/debian/control b/debian/control
index 2841992..8dd9447 100644
--- a/debian/control
+++ b/debian/control
@@ -76,6 +76,8 @@ Build-Depends:
  libmodplug-dev,
 # --enable-libmp3lame
  libmp3lame-dev,
+# --enable-netcdf
+ libnetcdf-dev,
 # --enable-openal
  libopenal-dev,
 # --enable-libopencore_amrnb
diff --git a/debian/rules b/debian/rules
index 4de3971..4bafbc4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,6 @@ 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-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)
@@ -109,7 +108,8 @@ CONFIG_extra = --enable-version3 \
 	--enable-libopencore_amrnb \
 	--enable-libopencore_amrwb \
 	--enable-libtesseract \
-	--enable-libvo_amrwbenc
+	--enable-libvo_amrwbenc \
+	--enable-netcdf
 
 # Disable optimizations if requested.
 ifneq (,$(filter $(DEB_BUILD_OPTIONS),noopt))

-- 
ffmpeg packaging