3 files changed, 28 insertions, 50 deletions
diff --git a/packages/vlc/libdvdcss_1.2.10.bb b/packages/vlc/libdvdcss_1.2.10.bb
new file mode 100644
index 0000000000..ca471c2f4e
--- /dev/null
+++ b/packages/vlc/libdvdcss_1.2.10.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "libdvdcss is a simple library designed for accessing DVDs like a block device without having to bother about the decryption."
+LICENSE = "GPLv2"
+
+SRC_URI = "http://download.videolan.org/pub/libdvdcss/${PV}/libdvdcss-${PV}.tar.bz2"
+
+inherit autotools
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+do_stage() {
+	autotools_stage_all
+}
+
+
+
+
+
diff --git a/packages/vlc/vlc.inc b/packages/vlc/vlc.inc
index c07a10dd9b..30c22f800d 100644
--- a/packages/vlc/vlc.inc
+++ b/packages/vlc/vlc.inc
@@ -16,7 +16,7 @@ ARM_INSTRUCTION_SET = "arm"
 EXTRA_OECONF = "\
 	--enable-libtool \
 	--with-contrib \
-	--disable-dvdread \
+	--enable-run-as-root \
 	--disable-wxwidgets \
 	--enable-x11 --enable-xvideo \ 
 	--disable-screen --disable-caca \
diff --git a/packages/vlc/vlc_0.9.8a.bb b/packages/vlc/vlc_0.9.8a.bb
index 0fa8612bff..f98e909926 100644
--- a/packages/vlc/vlc_0.9.8a.bb
+++ b/packages/vlc/vlc_0.9.8a.bb
@@ -1,58 +1,20 @@
-DESCRIPTION = "Video player and streamer - davinci edition"
-HOMEPAGE = "http://www.videolan.org"
-LICENSE = "GPL"
-PRIORITY = "optional"
-SECTION = "multimedia"
+# This recipe packages vlc as a library as well, so qt4 dependencies
+# can be avoided when ony the library is installed.
+# Would be cool if when newer vlc is added to OE and older ones are phased
+# out that could be made the default.
 
-# ffmpeg from git (library version => 52) is required
-# libtool-native must be >= 2.2.4
-DEPENDS = "libfribidi libtool hal gettext libgcrypt schroedinger libsdl-x11 qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac \
-           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}"
+require vlc.inc
 
-SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2"
+PR = "r2"
 
-inherit autotools
+# ffmpeg from git (library version => 52) is required
+# libtool-native must be >= 2.2.4
+DEPENDS += "libdvdcss libdvdread"
 
-EXTRA_OECONF = "\
-	--enable-libtool \
-	--with-contrib \
-	--disable-dvdread \
-	--disable-wxwidgets \
-	--enable-x11 --enable-xvideo \ 
-	--disable-screen --disable-caca \
-	--enable-httpd --enable-vlm \
-	--enable-freetype \
-	--enable-sdl \ 
-	--enable-png \
-	--enable-live555 --enable-tremor \
-	--enable-v4l2 --enable-v4l --disable-aa --enable-wma --disable-faad \
-	--enable-dbus \
-	--enable-hal \	
-	--without-contrib \
-	--disable-opengl --disable-glx \
-	ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}/moc4 \
-	ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}/rcc4 \
-	ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \
+EXTRA_OECONF += "\
+	--enable-dvdread \
 "
 
-
-do_configure() {
-	cp ${STAGING_DATADIR}/aclocal/libgcrypt.m4 ${S}/m4/ 
-	./bootstrap	
-	gnu-configize --force
-	libtoolize --force
-	#autoreconf --force -i
-	cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/
-	oe_runconf
-	rm config.log
-	sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config
-	sed -i -e s:'$(MOC) $(DEFS) $(CPPFLAGS)':'$(MOC) $(DEFS)'\ -I${S}/include\ -DSYS_LINUX:g ${S}/modules/gui/qt4/Makefile
-}
-
-do_stage() {
-	autotools_stage_all
-}
-
 LEAD_SONAME = "libvlc.so.2"
 
 PACKAGES =+ "libvlc-dbg libvlc-dev libvlc"