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 9969521..3545601 100644 (file)
--- a/recipes/gstreamer/gst-plugins-base_0.10.29.bb
+++ b/recipes/gstreamer/gst-plugins-base_0.10.29.bb
@@ -2,14 +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 "
-
-#Following patch is needed if X is enabled.
-#file://jsseek_have_x.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"