Merge branch 'opendreambox-1.6' into vuplus-1.6

[vuplus_openembedded] / recipes / gstreamer / gst-plugins-base_0.10.29.bb

diff --git a/recipes/gstreamer/gst-plugins-base_0.10.29.bb b/recipes/gstreamer/gst-plugins-base_0.10.29.bb
index 29e5475..3545601 100644 (file)
--- a/recipes/gstreamer/gst-plugins-base_0.10.29.bb
+++ b/recipes/gstreamer/gst-plugins-base_0.10.29.bb
@@ -2,7 +2,13 @@ require gst-plugins.inc
 
 SRC_URI_append_opendreambox = " file://samihack.patch;patch=1 \
 file://playbin2-Set-subtitle-encoding-on-the-decodebins-a.patch;patch=1 \
-file://playbin2-If-a-text-sink-is-provided-let-subtitle-p.patch;patch=1 "
+file://playbin2-If-a-text-sink-is-provided-let-subtitle-p.patch;patch=1 \
+file://playbin2-capsless-textsink.patch;patch=1 "
+
+SRC_URI_append_vuplus = " file://samihack.patch;patch=1 \
+file://playbin2-Set-subtitle-encoding-on-the-decodebins-a.patch;patch=1 \
+file://playbin2-If-a-text-sink-is-provided-let-subtitle-p.patch;patch=1 \
+file://playbin2-capsless-textsink.patch;patch=1 "
 
 PR = "${INC_PR}.0"
 
@@ -12,6 +18,8 @@ PROVIDES += "gst-plugins"
 # if alsa has been built and is present.  You will
 # not get an error if this is not present, just 
 # a missing alsa plugin
-DEPENDS += "${@base_contains('DISTRO', 'opendreambox', 'alsa-lib', 'cdparanoia pango libtheora alsa-lib libsm virtual/libx11 freetype gnome-vfs libxv', d)}"
+#DEPENDS += "${@base_contains('DISTRO', 'opendreambox', 'alsa-lib', 'cdparanoia pango libtheora alsa-lib libsm virtual/libx11 freetype gnome-vfs libxv', d)}"
+DEPENDS += "${@base_contains('DISTRO', 'vuplus', 'alsa-lib', 'cdparanoia pango libtheora alsa-lib libsm virtual/libx11 freetype gnome-vfs libxv', d)}"
 EXTRA_OECONF_opendreambox += "--disable-theora --disable-pango --with-audioresample-format=int"
+EXTRA_OECONF_vuplus += "--disable-theora --disable-pango --with-audioresample-format=int"