[SCM] vlc/master: Build and install the libx264 plugin.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 46f83fe81a3107b20190fd16c4b4c4a84d6fd5de
Author: Benjamin Drung <bdrung at debian.org>
Date:   Tue Jul 26 11:40:27 2011 +0200

    Build and install the libx264 plugin.

diff --git a/debian/control b/debian/control
index cfe89c8..a9819b9 100644
--- a/debian/control
+++ b/debian/control
@@ -82,6 +82,7 @@ Build-Depends: autopoint,
                libvorbis-dev,
                libx11-dev,
                libx11-xcb-dev,
+               libx264-dev (>= 2:0.76),
                libxcb-keysyms1-dev (>= 0.3.4),
                libxcb-randr0-dev (>= 1.3),
                libxcb-shm0-dev,
diff --git a/debian/rules b/debian/rules
index 54d04c4..b8bc696 100755
--- a/debian/rules
+++ b/debian/rules
@@ -84,6 +84,7 @@ confflags += \
 	--enable-vcd \
 	--enable-vcdx \
 	--enable-vorbis \
+	--enable-x264 \
 	--enable-zvbi \
 	--with-kde-solid=/usr/share/kde4/apps/solid/actions/ \
 	--with-mozilla-pkg=libxul \
@@ -97,7 +98,6 @@ confflags += \
 # projectm -> broken
 # sqlite -> still in development
 # telx -> incompatible with zvbi
-# x264 -> not in Debian
 confflags += \
 	--disable-dxva2 \
 	--disable-gnomevfs \
@@ -107,7 +107,6 @@ confflags += \
 	--disable-projectm \
 	--disable-sqlite \
 	--disable-telx \
-	--disable-x264 \
 	$(NULL)
 
 # Linux specific flags
diff --git a/debian/vlc-nox.install b/debian/vlc-nox.install
index 367ce17..a80ffa8 100644
--- a/debian/vlc-nox.install
+++ b/debian/vlc-nox.install
@@ -70,6 +70,7 @@ usr/lib/vlc/plugins/codec/libt140_plugin.so
 usr/lib/vlc/plugins/codec/libtheora_plugin.so
 usr/lib/vlc/plugins/codec/libtwolame_plugin.so
 usr/lib/vlc/plugins/codec/libvorbis_plugin.so
+usr/lib/vlc/plugins/codec/libx264_plugin.so
 usr/lib/vlc/plugins/control/libdbus_plugin.so
 usr/lib/vlc/plugins/control/libgestures_plugin.so
 usr/lib/vlc/plugins/control/libhotkeys_plugin.so

-- 
VLC media player packaging