4 files changed, 31 insertions, 13 deletions
diff --git a/packages/gstreamer/gst-meta-base_0.10.bb b/packages/gstreamer/gst-meta-base_0.10.bb
index 0666f226d0..3a33b2086c 100644
--- a/packages/gstreamer/gst-meta-base_0.10.bb
+++ b/packages/gstreamer/gst-meta-base_0.10.bb
@@ -2,7 +2,7 @@
 
 DESCRIPTION = "Gstreamer package groups"
 DEPENDS = "gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly"
-PR = "r9"
+PR = "r10"
 
 PACKAGES = "\
     gst-meta-base \
@@ -20,17 +20,15 @@ RDEPENDS_gst-meta-base = "\
     gst-plugin-audioconvert \
     gst-plugin-audioresample \
     gst-plugin-typefindfunctions \
-    gst-plugin-videoscale \
     gst-plugin-autodetect"
 
 RRECOMMENDS_gst-meta-base = "\
     gst-plugin-gnomevfs \
     gst-plugin-alsa \
     gst-plugin-ximagesink \
-    gst-plugin-typefindfunctions \
     gst-plugin-videoscale \
-    gst-plugin-ffmpegcolorspace \
-    gst-plugin-autodetect"
+    gst-plugin-videorate \
+    gst-plugin-ffmpegcolorspace"
 
 RDEPENDS_gst-meta-audio = "\
     gst-meta-base \
@@ -49,6 +47,9 @@ RDEPENDS_gst-meta-video = "\
     gst-meta-base \
     gst-plugin-avi \
     gst-plugin-matroska \
+    gst-plugin-mpegstream \
+    gst-plugin-mpegaudioparse \
+    gst-plugin-mpegvideoparse \
     gst-plugin-mpeg2dec"
 
 RRECOMMENDS_gst-meta-video = "\
diff --git a/packages/gstreamer/gst-plugins-ugly/gstsid_autofoo_HACK.patch b/packages/gstreamer/gst-plugins-ugly/gstsid_autofoo_HACK.patch
new file mode 100644
index 0000000000..79a03741ac
--- /dev/null
+++ b/packages/gstreamer/gst-plugins-ugly/gstsid_autofoo_HACK.patch
@@ -0,0 +1,20 @@
+Index: gst-plugins-ugly-0.10.6/m4/gst-sid.m4
+===================================================================
+--- gst-plugins-ugly-0.10.6.orig/m4/gst-sid.m4
++++ gst-plugins-ugly-0.10.6/m4/gst-sid.m4
+@@ -16,14 +16,7 @@ if test $HAVE_SIDPLAY = "yes"; then
+ 
+   LIBS="-lsidplay"
+ 
+-  AC_TRY_RUN([
+-    #include <sidplay/player.h>
+-    int main()
+-    { sidTune tune = sidTune(0);  }
+-    ],
+-    HAVE_SIDPLAY="yes",
+-    HAVE_SIDPLAY="no",
+-    HAVE_SIDPLAY="no")
++  HAVE_SIDPLAY="yes"
+ 
+   LIBS="$ac_libs_safe"
+ 
diff --git a/packages/gstreamer/gst-plugins-ugly_0.10.5.bb b/packages/gstreamer/gst-plugins-ugly_0.10.5.bb
deleted file mode 100644
index 51ce56dc1f..0000000000
--- a/packages/gstreamer/gst-plugins-ugly_0.10.5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require gst-plugins.inc
-
-DEPENDS += "gst-plugins-base"
-SRC_URI += "file://cross-compile.patch;patch=1"
-PR = "r4"
diff --git a/packages/gstreamer/gst-plugins-ugly_0.10.6.bb b/packages/gstreamer/gst-plugins-ugly_0.10.6.bb
index 9eb6410d09..c88a4db990 100644
--- a/packages/gstreamer/gst-plugins-ugly_0.10.6.bb
+++ b/packages/gstreamer/gst-plugins-ugly_0.10.6.bb
@@ -1,7 +1,9 @@
 require gst-plugins.inc
 
-DEPENDS += "gst-plugins-base"
+DEPENDS += "gst-plugins-base mpeg2dec libsidplay"
+PR = "r3"
+
 SRC_URI += "file://cross-compile.patch;patch=1 \
-            file://gstmad_16bit.patch;patch=1"
+            file://gstmad_16bit.patch;patch=1 \
+            file://gstsid_autofoo_HACK.patch;patch=1"
 
-PR = "r1"