[SCM] vlc/master: Add libomxil to vlc-nox on Linux.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit cc84670f8f2944cab6514f6361ed1ae0616badfd
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sat Jun 30 18:04:05 2012 +0200

    Add libomxil to vlc-nox on Linux.

diff --git a/debian/control b/debian/control
index 98e45f6..9b2c57b 100644
--- a/debian/control
+++ b/debian/control
@@ -58,6 +58,7 @@ Build-Depends: autopoint,
                libncursesw5-dev,
                libnotify-dev,
                libogg-dev (>= 1.0),
+               libomxil-bellagio-dev [linux-any],
                libpng-dev,
                libpostproc-dev (>= 4:0.6),
                libproxy-dev,
diff --git a/debian/rules b/debian/rules
index 0ee1c7d..e3e20fb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -117,6 +117,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)
 confflags += \
 	--enable-alsa \
 	--enable-atmo \
@@ -124,6 +126,7 @@ confflags += \
 	--enable-dv \
 	--enable-libva \
 	--enable-linsys \
+	--enable-omxil \
 	--enable-pvr \
 	--enable-udev \
 	$(NULL)
@@ -135,10 +138,11 @@ confflags += \
 	--disable-dv \
 	--disable-libva \
 	--disable-linsys \
+	--disable-omxil \
 	--disable-pvr \
 	--disable-udev \
 	$(NULL)
-removeplugins += alsa libatmo libdc1394 libdtv libaccess_dv libfb linsys libpvr libudev
+removeplugins += alsa libatmo libdc1394 libdtv libaccess_dv libfb libomxil linsys libpvr libudev
 endif
 
 # Linux and kFreeBSD specific flags
diff --git a/debian/vlc-nox.install b/debian/vlc-nox.install
index a4aa8f3..ed1c942 100644
--- a/debian/vlc-nox.install
+++ b/debian/vlc-nox.install
@@ -74,6 +74,7 @@ usr/lib/vlc/plugins/codec/liblibass_plugin.so
 usr/lib/vlc/plugins/codec/liblibmpeg2_plugin.so
 usr/lib/vlc/plugins/codec/liblpcm_plugin.so
 usr/lib/vlc/plugins/codec/libmpeg_audio_plugin.so
+usr/lib/vlc/plugins/codec/libomxil_plugin.so
 usr/lib/vlc/plugins/codec/libpng_plugin.so
 usr/lib/vlc/plugins/codec/librawvideo_plugin.so
 usr/lib/vlc/plugins/codec/libschroedinger_plugin.so

-- 
VLC media player packaging