Merge branch 'opendreambox-1.6' into vuplus-1.6

Conflicts:

	recipes/gnome/libsoup-2.4_2.29.5.bb
	recipes/gstreamer/gst-plugins-base_0.10.29.bb
	recipes/gstreamer/gst-plugins.inc

diff --cc recipes/enigma2/enigma2.bb
index 2a46f8b,a66801a..70e7769
mode 100644,100755..100644
--- 1/recipes/enigma2/enigma2.bb
--- 2/recipes/enigma2/enigma2.bb
+++ b/recipes/enigma2/enigma2.bb

diff --cc recipes/gnome/libsoup-2.4_2.29.5.bb
index c74d54a,a110d6c..e40bb17
--- 1/recipes/gnome/libsoup-2.4_2.29.5.bb
--- 2/recipes/gnome/libsoup-2.4_2.29.5.bb
+++ b/recipes/gnome/libsoup-2.4_2.29.5.bb
@@@ -14,7 -13,8 +14,10 @@@ SRC_URI = "${GNOME_MIRROR}/libsoup/${@'
  S = "${WORKDIR}/libsoup-${PV}"
  
  EXTRA_OECONF_opendreambox += "--without-gnome"
 +EXTRA_OECONF_vuplus += "--without-gnome"
+ #the following is needed for dm800 .. i dont know why...
+ SRC_URI_append_opendreambox = " file://libsoup-libz-hack.patch;patch=1;pnum=1"
++SRC_URI_append_vuplus = " file://libsoup-libz-hack.patch;patch=1;pnum=1"
  
  PACKAGES =+ "libsoup-gnome"
  FILES_libsoup-gnome = "${libdir}/libsoup-gnome*.so.*"

diff --cc recipes/gstreamer/gst-plugins-base_0.10.29.bb
index 39fc7ff,1ffafc9..3545601
--- 1/recipes/gstreamer/gst-plugins-base_0.10.29.bb
--- 2/recipes/gstreamer/gst-plugins-base_0.10.29.bb
+++ b/recipes/gstreamer/gst-plugins-base_0.10.29.bb
@@@ -2,16 -2,10 +2,15 @@@ require gst-plugins.in
  
  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 "
  
- file://playbin2-If-a-text-sink-is-provided-let-subtitle-p.patch;patch=1 "
 +SRC_URI_append_vuplus = " file://samihack.patch;patch=1 \
 +file://playbin2-Set-subtitle-encoding-on-the-decodebins-a.patch;patch=1 \
- #Following patch is needed if X is enabled.
- #file://jsseek_have_x.patch;patch=1 "
- 
- PR = "${INC_PR}.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"
  
  PROVIDES += "gst-plugins"
  

diff --cc recipes/gstreamer/gst-plugins-ugly_0.10.15.bb
index 10d9d58,7cb481a..50c348a
--- 1/recipes/gstreamer/gst-plugins-ugly_0.10.15.bb
--- 2/recipes/gstreamer/gst-plugins-ugly_0.10.15.bb
+++ b/recipes/gstreamer/gst-plugins-ugly_0.10.15.bb
@@@ -1,5 -1,7 +1,8 @@@
  require gst-plugins.inc
  
+ SRC_URI_append_opendreambox = " file://dvdsubdec-addproperty-singlebuffer.patch;patch=1"
++SRC_URI_append_vuplus = " file://dvdsubdec-addproperty-singlebuffer.patch;patch=1"
+ 
  PR = "${INC_PR}.0"
  
  DEPENDS += "gst-plugins-base libsidplay"

diff --cc recipes/gstreamer/gst-plugins.inc
index 9d70c45,f3a9938..e205462
mode 100755,100644..100755
--- 1/recipes/gstreamer/gst-plugins.inc
--- 2/recipes/gstreamer/gst-plugins.inc
+++ b/recipes/gstreamer/gst-plugins.inc
@@@ -2,10 -2,9 +2,10 @@@ require gst-common.in
  DESCRIPTION = "Plugins for GStreamer"
  DEPENDS = "gstreamer libmikmod liboil libogg tremor libvorbis"
  DEPENDS += "${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag', d)}"
- DEPENDS += "${@base_conditional('DISTRO', 'opendreambox', 'libmad neon flac libmatroska libcdio libid3tag', '', d)}"
- DEPENDS += "${@base_conditional('DISTRO', 'vuplus', 'libmad neon flac libmatroska libcdio libid3tag', '', d)}"
+ DEPENDS += "${@base_conditional('DISTRO', 'opendreambox', 'libmad libsoup-2.4 flac libmatroska libcdio libid3tag', '', d)}"
++DEPENDS += "${@base_conditional('DISTRO', 'vuplus', 'libmad libsoup-2.4 flac libmatroska libcdio libid3tag', '', d)}"
  
- INC_PR = "r7"
+ INC_PR = "r8"
  
  PACKAGES_DYNAMIC = "gst-plugin-*"