3 files changed, 46 insertions, 22 deletions
diff --git a/recipes/vlc/vlc_1.0.2.bb b/recipes/vlc/vlc_1.0.2.bb
new file mode 100644
index 0000000000..bd967cff44
--- /dev/null
+++ b/recipes/vlc/vlc_1.0.2.bb
@@ -0,0 +1,44 @@
+# 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
+
+# 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.2"
+
+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"
diff --git a/recipes/vlc/x264_0.0.bb b/recipes/vlc/x264_0.0.bb
deleted file mode 100644
index b716afc416..0000000000
--- a/recipes/vlc/x264_0.0.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "h264 encoder"
-LICENSE = "GPL"
-
-X264PV = "snapshot-20090127-2245"
-
-SRC_URI = "http://download.videolan.org/pub/videolan/x264/snapshots/x264-${X264PV}.tar.bz2"
-
-S = "${WORKDIR}/${PN}-${X264PV}"
-
-inherit autotools lib_package
-
-EXTRA_OECONF = " --enable-shared "
-
-do_stage() {
-	autotools_stage_all
-}
-
-
-
-
diff --git a/recipes/vlc/x264_r2245.bb b/recipes/vlc/x264_r2245.bb
index 8d1036fa76..a347bd9039 100644
--- a/recipes/vlc/x264_r2245.bb
+++ b/recipes/vlc/x264_r2245.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "H.264 encoder"
 LICENSE = "GPL"
-PR = "r3"
+PR = "r4"
 
-X264PV = "snapshot-20090127-2245"
+X264PV = "snapshot-20090928-2245"
 
 SRC_URI = "http://download.videolan.org/pub/videolan/x264/snapshots/x264-${X264PV}.tar.bz2"