Merge branch 'opendreambox-1.6' into vuplus-1.6

Conflicts:

	recipes/enigma2/enigma2.bb
	recipes/gstreamer/gst-plugins-base_0.10.29.bb

Contents:
	enigma2 depends
	gst-plugins-base revision
	gst-plugins-good src_uri,patch,revision
	libsoup

diff --cc recipes/enigma2/enigma2.bb
index 900323b,c0c5a99..2a46f8b
mode 100644,100755..100644
--- 1/recipes/enigma2/enigma2.bb
--- 2/recipes/enigma2/enigma2.bb
+++ b/recipes/enigma2/enigma2.bb
@@@ -18,16 -20,16 +20,22 @@@ RTSP_RDEPENDS = "gst-plugin-udp gst-plu
  RDEPENDS_append_dm7020 = " gst-plugin-ossaudio gst-plugin-ivorbisdec"
  RDEPENDS_append_dm7025 = " gst-plugin-alsa alsa-conf gst-plugin-ivorbisdec"
  RDEPENDS_append_dm8000 = " gst-plugin-alsa alsa-conf gst-plugin-avi gst-plugin-matroska \
-       gst-plugin-qtdemux gst-plugin-cdxaparse gst-plugin-cdio gst-plugin-vcdsrc gst-plugin-vorbis"
- RDEPENDS_append_dm800 = " gst-plugin-alsa alsa-conf gst-plugin-matroska gst-plugin-qtdemux  gst-plugin-ivorbisdec"
+       gst-plugin-qtdemux gst-plugin-cdxaparse gst-plugin-cdio gst-plugin-vcdsrc gst-plugin-vorbis \
+       ${RTSP_RDEPENDS}"
+ RDEPENDS_append_dm800 = " gst-plugin-alsa alsa-conf gst-plugin-matroska gst-plugin-qtdemux \
+       gst-plugin-ivorbisdec ${RTSP_RDEPENDS}"
  RDEPENDS_append_dm500hd = " gst-plugin-alsa alsa-conf gst-plugin-avi gst-plugin-matroska \
-       gst-plugin-qtdemux gst-plugin-cdxaparse gst-plugin-cdio gst-plugin-vcdsrc gst-plugin-vorbis"
+       gst-plugin-qtdemux gst-plugin-cdxaparse gst-plugin-cdio gst-plugin-vcdsrc gst-plugin-vorbis \
+       ${RTSP_RDEPENDS}"
 +RDEPENDS_append_vusolo = " gst-plugin-alsa alsa-conf gst-plugin-avi gst-plugin-matroska \
-       gst-plugin-qtdemux gst-plugin-cdxaparse gst-plugin-cdio gst-plugin-vcdsrc gst-plugin-vorbis"
++      gst-plugin-qtdemux gst-plugin-cdxaparse gst-plugin-cdio gst-plugin-vcdsrc gst-plugin-vorbis \
++      ${RTSP_RDEPENDS}"
 +RDEPENDS_append_bm750 = " gst-plugin-alsa alsa-conf gst-plugin-avi gst-plugin-matroska \
-       gst-plugin-qtdemux gst-plugin-cdxaparse gst-plugin-cdio gst-plugin-vcdsrc gst-plugin-vorbis"
++      gst-plugin-qtdemux gst-plugin-cdxaparse gst-plugin-cdio gst-plugin-vcdsrc gst-plugin-vorbis \
++      ${RTSP_RDEPENDS}"
  RDEPENDS_append_dm800se = " gst-plugin-alsa alsa-conf gst-plugin-avi gst-plugin-matroska \
-       gst-plugin-qtdemux gst-plugin-cdxaparse gst-plugin-cdio gst-plugin-vcdsrc gst-plugin-vorbis"
+       gst-plugin-qtdemux gst-plugin-cdxaparse gst-plugin-cdio gst-plugin-vcdsrc gst-plugin-vorbis \
+       ${RTSP_RDEPENDS}"
  
  # 'forward depends' - no two providers can have the same PACKAGES_DYNAMIC, however both
  # enigma2 and enigma2-plugins produce enigma2-plugin-*.

diff --cc recipes/gnome/libsoup-2.4_2.29.5.bb
index a13106e,d2a89d0..c74d54a
--- 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
@@@ -2,12 -2,18 +2,20 @@@ DESCRIPTION = "An HTTP library implemen
  SECTION = "x11/gnome/libs"
  LICENSE = "GPL"
  DEPENDS = "libproxy glib-2.0 gnutls libxml2 sqlite3 gnome-keyring"
+ DEPENDS_opendreambox = "glib-2.0 gnutls libxml2 sqlite3"
++DEPENDS_vuplus = "glib-2.0 gnutls libxml2 sqlite3"
  
- inherit gnome
+ #inherit gnome
+ inherit autotools
  
- SRC_URI = "${GNOME_MIRROR}/libsoup/${@gnome_verdir("${PV}")}/libsoup-${PV}.tar.bz2"
+ AUTOTOOLS_STAGE_PKGCONFIG = "1"
+ 
+ SRC_URI = "${GNOME_MIRROR}/libsoup/${@'.'.join((bb.data.getVar('PV', d, 1)).split('.')[:2])}/libsoup-${PV}.tar.bz2"
  S = "${WORKDIR}/libsoup-${PV}"
  
+ EXTRA_OECONF_opendreambox += "--without-gnome"
++EXTRA_OECONF_vuplus += "--without-gnome"
+ 
  PACKAGES =+ "libsoup-gnome"
  FILES_libsoup-gnome = "${libdir}/libsoup-gnome*.so.*"
  FILES_${PN} = "${libdir}/libsoup-2*.so.*"

diff --cc recipes/gstreamer/gst-plugins-base_0.10.29.bb
index 9969521,9582cd1..39fc7ff
--- 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
@@@ -4,14 -4,7 +4,14 @@@ SRC_URI_append_opendreambox = " file://
  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 "
  
- PR = "${INC_PR}.0"
 +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 "
 +
+ PR = "${INC_PR}.1"
  
  PROVIDES += "gst-plugins"