[SCM] ffmpeg/master: Enable libzmq on hurd, as it is now available there

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

The following commit has been merged in the master branch:
commit 210d0ffd5aa718c7ebda7107266b2a06eb9f370f
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Tue Oct 11 21:03:15 2016 +0200

    Enable libzmq on hurd, as it is now available there

diff --git a/debian/control b/debian/control
index ace0d0f..7bff246 100644
--- a/debian/control
+++ b/debian/control
@@ -144,7 +144,7 @@ Build-Depends:
 # autodetected: decoder 'mpeg_xvmc'; outdev 'xv'
  libxvmc-dev,
 # --enable-libzmq
- libzmq3-dev [!hurd-any],
+ libzmq3-dev,
 # --enable-libzvbi
  libzvbi-dev,
 # The opencl API is considered experimental.
diff --git a/debian/rules b/debian/rules
index 671727c..75803cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -92,6 +92,7 @@ CONFIG := --prefix=/usr \
 	--enable-libwebp \
 	--enable-libx265 \
 	--enable-libxvid \
+	--enable-libzmq \
 	--enable-libzvbi \
 	--enable-openal \
 	--enable-opengl \
@@ -121,11 +122,6 @@ ifeq ($(DEB_HOST_ARCH_OS),linux)
 		--enable-libiec61883
 endif
 
-# Some libraries are not build on hurd.
-ifneq ($(DEB_HOST_ARCH_OS),hurd)
-	CONFIG += --enable-libzmq
-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