- Add libmusicbrainz from OE

- Fix up gstreamer packages
- Add gstreamer base/audio/video meta-packages
- Add owl-video-widget
- Add owl-video-widget, gst-meta-audio and gst-meta-video to test-apps 
  in oh-image-pda (currently not working?)


git-svn-id: https://svn.o-hand.com/repos/poky/trunk@698 311d38ba-8fff-0310-9ca6-ca027cbcb966

12 files changed, 95 insertions, 6 deletions

diff --git a/meta/packages/gstreamer/gst-ffmpeg_0.10.1.bb b/meta/packages/gstreamer/gst-ffmpeg_0.10.1.bb
new file mode 100644
index 0000000000..d2123f4a57
--- /dev/null
+++ b/meta/packages/gstreamer/gst-ffmpeg_0.10.1.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "FFmpeg-based GStreamer plug-in"
+SECTION = "multimedia"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+HOMEPAGE = "http://www.gstreamer.net/"
+MAINTAINER = "Chris Lord <chris@openedhand.com>"
+DEPENDS = "gstreamer zlib"
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2"
+
+FILES_${PN} += "${libdir}/gstreamer-0.10"
+
+EXTRA_OECONF = "--disable-sdltest --disable-ffplay --disable-freetypetest \
+		--disable-vorbis --disable-vorbistest --disable-encoders \
+		--disable-v4l --disable-audio-oss --disable-dv1394 \
+		--disable-vhook --disable-ffmpeg --disable-ffserver \
+		--enable-pp --disable-decoder-vorbis"
+
+# We do this because the install program is called with -s which causes it to
+# call "strip" and it then mangles cross compiled stuff..
+PATH_prepend="${CROSS_DIR}/${TARGET_SYS}/bin:"
+
+# Hack to get STAGING_LIBDIR into the linker path when building ffmpeg
+CC = "${CCACHE} ${HOST_PREFIX}gcc -L${STAGING_LIBDIR}"
+
+do_configure () {
+        cd ${S}
+        oe_runconf
+}
+
diff --git a/meta/packages/gstreamer/gst-meta-audio_0.10.bb b/meta/packages/gstreamer/gst-meta-audio_0.10.bb
new file mode 100644
index 0000000000..be0ec10f78
--- /dev/null
+++ b/meta/packages/gstreamer/gst-meta-audio_0.10.bb
@@ -0,0 +1,5 @@
+DEPENDS = "gst-meta-base gst-plugins-good"
+RDEPENDS = "gst-meta-base gst-plugins-good gst-plugin-vorbis gst-plugin-ogg \
+	gst-plugin-flac gst-plugin-speex"
+
+ALLOW_EMPTY = "1"
diff --git a/meta/packages/gstreamer/gst-meta-base_0.10.bb b/meta/packages/gstreamer/gst-meta-base_0.10.bb
new file mode 100644
index 0000000000..8179952f45
--- /dev/null
+++ b/meta/packages/gstreamer/gst-meta-base_0.10.bb
@@ -0,0 +1,6 @@
+DEPENDS = "gstreamer gst-plugins-base"
+RDEPENDS = "gstreamer gst-plugins-base gst-plugin-playbin \
+	gst-plugin-decodebin gst-plugin-gnomevfs gst-plugin-alsa \
+	gst-plugin-volume gst-plugin-ximagesink"
+
+ALLOW_EMPTY = "1"
diff --git a/meta/packages/gstreamer/gst-meta-video_0.10.bb b/meta/packages/gstreamer/gst-meta-video_0.10.bb
new file mode 100644
index 0000000000..c085582801
--- /dev/null
+++ b/meta/packages/gstreamer/gst-meta-video_0.10.bb
@@ -0,0 +1,6 @@
+DEPENDS = "gst-meta-base gst-plugins-good gst-plugins-bad gst-ffmpeg"
+RDEPENDS = "gst-meta-base gst-plugins-good gst-plugins-bad gst-plugin-avi \
+	gst-plugin-matroska gst-plugin-ogg gst-ffmpeg"
+RRECOMMENDS = "gst-meta-audio"
+
+ALLOW_EMPTY = "1"
diff --git a/meta/packages/gstreamer/gst-plugins-bad_0.10.3.bb b/meta/packages/gstreamer/gst-plugins-bad_0.10.3.bb
index 75dc20170f..cc3fde3e29 100644
--- a/meta/packages/gstreamer/gst-plugins-bad_0.10.3.bb
+++ b/meta/packages/gstreamer/gst-plugins-bad_0.10.3.bb
@@ -1,6 +1,7 @@
 require gst-plugins.inc
-DEPENDS += "gst-plugins-base"
+DEPENDS += "gst-plugins-base libmusicbrainz"
+PR = "r1"
 
 EXTRA_OECONF += "--disable-examples --disable-experimental --disable-sdl \
-		--with-plugins=divx,libmms,musicbrainz,swfdec,xvid,wavpack"
+		--with-plugins=musicbrainz,wavpack"
 
diff --git a/meta/packages/gstreamer/gst-plugins-base_0.10.9.bb b/meta/packages/gstreamer/gst-plugins-base_0.10.9.bb
index 88f3a31577..973327e146 100644
--- a/meta/packages/gstreamer/gst-plugins-base_0.10.9.bb
+++ b/meta/packages/gstreamer/gst-plugins-base_0.10.9.bb
@@ -1,6 +1,9 @@
 require gst-plugins.inc
 DEPENDS += "libx11 alsa-lib freetype gnome-vfs liboil libogg libvorbis tremor"
+RDEPENDS += "gnome-vfs-plugin-file gnome-vfs-plugin-http gnome-vfs-plugin-ftp \
+             gnome-vfs-plugin-sftp"
 PROVIDES_${PN} += "gst-plugins"
+PR = "r1"
 
 EXTRA_OECONF += "--with-plugins=ximagesink,alsa,gnomevfs,ogg,vorbis \
 		--disable-freetypetest --disable-pango --disable-theora"
diff --git a/meta/packages/gstreamer/gst-plugins-good_0.10.4.bb b/meta/packages/gstreamer/gst-plugins-good_0.10.4.bb
index cb0a818ebf..836923b146 100644
--- a/meta/packages/gstreamer/gst-plugins-good_0.10.4.bb
+++ b/meta/packages/gstreamer/gst-plugins-good_0.10.4.bb
@@ -1,7 +1,7 @@
 require gst-plugins.inc
 DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \
 	    speex"
+PR = "r1"
+
+EXTRA_OECONF += " --with-plugins=ximagesrc,cairo,flac,gconfelements,gdkpixbuf,jpeg,png,speex,taglib,avi,matroska,videofilter --disable-aalib --disable-esd --disable-shout2"
 
-EXTRA_OECONF += " --with-plugins=ximagesrc,cairo,flac,gconfelements,gdkpixbuf,\
-		jpeg,png,speex,taglib \
-		--disable-aalib --disable-esd --disable-shout2"
diff --git a/meta/packages/gstreamer/gst-plugins-ugly_0.10.4.bb b/meta/packages/gstreamer/gst-plugins-ugly_0.10.4.bb
index ad287d90ae..022a0abcec 100644
--- a/meta/packages/gstreamer/gst-plugins-ugly_0.10.4.bb
+++ b/meta/packages/gstreamer/gst-plugins-ugly_0.10.4.bb
@@ -1,5 +1,6 @@
 require gst-plugins.inc
 DEPENDS += "gst-plugins-base libid3tag libmad mpeg2dec liba52 lame"
+PR = "r1"
 
 SRC_URI += " file://lame-autoconf.patch;patch=1"
 EXTRA_OECONF += "--with-plugins=a52dec,lame,id3tag,mad,mpeg2dec"
diff --git a/meta/packages/gstreamer/gst-plugins.inc b/meta/packages/gstreamer/gst-plugins.inc
index 1ce7ef8d91..f5e60edb4c 100644
--- a/meta/packages/gstreamer/gst-plugins.inc
+++ b/meta/packages/gstreamer/gst-plugins.inc
@@ -13,6 +13,7 @@ EXTRA_OECONF = "--disable-valgrind --disable-debug --disable-examples "
 acpaths = "-I ${S}/common/m4 -I ${S}/m4"
 
 LIBV = "0.10"
+PACKAGES_DYNAMIC = "gst-plugin-*"
 
 python populate_packages_prepend () {
 	gst_libdir = bb.data.expand('${libdir}/gstreamer-${LIBV}', d)
diff --git a/meta/packages/musicbrainz/libmusicbrainz_2.1.2.bb b/meta/packages/musicbrainz/libmusicbrainz_2.1.2.bb
new file mode 100644
index 0000000000..14eac7adce
--- /dev/null
+++ b/meta/packages/musicbrainz/libmusicbrainz_2.1.2.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "The MusicBrainz client is a library which can be built into other programs.  The library allows you to access the data held on the MusicBrainz server."
+HOMEPAGE = "http://musicbrainz.org"
+MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
+LICENSE = "LGPL"
+DEPENDS = "expat"
+
+SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-2.1.2.tar.gz"
+
+inherit autotools pkgconfig
+
+do_stage() {
+autotools_stage_all
+}
+
+
+
diff --git a/meta/packages/owl-video-widget/owl-video-widget_svn.bb b/meta/packages/owl-video-widget/owl-video-widget_svn.bb
new file mode 100755
index 0000000000..2b843220b7
--- /dev/null
+++ b/meta/packages/owl-video-widget/owl-video-widget_svn.bb
@@ -0,0 +1,15 @@
+LICENSE = "LGPL"
+SECTION = "x11"
+DEPENDS = "gtk+ gstreamer gst-plugins-base"
+RDEPENDS = "gst-meta-base"
+RRECOMMENDS = "gst-meta-audio gst-meta-video"
+MAINTAINER = "Chris Lord <chris@openedhand.com>"
+DESCRIPTION = "OpenedHand Widget Library video widget"
+
+PV = "0.1+svn${SRCDATE}"
+S = "${WORKDIR}/${PN}"
+
+SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http"
+
+inherit autotools pkgconfig
+
diff --git a/meta/packages/tasks/task-oh.bb b/meta/packages/tasks/task-oh.bb
index caa1203159..deeba58120 100644
--- a/meta/packages/tasks/task-oh.bb
+++ b/meta/packages/tasks/task-oh.bb
@@ -104,7 +104,10 @@ RDEPENDS_task-oh-testapps = "\
     tslib-tests \
     lrzsz \
     alsa-utils-amixer \
-    alsa-utils-aplay"
+    alsa-utils-aplay \
+    owl-video-widget \
+    gst-meta-video \
+    gst-meta-audio"
 
 
 #    minimo \