[SCM] vlc/master: Enable vpx plugin

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9b54108b5db1a179fdd0cba489eae13b534972c9
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Aug 25 21:03:54 2014 +0200

    Enable vpx plugin

diff --git a/debian/control b/debian/control
index 60acb97..da61886 100644
--- a/debian/control
+++ b/debian/control
@@ -98,6 +98,7 @@ 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 e37e87c..89cdef8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -101,6 +101,7 @@ confflags += \
 	--enable-vdpau \
 	--enable-vnc \
 	--enable-vorbis \
+	--enable-vpx \
 	--enable-x264 \
 	--enable-zvbi \
 	--with-kde-solid=/usr/share/kde4/apps/solid/actions/ \
diff --git a/debian/vlc-nox.install.in b/debian/vlc-nox.install.in
index eef13de..af438ba 100644
--- a/debian/vlc-nox.install.in
+++ b/debian/vlc-nox.install.in
@@ -93,6 +93,7 @@ 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