Fix liboil, revise GStreamer packages (still WIP)

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

7 files changed, 17 insertions, 16 deletions

diff --git a/meta/packages/gstreamer/gst-meta-audio_0.10.bb b/meta/packages/gstreamer/gst-meta-audio_0.10.bb
index ebbd202ce6..3e9a46680b 100644
--- a/meta/packages/gstreamer/gst-meta-audio_0.10.bb
+++ b/meta/packages/gstreamer/gst-meta-audio_0.10.bb
@@ -1,6 +1,5 @@
-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"
+DEPENDS = "gst-meta-base gst-plugins-bad"
+RDEPENDS = "gst-meta-base gst-plugin-ivorbis gst-plugin-ogg"
+PR = "r3"
 
 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 263cf4b13d..12d98ee5d2 100644
--- a/meta/packages/gstreamer/gst-meta-base_0.10.bb
+++ b/meta/packages/gstreamer/gst-meta-base_0.10.bb
@@ -1,9 +1,9 @@
 DEPENDS = "gstreamer gst-plugins-base"
-RDEPENDS = "gstreamer gst-plugins-base gst-plugin-playbin \
+RDEPENDS = "gstreamer gst-plugin-playbin \
         gst-plugin-decodebin gst-plugin-gnomevfs gst-plugin-alsa \
         gst-plugin-volume gst-plugin-ximagesink gst-plugin-audioconvert \
         gst-plugin-audioresample gst-plugin-typefindfunctions \
-        gst-plugin-videoscale gst-plugin-ffmpegcolorspace"
-PR = "r1"
+        gst-plugin-videoscale gst-plugin-ffmpegcolorspace gst-plugin-autodetect"
+PR = "r2"
 
 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 5ff9b58bbb..cd63d4ba2e 100644
--- a/meta/packages/gstreamer/gst-meta-video_0.10.bb
+++ b/meta/packages/gstreamer/gst-meta-video_0.10.bb
@@ -1,9 +1,9 @@
 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 \
+RDEPENDS = "gst-meta-base gst-plugin-avi \
             gst-plugin-matroska gst-plugin-ogg \
             gst-fluendo-mpegdemux gst-plugin-mpeg2dec"
 RRECOMMENDS = "gst-meta-audio"
-PR = "r1"
+PR = "r2"
 
 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 ecffc245ad..003fca8aa8 100644
--- a/meta/packages/gstreamer/gst-plugins-bad_0.10.3.bb
+++ b/meta/packages/gstreamer/gst-plugins-bad_0.10.3.bb
@@ -1,7 +1,7 @@
 require gst-plugins.inc
-DEPENDS += "gst-plugins-base libmusicbrainz"
-PR = "r2"
+DEPENDS += "gst-plugins-base libmusicbrainz tremor"
+PR = "r3"
 
 EXTRA_OECONF += "--disable-examples --disable-experimental --disable-sdl \
-                --with-plugins=musicbrainz,wavpack"
+                --with-plugins=musicbrainz,wavpack,ivorbis"
 
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 541b75f6a1..efddc37564 100644
--- a/meta/packages/gstreamer/gst-plugins-base_0.10.9.bb
+++ b/meta/packages/gstreamer/gst-plugins-base_0.10.9.bb
@@ -1,5 +1,5 @@
 require gst-plugins.inc
-DEPENDS += "libx11 alsa-lib freetype gnome-vfs liboil libogg libvorbis tremor"
+DEPENDS += "libx11 alsa-lib freetype gnome-vfs liboil libogg libvorbis"
 RDEPENDS += "gnome-vfs-plugin-file gnome-vfs-plugin-http gnome-vfs-plugin-ftp \
              gnome-vfs-plugin-sftp"
 PROVIDES_${PN} += "gst-plugins"
diff --git a/meta/packages/gstreamer/gstreamer_0.10.9.bb b/meta/packages/gstreamer/gstreamer_0.10.9.bb
index 43d5e34df4..6acaa3dd6c 100644
--- a/meta/packages/gstreamer/gstreamer_0.10.9.bb
+++ b/meta/packages/gstreamer/gstreamer_0.10.9.bb
@@ -6,7 +6,7 @@ LICENSE = "LGPL"
 HOMEPAGE = "http://www.gstreamer.net/"
 MAINTAINER = "Chris Lord <chris@openedhand.com>"
 DEPENDS = "glib-2.0 gettext-native libxml2"
-PR = "r2"
+PR = "r3"
 
 inherit autotools pkgconfig
 
@@ -15,7 +15,7 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz
 #           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"
+EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no --disable-examples --disable-tests --disable-valgrind --disable-debug"
 
 #do_compile_prepend () {
 #       mv ${WORKDIR}/gstregistrybinary.[ch] ${S}/gst/
diff --git a/meta/packages/liboil/liboil_0.3.9.bb b/meta/packages/liboil/liboil_0.3.9.bb
index 04a83100b0..65d2b149fc 100644
--- a/meta/packages/liboil/liboil_0.3.9.bb
+++ b/meta/packages/liboil/liboil_0.3.9.bb
@@ -2,8 +2,10 @@ DESCRIPTION = "Liboil is a library of simple functions that are optimized for va
 HOMEPAGE = "http://liboil.freedesktop.org/"
 LICENSE = "various"
 MAINTAINER = "Koen Kooi <koen@on.kabel.utwente.nl>"
+PR = "r1"
 
-SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz"
+SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz \
+           file://no-tests.patch;patch=1"
 
 inherit autotools pkgconfig