[SCM] vlc/master: Disable vpx plugin (not needed when having libavcodec)

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 516835d7defb8d38fd2c2bbe0b1dde0d05656e99
Author: Benjamin Drung <bdrung at debian.org>
Date:   Tue Aug 26 21:32:58 2014 +0200

    Disable vpx plugin (not needed when having libavcodec)

diff --git a/debian/control b/debian/control
index 5cdf11e..6260fb4 100644
--- a/debian/control
+++ b/debian/control
@@ -98,7 +98,6 @@ Build-Depends: autopoint,
                libvdpau-dev,
                libvncserver-dev (>= 0.9.9),
                libvorbis-dev,
-               libvpx-dev,
                libx11-dev,
                libx264-dev (>= 2:0.86),
                libxcb-composite0-dev,
diff --git a/debian/rules b/debian/rules
index fdff278..1bb1aeb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -101,7 +101,6 @@ confflags += \
 	--enable-vdpau \
 	--enable-vnc \
 	--enable-vorbis \
-	--enable-vpx \
 	--enable-x264 \
 	--enable-zvbi \
 	--with-kde-solid=/usr/share/kde4/apps/solid/actions/ \
@@ -119,6 +118,7 @@ confflags += \
 # sndio -> not in Debian
 # svgdev -> libcairo2-dev is not new enough
 # telx -> incompatible with zvbi
+# vpx -> not needed when having libavcodec
 # vsxu -> not in Debian
 # wasapi -> Windows only
 confflags += \
@@ -134,6 +134,7 @@ confflags += \
 	--disable-sndio \
 	--disable-svgdec \
 	--disable-telx \
+	--disable-vpx \
 	--disable-vsxu \
 	--disable-wasapi \
 	$(NULL)
diff --git a/debian/vlc-nox.install.in b/debian/vlc-nox.install.in
index af438ba..eef13de 100644
--- a/debian/vlc-nox.install.in
+++ b/debian/vlc-nox.install.in
@@ -93,7 +93,6 @@ usr/lib/vlc/plugins/codec/libtheora_plugin.so
 usr/lib/vlc/plugins/codec/libtwolame_plugin.so
 usr/lib/vlc/plugins/codec/libuleaddvaudio_plugin.so
 usr/lib/vlc/plugins/codec/libvorbis_plugin.so
-usr/lib/vlc/plugins/codec/libvpx_plugin.so
 usr/lib/vlc/plugins/codec/libx264_plugin.so
 usr/lib/vlc/plugins/codec/libxwd_plugin.so
 usr/lib/vlc/plugins/control/libdbus_plugin.so

-- 
VLC media player packaging