Tweak/fix-up GStreamer stuff - gst-launch seems to work with mpegs now

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

11 files changed, 63 insertions, 23 deletions

diff --git a/meta/packages/gstreamer/gst-ffmpeg_0.10.1.bb b/meta/packages/gstreamer/gst-ffmpeg_0.10.1.bb
index d2123f4a57..944ad62ee0 100644
--- a/meta/packages/gstreamer/gst-ffmpeg_0.10.1.bb
+++ b/meta/packages/gstreamer/gst-ffmpeg_0.10.1.bb
@@ -5,12 +5,15 @@ LICENSE = "LGPL"
 HOMEPAGE = "http://www.gstreamer.net/"
 MAINTAINER = "Chris Lord <chris@openedhand.com>"
 DEPENDS = "gstreamer zlib"
+PR = "r1"
 
 inherit autotools pkgconfig
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2"
 
-FILES_${PN} += "${libdir}/gstreamer-0.10"
+FILES_${PN} += "${libdir}/gstreamer-0.10/*.so"
+FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
+FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"
 
 EXTRA_OECONF = "--disable-sdltest --disable-ffplay --disable-freetypetest \
 		--disable-vorbis --disable-vorbistest --disable-encoders \
diff --git a/meta/packages/gstreamer/gst-fluendo-mp3_0.10.2.bb b/meta/packages/gstreamer/gst-fluendo-mp3_0.10.2.bb
new file mode 100644
index 0000000000..184de384cb
--- /dev/null
+++ b/meta/packages/gstreamer/gst-fluendo-mp3_0.10.2.bb
@@ -0,0 +1,2 @@
+require gst-fluendo.inc
+DESCRIPTION = "Fluendo closed-format mp3 GStreamer plug-in"
diff --git a/meta/packages/gstreamer/gst-fluendo-mpegdemux_0.10.7.bb b/meta/packages/gstreamer/gst-fluendo-mpegdemux_0.10.7.bb
new file mode 100644
index 0000000000..81645accd6
--- /dev/null
+++ b/meta/packages/gstreamer/gst-fluendo-mpegdemux_0.10.7.bb
@@ -0,0 +1,2 @@
+require gst-fluendo.inc
+DESCRIPTION = "Fluendo closed-format mpeg video GStreamer plug-in"
diff --git a/meta/packages/gstreamer/gst-fluendo.inc b/meta/packages/gstreamer/gst-fluendo.inc
new file mode 100644
index 0000000000..830119ec72
--- /dev/null
+++ b/meta/packages/gstreamer/gst-fluendo.inc
@@ -0,0 +1,26 @@
+DESCRIPTION = "Fluendo closed-format GStreamer plug-in"
+SECTION = "multimedia"
+PRIORITY = "optional"
+LICENSE = "MIT"
+HOMEPAGE = "http://www.fluendo.com/resources/source-plugins.php"
+MAINTAINER = "Chris Lord <chris@openedhand.com>"
+DEPENDS = "gstreamer zlib"
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://core.fluendo.com/gstreamer/src/${PN}/${PN}-${PV}.tar.bz2"
+
+FILES_${PN} += "${libdir}/gstreamer-0.10/*.so"
+FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
+FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"
+
+EXTRA_OECONF = "--disable-debug --disable-valgrind"
+
+# Hack to get STAGING_LIBDIR into the linker path when building
+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
index be0ec10f78..ebbd202ce6 100644
--- a/meta/packages/gstreamer/gst-meta-audio_0.10.bb
+++ b/meta/packages/gstreamer/gst-meta-audio_0.10.bb
@@ -1,5 +1,6 @@
-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"
+DEPENDS = "gst-meta-base gst-fluendo-mp3 gst-fluendo-mpegdemux"
+RDEPENDS = "gst-meta-base gst-plugin-vorbis gst-plugin-ogg gst-fluendo-mp3 \
+            gst-fluendo-mpegdemux"
+PR = "r1"
 
 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
index 8179952f45..263cf4b13d 100644
--- a/meta/packages/gstreamer/gst-meta-base_0.10.bb
+++ b/meta/packages/gstreamer/gst-meta-base_0.10.bb
@@ -1,6 +1,9 @@
 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"
+	gst-plugin-volume gst-plugin-ximagesink gst-plugin-audioconvert \
+	gst-plugin-audioresample gst-plugin-typefindfunctions \
+	gst-plugin-videoscale gst-plugin-ffmpegcolorspace"
+PR = "r1"
 
 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
index c085582801..5ff9b58bbb 100644
--- a/meta/packages/gstreamer/gst-meta-video_0.10.bb
+++ b/meta/packages/gstreamer/gst-meta-video_0.10.bb
@@ -1,6 +1,9 @@
-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"
+DEPENDS = "gst-meta-base gst-plugins-good gst-fluendo-mpegdemux \
+           gst-plugins-ugly"
+RDEPENDS = "gst-meta-base gst-plugins-good gst-plugins-ugly gst-plugin-avi \
+            gst-plugin-matroska gst-plugin-ogg \
+	    gst-fluendo-mpegdemux gst-plugin-mpeg2dec"
 RRECOMMENDS = "gst-meta-audio"
+PR = "r1"
 
 ALLOW_EMPTY = "1"
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 973327e146..db947a3394 100644
--- a/meta/packages/gstreamer/gst-plugins-base_0.10.9.bb
+++ b/meta/packages/gstreamer/gst-plugins-base_0.10.9.bb
@@ -3,10 +3,9 @@ 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"
+PR = "r2"
 
-EXTRA_OECONF += "--with-plugins=ximagesink,alsa,gnomevfs,ogg,vorbis \
-		--disable-freetypetest --disable-pango --disable-theora"
+EXTRA_OECONF += "--disable-freetypetest --disable-pango --disable-theora"
 
 do_stage() {
        autotools_stage_all
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 836923b146..e0375cc8c0 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"
+PR = "r2"
 
-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,avi,matroska,videofilter,autodetect,debug --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 022a0abcec..eb1bf8b57d 100644
--- a/meta/packages/gstreamer/gst-plugins-ugly_0.10.4.bb
+++ b/meta/packages/gstreamer/gst-plugins-ugly_0.10.4.bb
@@ -1,7 +1,7 @@
 require gst-plugins.inc
 DEPENDS += "gst-plugins-base libid3tag libmad mpeg2dec liba52 lame"
-PR = "r1"
+PR = "r2"
 
 SRC_URI += " file://lame-autoconf.patch;patch=1"
-EXTRA_OECONF += "--with-plugins=a52dec,lame,id3tag,mad,mpeg2dec"
+EXTRA_OECONF += "--with-plugins=a52dec,lame,id3tag,mad,mpeg2dec,mpegstream,mpegaudioparse,asfdemux,realmedia"
 
diff --git a/meta/packages/gstreamer/gstreamer_0.10.9.bb b/meta/packages/gstreamer/gstreamer_0.10.9.bb
index 66db827523..5c9444b1d2 100644
--- a/meta/packages/gstreamer/gstreamer_0.10.9.bb
+++ b/meta/packages/gstreamer/gstreamer_0.10.9.bb
@@ -5,19 +5,20 @@ PRIORITY = "optional"
 LICENSE = "LGPL"
 HOMEPAGE = "http://www.gstreamer.net/"
 MAINTAINER = "Felix Domke <tmbinc@elitedvb.net>"
-DEPENDS = "glib-2.0 gettext-native popt"
+DEPENDS = "glib-2.0 gettext-native popt libxml2"
+PR = "r1"
 
 inherit autotools pkgconfig
 
-SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \
-	   file://gstregistrybinary.c \
-	   file://gstregistrybinary.h \
-	   file://gstreamer-0.9-binary-registry.patch;patch=1"
+SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2"
+#	   file://gstregistrybinary.c \
+#	   file://gstregistrybinary.h \
+#	   file://gstreamer-0.9-binary-registry.patch;patch=1"
 EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no"
 
-do_compile_prepend () {
-	mv ${WORKDIR}/gstregistrybinary.[ch] ${S}/gst/
-}
+#do_compile_prepend () {
+#	mv ${WORKDIR}/gstregistrybinary.[ch] ${S}/gst/
+#}
 
 do_stage() {
 	oe_runmake install prefix=${STAGING_DIR} \