4 files changed, 26 insertions, 28 deletions

diff --git a/meta/packages/gstreamer/gst-meta-base_0.10.bb b/meta/packages/gstreamer/gst-meta-base_0.10.bb
index 0f78e10276..3bda87ec15 100644
--- a/meta/packages/gstreamer/gst-meta-base_0.10.bb
+++ b/meta/packages/gstreamer/gst-meta-base_0.10.bb
@@ -13,39 +13,39 @@ ALLOW_EMPTY = "1"
 
 RDEPENDS_gst-meta-base = "\
     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 \
-    gst-plugin-autodetect"
+    gst-plugins-base-playbin \
+    gst-plugins-base-decodebin \
+    gst-plugins-base-gnomevfs \
+    gst-plugins-base-alsa \
+    gst-plugins-base-volume \
+    gst-plugins-base-ximagesink \
+    gst-plugins-base-audioconvert \
+    gst-plugins-base-audioresample \
+    gst-plugins-base-typefindfunctions \
+    gst-plugins-base-videoscale \
+    gst-plugins-base-ffmpegcolorspace \
+    gst-plugins-good-autodetect"
 
 
 RDEPENDS_gst-meta-audio = "\
     gst-meta-base \
-    gst-plugin-ivorbis \
-    gst-plugin-ogg \
-    gst-plugin-mad"
+    gst-plugins-base-ivorbis \
+    gst-plugins-base-ogg \
+    gst-plugins-ugly-mad"
 
 
 RDEPENDS_gst-meta-debug = "\
     gst-meta-base \
-    gst-plugin-debug \
-    gst-plugin-audiotestsrc \
-    gst-plugin-videotestsrc"
+    gst-plugins-good-debug \
+    gst-plugins-base-audiotestsrc \
+    gst-plugins-base-videotestsrc"
 
 
 RDEPENDS_gst-meta-video = "\
     gst-meta-base \
-    gst-plugin-avi \
-    gst-plugin-matroska \
-    gst-plugin-mpeg2dec"
+    gst-plugins-good-avi \
+    gst-plugins-good-matroska \
+    gst-plugins-ugly-mpeg2dec"
 
 RRECOMMENDS_gst-meta-video = "\
     gst-meta-audio"
diff --git a/meta/packages/gstreamer/gst-plugins-base_0.10.29.bb b/meta/packages/gstreamer/gst-plugins-base_0.10.29.bb
index d55f85d86d..bfbe28108d 100644
--- a/meta/packages/gstreamer/gst-plugins-base_0.10.29.bb
+++ b/meta/packages/gstreamer/gst-plugins-base_0.10.29.bb
@@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
 DEPENDS += "virtual/libx11 alsa-lib freetype gnome-vfs liboil libogg libvorbis libxv"
 RDEPENDS += "gnome-vfs-plugin-file gnome-vfs-plugin-http gnome-vfs-plugin-ftp \
              gnome-vfs-plugin-sftp"
-PROVIDES_${PN} += "gst-plugins"
 
 PR = "r0"
 
diff --git a/meta/packages/gstreamer/gst-plugins-good_0.10.23.bb b/meta/packages/gstreamer/gst-plugins-good_0.10.23.bb
index fe5c722f49..528dcbf540 100644
--- a/meta/packages/gstreamer/gst-plugins-good_0.10.23.bb
+++ b/meta/packages/gstreamer/gst-plugins-good_0.10.23.bb
@@ -13,8 +13,6 @@ inherit gettext
 
 EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --without-check"
 
-PACKAGES += "gst-plugin-id3demux"
-
 do_configure_prepend() {
         # This m4 file contains nastiness which conflicts with libtool 2.2.2
         rm ${S}/m4/lib-link.m4 || true
diff --git a/meta/packages/gstreamer/gst-plugins.inc b/meta/packages/gstreamer/gst-plugins.inc
index 9146d3eb85..bc7a373619 100644
--- a/meta/packages/gstreamer/gst-plugins.inc
+++ b/meta/packages/gstreamer/gst-plugins.inc
@@ -14,19 +14,20 @@ EXTRA_OECONF = "--disable-valgrind --disable-debug --disable-examples "
 acpaths = "-I ${S}/common/m4 -I ${S}/m4"
 
 LIBV = "0.10"
-PACKAGES_DYNAMIC = "gst-plugin-*"
 #FILES_${PN} += "${libdir}/gstreamer-${LIBV}/*.so"
 #FILES_${PN}-dev += "${libdir}/gstreamer-${LIBV}/*.la ${libdir}/gstreamer-${LIBV}/*.a"
 FILES_${PN}-dbg += "${libdir}/gstreamer-${LIBV}/.debug"
 
+PACKAGES_DYNAMIC = "${PN}-*"
+
 python populate_packages_prepend () {
         gst_libdir = bb.data.expand('${libdir}/gstreamer-${LIBV}', d)
         postinst = bb.data.getVar('plugin_postinst', d, 1)
 
 #       Can't package separate debug packages yet
-#       do_split_packages(d, gst_libdir, '\.debug/libgst(.*)\.so$', 'gst-plugin-%s-dbg', 'GStreamer plugin for %s (with debugging symbols)', recursive=True, extra_depends=bb.data.expand('${PN}-dbg', d), match_path=True)
-        do_split_packages(d, gst_libdir, 'libgst(.*)\.so$', 'gst-plugin-%s', 'GStreamer plugin for %s', postinst=postinst, extra_depends=bb.data.expand('${PN}',d))
-        do_split_packages(d, gst_libdir, 'libgst(.*)\.l?a$', 'gst-plugin-%s-dev', 'GStreamer plugin for %s (development files)', extra_depends=bb.data.expand('${PN}-dev',d))
+#       do_split_packages(d, gst_libdir, '\.debug/libgst(.*)\.so$', '${PN}-%s-dbg', 'GStreamer plugin for %s (with debugging symbols)', recursive=True, extra_depends=bb.data.expand('${PN}-dbg', d), match_path=True)
+        do_split_packages(d, gst_libdir, 'libgst(.*)\.so$', '${PN}-%s', 'GStreamer plugin for %s', postinst=postinst, extra_depends=bb.data.expand('${PN}',d))
+        do_split_packages(d, gst_libdir, 'libgst(.*)\.l?a$', '${PN}-%s-dev', 'GStreamer plugin for %s (development files)', extra_depends=bb.data.expand('${PN}-dev',d))
 }
 
 ALLOW_EMPTY = "1"