[SCM] vlc/master: Rename some configure switches and drop old ones

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f21e2332561ec791bd5d16f2190190fef54cf6fb
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Aug 20 00:45:53 2014 +0200

    Rename some configure switches and drop old ones
    
    --enable-dirac no longer exists. --enable-freerdp replaces --enable-libfreeprdp
    and --enable-mfx replaces --enable-quicksync.

diff --git a/debian/rules b/debian/rules
index 895dbc4..b1e30a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,13 +50,13 @@ confflags += \
 	--enable-chromaprint \
 	--enable-dbus \
 	--enable-dca \
-	--enable-dirac \
 	--enable-directfb \
 	--enable-dvbpsi \
 	--enable-dvdnav \
 	--enable-faad \
 	--enable-flac \
 	--enable-fluidsynth \
+	--enable-freerdp \
 	--enable-freetype \
 	--enable-fribidi \
 	--enable-glesv1 \
@@ -66,7 +66,6 @@ confflags += \
 	--enable-jack \
 	--enable-kate \
 	--enable-libass \
-	--enable-libfreerdp \
 	--enable-libmpeg2 \
 	--enable-libxml2 \
 	--enable-lirc \
@@ -111,9 +110,9 @@ confflags += \
 # gnomevfs -> poorly maintained
 # goom -> not in Debian
 # libvnc -> libvncserver-dev (containing libvncclient) conflicts with gnutls28
+# mfx -> currently not supported on Linux
 # opencv -> developer plugin not required by end users
 # projectm -> broken
-# quicksync -> currently not supported on Linux
 # sndio -> not in Debian
 # telx -> incompatible with zvbi
 # vsxu -> not in Debian
@@ -125,9 +124,9 @@ confflags += \
 	--disable-gnomevfs \
 	--disable-goom \
 	--disable-libvnc \
+	--disable-mfx \
 	--disable-opencv \
 	--disable-projectm \
-	--disable-quicksync \
 	--disable-sndio \
 	--disable-telx \
 	--disable-vsxu \

-- 
VLC media player packaging