From 30e362c22a49521ebeef9bed1f0c58902b7dc50b Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 2 Nov 2010 09:30:44 +0100
Subject: vlc: update to 1.1.4.1

Signed-off-by: Koen Kooi <koen@openembedded.org>
---
 recipes/vlc/vlc.inc        |  5 +++--
 recipes/vlc/vlc_1.1.4.1.bb | 48 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 recipes/vlc/vlc_1.1.4.1.bb

diff --git a/recipes/vlc/vlc.inc b/recipes/vlc/vlc.inc
index 73fc006003..943e6e5525 100644
--- a/recipes/vlc/vlc.inc
+++ b/recipes/vlc/vlc.inc
@@ -43,7 +43,7 @@ do_configure() {
 	gnu-configize --force
 	libtoolize --force
 	#autoreconf --force -i
-	cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/
+	cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true
 	oe_runconf
 	rm config.log
 	sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config
@@ -55,4 +55,5 @@ FILES_${PN} += "${bindir}/vlc \
 	${datadir}/vlc/ \
 	"
 
-FILES_${PN}-dbg	+= "${libdir}/vlc/*/.debug"
+FILES_${PN} += "${datadir}/icons"
+FILES_${PN}-dbg	+= "${libdir}/vlc/*/.debug ${libdir}/vlc/plugins/*/.debug"
diff --git a/recipes/vlc/vlc_1.1.4.1.bb b/recipes/vlc/vlc_1.1.4.1.bb
new file mode 100644
index 0000000000..d4535a5f1f
--- /dev/null
+++ b/recipes/vlc/vlc_1.1.4.1.bb
@@ -0,0 +1,48 @@
+# 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.
+
+require vlc.inc
+
+SRC_URI[md5sum] = "ce17c335b38b322949694313173fcd49"
+SRC_URI[sha256sum] = "61c9ea30a17ea40c6ccbfd507026e5c83ad9e0691f221d3667c8e49696d7c2aa"
+
+# ffmpeg from git (library version => 52) is required
+# libtool-native must be >= 2.2.4
+DEPENDS += "libdvdcss libdvdread"
+
+EXTRA_OECONF += "\
+	--enable-dvdread \
+"
+
+LEAD_SONAME = "libvlc.so.5"
+
+PACKAGES =+ "libvlc-dbg libvlc-dev libvlc"
+
+FILES_libvlc-dev = "${libdir}/lib*.so"
+
+FILES_libvlc-dbg = "\
+	${libdir}/.debug \
+	${libdir}/vlc/meta_engine/.debug \
+	${libdir}/vlc/audio_filter/.debug ${libdir}/vlc/audio_output/.debug \
+	${libdir}/vlc/demux/.debug ${libdir}/vlc/control/.debug \
+	${libdir}/vlc/gui/.debug ${libdir}/vlc/packetizer/.debug \
+	${libdir}/vlc/audio_mixer/.debug ${libdir}/vlc/stream_out/.debug \
+	${libdir}/vlc/mux/.debug ${libdir}/vlc/access/.debug \
+	${libdir}/vlc/visualization/.debug ${libdir}/vlc/access_filter/.debug \
+	${libdir}/vlc/access_output/.debug ${libdir}/vlc/video_output/.debug \
+	${libdir}/vlc/services_discovery/.debug ${libdir}/vlc/video_chroma/.debug \
+	${libdir}/vlc/video_codec/.debug ${libdir}/vlc/video_filter/.debug \
+	${libdir}/vlc/misc/.debug ${libdir}/vlc/codec/.debug \
+	"
+
+FILES_libvlc = "${libdir}/lib*.so.*"
+
+FILES_${PN} += "${bindir}/vlc \
+	${datadir}/applications \
+	${datadir}/vlc/ \
+	"
+
+FILES_${PN}-dbg	+= "${libdir}/vlc/*/.debug"
+
-- 
cgit 1.2.3-korg