[SCM] vlc/master: debian/rules: Merge common configure flags groups.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 19cc984fb0ee99fe2b624e86989a5f1572a9557b
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sat Sep 6 22:22:32 2014 +0200

    debian/rules: Merge common configure flags groups.

diff --git a/debian/rules b/debian/rules
index a3bdbd5..247bfdc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -142,7 +142,8 @@ confflags += \
 # Linux specific flags
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 # omxil should be enabled on all systems, but libomxil-bellagio does
-# not build on kfreebsd and hurd (currently)
+# not build on kfreebsd and hurd (currently).
+# V4L2 is disabled on kFreeBSD due to a build failure.
 confflags += \
 	--enable-alsa \
 	--enable-atmo \
@@ -151,6 +152,7 @@ confflags += \
 	--enable-linsys \
 	--enable-omxil \
 	--enable-udev \
+	--enable-v4l2 \
 	$(NULL)
 else
 confflags += \
@@ -161,6 +163,7 @@ confflags += \
 	--disable-linsys \
 	--disable-omxil \
 	--disable-udev \
+	--disable-v4l2 \
 	$(NULL)
 removeplugins += \
 	alsa \
@@ -173,38 +176,16 @@ removeplugins += \
 	libomxil \
 	linsys \
 	libudev \
+	libv4l2 \
 	$(NULL)
 endif
 
-# Hurd specific flags
-ifeq (,$(filter-out hurd,$(DEB_HOST_ARCH_OS)))
-confflags += \
-	--disable-vcd
-removeplugins += \
-	cdda \
-	vcd \
-	$(NULL)
-else
-confflags += \
-	--enable-vcd \
-	$(NULL)
-endif
-
-# Linux and kFreeBSD specific flags
+# Linux and kFreeBSD specific flags (disabled on Hurd)
 ifeq (,$(filter-out linux kfreebsd,$(DEB_HOST_ARCH_OS)))
-confflags += --enable-libva
-else
-confflags += --disable-libva
-removeplugins += libvaapi
-endif
-
-# Linux and kFreeBSD specific flags
-# kfreebsd disabled due to a build failure
-ifeq (,$(filter-out linux,$(DEB_HOST_ARCH_OS)))
-confflags += --enable-v4l2
+confflags += --enable-libva --enable-vcd
 else
-confflags += --disable-v4l2
-removeplugins += libv4l2
+confflags += --disable-libva --disable-vcd
+removeplugins += cdda libvaapi vcd
 endif
 
 # kFreeBSD specific flags

-- 
VLC media player packaging