Merge commit 'origin/opendreambox-1.6' into vuplus-1.6

modify conf/distro/vuplus.conf, recipes/gstreamer/gst-plugins-base_0.10.30.bb.

Conflicts:

	recipes/enigma2/enigma2-plugins.bb
	recipes/enigma2/enigma2-skins.bb
	recipes/enigma2/enigma2.bb

diff --cc conf/distro/vuplus.conf
index 734b44d,0000000..8bef4c7
mode 100644,000000..100644
--- 1/conf/distro/vuplus.conf
--- /dev/null
+++ b/conf/distro/vuplus.conf
@@@ -1,170 -1,0 +1,170 @@@
- PREFERRED_VERSION_samba = "3.2.8"
 +#@--------------------------------------------------------------------
 +#@TYPE: Distribution
 +#@NAME: vuplus <http://www.vuplus.com>
 +#@--------------------------------------------------------------------
 +
 +SYSVINIT_ENABLED_GETTYS = ""
 +
 +INHERIT += "packaged-staging"
 +INHERIT += "package_ipk debian"
 +
 +DISTRO = "vuplus"
 +DISTRO_NAME = "Vuplus"
 +DISTRO_VERSION = "2.0.0"
 +
 +
 +TARGET_OS = "linux"
 +#TARGET_VENDOR = "-oe" is set at sane-toolchanin.inc
 +TARGET_VENDOR = "-vuplus"
 +
 +#OLDEST_KERNEL = "2.6.16"
 +
 +#
 +## Basic configuration
 +#
 +IMAGE_DEV_MANAGER = "udev"
 +DISTRO_SSH_DAEMON = "dropbear"
 +IMAGE_INIT_MANAGER = "sysvinit"
 +IMAGE_INITSCRIPTS ?= "initscripts-vuplus"
 +IMAGE_LOGIN_MANAGER ?= ""
 +IMAGE_FSTYPES ?= "tar.bz2 jffs2"
 +
 +
 +#Images built can have to modes:
 +# 'debug': empty rootpassword, strace included
 +# 'release' no root password, no strace and gdb by default
 +#DISTRO_TYPE ?= "debug"
 +#DISTRO_TYPE = "release"
 +
 +
 +#2.8
 +#FEED_URIS += "official##http://archive.vuplus.com/openembedded/1.1/vuplus/${MACHINE}/feeds/stable"
 +DISTRO_FEED_URI = "http://archive.vuplus.com/openembedded/${DISTRO_VERSION}/vuplus/${MACHINE}/feeds/stable"
 +
 +# If we're using an .ipk based rootfs, we want to have opkg-nogpg installed so postinst script can run
 +IPKG_VARIANT = "opkg-nogpg"
 +
 +
 +# for sane-toolchain.inc:
 +LIBC ?= "eglibc"
 +#LIBC ?= "glibc"
 +PREFERRED_BINUTILS ?= "2.18.50.0.7"
 +PREFERRED_GCC_VERSION ?= "4.1.1"
 +
 +
 +PREFERRED_VERSION_automake ?= "1.10.2"
 +PREFERRED_VERSION_automake-native ?= "1.10.2"
 +#PREFERRED_VERSION_busybox ?= "1.13.2"
 +PREFERRED_VERSION_busybox ?= "1.15.3"
 +PREFERRED_VERSION_libsigc++-1.2 ?= "1.2.5"
 +#PREFERRED_VERSION_linux-libc-headers ?= "2.6.23"
 +#PREFERRED_VERSION_linux-libc-headers ?= "2.6.12.0"
 +PREFERRED_VERSION_linux-libc-headers ?= "2.6.18"
 +PREFERRED_VERSION_swig-native ?= "1.3.39"
 +PREFERRED_VERSION_wpa-supplicant ?= "0.6.7"
++PREFERRED_VERSION_samba = "3.3.13"
 +#PREFERRED_VERSION_samba = "3.0.24"
 +PREFERRED_VERSION_ushare = "1.1a"
 +#PREFERRED_VERSION_liboil = "0.3.14"
 +PREFERRED_VERSION_hdparm = "6.6"
 +
 +PREFERRED_PROVIDER_avahi = "avahi"
 +PREFERRED_PROVIDER_opkg = "opkg-nogpg"
 +PREFERRED_PROVIDER_initscripts = "initscripts-vuplus"
 +PREFERRED_PROVIDER_virtual/db = "db"
 +PREFERRED_PROVIDER_virtual/db-native = "db-native"
 +PREFERRED_PROVIDER_bluez-libs = "bluez-libs"
 +PREFERRED_PROVIDER_libfribidi = "libfribidi"
 +
 +PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
 +PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
 +PREFERRED_PROVIDER_virtual/java-initial = "jamvm-initial"
 +
 +PREFERRED_PROVIDER_classpath-native = "classpath-minimal"
 +PREFERRED_PROVIDER_classpath = "classpath-minimal"
 +
 +PREFERRED_VERSION_jamvm-initial = "1.4.5"
 +PREFERRED_VERSION_classpath-initial = "0.93"
 +
 +PREFERRED_VERSION_libecj-bootstrap = "3.4"
 +
 +PREFERRED_VERSION_jamvm-native = "1.5.3"
 +PREFERRED_VERSION_classpath-native = "0.98"
 +
 +PREFERRED_VERSION_jamvm = "1.5.3"
 +PREFERRED_VERSION_classpath = "0.98"
 +
 +SRCREV_pn-opkg = "455"
 +
 +require conf/distro/include/sane-srcdates.inc
 +require conf/distro/include/sane-srcrevs.inc
 +require conf/distro/include/sane-toolchain.inc
 +require conf/distro/include/sane-feed-ipk.inc
 +
 +
 +#
 +PREFERRED_VERSION_autoconf-native = "2.61"
 +
 +
 +#oe complaint
 +PREFERRED_PROVIDER_virtual/libqte2 = "qte"
 +
 +
 +# glibc:
 +#PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
 +#PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
 +#PREFERRED_PROVIDER_virtual/libc ?= "glibc"
 +#PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial"
 +#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers"
 +
 +# Virtuals:
 +#PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
 +#PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
 +#PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate"
 +#PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
 +#PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
 +
 +# hostap stuff, we prefer the in-kernel modules, but those don't work for all machines
 +#PREFERRED_PROVIDER_hostap-conf                      ?= "hostap-conf"
 +#PREFERRED_PROVIDER_hostap-modules_h2200             ?= "hostap-modules"
 +#PREFERRED_PROVIDER_hostap-modules_hx4700            ?= "hostap-modules"
 +
 +#PREFERRED_PROVIDER_virtual/db           ?= "db"
 +#PREFERRED_PROVIDER_virtual/db-native    ?= "db-native"
 +#PREFERRED_PROVIDER_virtual/libsdl       ?= "libsdl-x11"
 +#PREFERRED_PROVIDER_virtual/libx11       ?= "libx11"
 +#PREFERRED_PROVIDER_virtual/xserver      ?= "xserver-kdrive"
 +
 +# Others:
 +#PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
 +#PREFERRED_PROVIDER_dbus-glib             = "dbus-glib"
 +#PREFERRED_PROVIDER_esound               ?= "pulseaudio"
 +#PREFERRED_PROVIDER_gconf                ?= "gconf-dbus"
 +#PREFERRED_PROVIDER_gnome-vfs            ?= "gnome-vfs"
 +#PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs"
 +#PREFERRED_PROVIDER_tslib                ?= "tslib"
 +#PREFERRED_PROVIDER_tslib-conf           ?= "tslib"
 +#PREFERRED_PROVIDER_libgpewidget         ?= "libgpewidget"
 +#PREFERRED_PROVIDER_ntp                  ?= "ntp"
 +#PREFERRED_PROVIDER_hotplug               = "udev"
 +#PREFERRED_PROVIDER_libxss                = "libxss"
 +#PREFERRED_PROVIDER_bluez-utils-dbus      = "bluez-utils"
 +#PREFERRED_PROVIDER_bluez-libs            = "bluez4"
 +
 +# we don't ship gtk-directfb by default
 +#PREFERRED_PROVIDER_gtk+                   ?= "gtk+"
 +#PREFERRED_PROVIDER_gdk-pixbuf-loader-ani  ?= "gtk+"
 +#PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+"
 +#PREFERRED_PROVIDER_gdk-pixbuf-loader-gif  ?= "gtk+"
 +#PREFERRED_PROVIDER_gdk-pixbuf-loader-ico  ?= "gtk+"
 +#PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg ?= "gtk+"
 +#PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx  ?= "gtk+"
 +#PREFERRED_PROVIDER_gdk-pixbuf-loader-png  ?= "gtk+"
 +#PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm  ?= "gtk+"
 +#PREFERRED_PROVIDER_gdk-pixbuf-loader-ras  ?= "gtk+"
 +#PREFERRED_PROVIDER_gdk-pixbuf-loader-tga  ?= "gtk+"
 +#PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+"
 +#PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm  ?= "gtk+"
 +#PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm  ?= "gtk+"
 +
 +

diff --cc recipes/enigma2/enigma2-plugins.bb
index 03fd18a,b8a423b..05bf6e6
mode 100644,100755..100755
--- 1/recipes/enigma2/enigma2-plugins.bb
--- 2/recipes/enigma2/enigma2-plugins.bb
+++ b/recipes/enigma2/enigma2-plugins.bb
@@@ -3,10 -3,8 +3,9 @@@ MAINTAINER = "Felix Domke <tmbinc@elite
  
  PACKAGES_DYNAMIC = "enigma2-plugin-*"
  
- SRCDATE = "20100213"
+ SRCDATE = "20100727"
 +SRCDATE_vuplus = "20100621"
  
- 
  # if you want the 2.7.0 release, use
  #TAG = ";tag=enigma2-plugins_rel27"
  #PV = "2.7cvs${SRCDATE}"

diff --cc recipes/enigma2/enigma2-skins.bb
index 8a208e5,c612007..bef21e2
mode 100644,100755..100755
--- 1/recipes/enigma2/enigma2-skins.bb
--- 2/recipes/enigma2/enigma2-skins.bb
+++ b/recipes/enigma2/enigma2-skins.bb
@@@ -3,8 -3,7 +3,8 @@@ MAINTAINER = "Felix Domke <tmbinc@elite
  
  PACKAGES_DYNAMIC = "enigma2-skin-*"
  
- SRCDATE = "20100213"
+ SRCDATE = "20100727"
 +SRCDATE_vuplus = "20100621"
  
  # if you want the 2.7 release, use
  #TAG = ";tag=enigma2-skins_rel27"

diff --cc recipes/enigma2/enigma2.bb
index 1a4f16e,8d3d4e5..178d6c2
mode 100644,100755..100644
--- 1/recipes/enigma2/enigma2.bb
--- 2/recipes/enigma2/enigma2.bb
+++ b/recipes/enigma2/enigma2.bb
@@@ -15,27 -15,18 +15,19 @@@ RDEPENDS = "python-codecs python-core p
        gst-plugin-apetag gst-plugin-icydemux gst-plugin-autodetect \
        glibc-gconv-iso8859-15 ethtool"
  
- RTSP_RDEPENDS = "gst-plugin-udp gst-plugin-rtsp gst-plugin-rtp gst-plugin-rtpmanager"
+ GST_RTSP_RDEPENDS = "gst-plugin-udp gst-plugin-rtsp gst-plugin-rtp gst-plugin-rtpmanager"
+ GST_ALSA_RDEPENDS = "gst-plugin-alsa alsa-conf"
+ GST_MISC_RDEPENDS = "gst-plugin-matroska gst-plugin-qtdemux gst-plugin-vorbis"
+ GST_DVD_RDEPENDS = "gst-plugin-cdxaparse gst-plugin-cdio gst-plugin-vcdsrc"
+ GST_BASE_RDEPENDS = "${GST_ALSA_RDEPENDS} ${GST_MISC_RDEPENDS} ${GST_RTSP_RDEPENDS}"
  
--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 \
-       ${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 \
-       ${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 \
-       ${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 \
-       ${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 \
-       ${RTSP_RDEPENDS}"
+ RDEPENDS_append_dm7025 = " ${GST_ALSA_RDEPENDS} gst-plugin-ivorbisdec"
+ RDEPENDS_append_dm800 = " ${GST_BASE_RDEPENDS} gst-plugin-ivorbisdec"
+ RDEPENDS_append_dm8000 = " ${GST_BASE_RDEPENDS} ${GST_DVD_RDEPENDS} gst-plugin-avi"
+ RDEPENDS_append_dm500hd = " ${GST_BASE_RDEPENDS} ${GST_DVD_RDEPENDS} gst-plugin-avi"
+ RDEPENDS_append_dm800se = " ${GST_BASE_RDEPENDS} ${GST_DVD_RDEPENDS} gst-plugin-avi"
++RDEPENDS_append_bm750 = " ${GST_BASE_RDEPENDS} ${GST_DVD_RDEPENDS} gst-plugin-avi"
++RDEPENDS_append_vuplus = " ${GST_BASE_RDEPENDS} ${GST_DVD_RDEPENDS} gst-plugin-avi"
  
  # 'forward depends' - no two providers can have the same PACKAGES_DYNAMIC, however both
  # enigma2 and enigma2-plugins produce enigma2-plugin-*.
@@@ -69,8 -60,7 +61,8 @@@ DESCRIPTION_append_enigma2-plugin-syste
  PN = "enigma2"
  PR = "r0"
  
- SRCDATE = "20100318"
+ SRCDATE = "20100727"
 +SRCDATE_vuplus = "20100719"
  #SRCDATE is NOT used by git to checkout a specific revision
  #but we need it to build a ipk package version
  #when you like to checkout a specific revision of e2 you need

diff --cc recipes/gstreamer/gst-plugins-base_0.10.30.bb
index 0000000,6aeb18f..f945aeb
mode 000000,100644..100644
--- /dev/null
--- 2/recipes/gstreamer/gst-plugins-base_0.10.30.bb
+++ b/recipes/gstreamer/gst-plugins-base_0.10.30.bb
@@@ -1,0 -1,15 +1,18 @@@
 -DEPENDS += "${@base_contains('DISTRO', 'opendreambox', 'alsa-lib', 'cdparanoia pango libtheora alsa-lib libsm virtual/libx11 freetype gnome-vfs libxv', d)}"
+ require gst-plugins.inc
+ 
+ SRC_URI_append_opendreambox = " file://samihack.patch;patch=1"
++SRC_URI_append_vuplus = " file://samihack.patch;patch=1"
+ 
+ PR = "${INC_PR}.0"
+ 
+ PROVIDES += "gst-plugins"
+ 
+ # gst-plugins-base only builds the alsa plugin
+ # 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', '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"
+ 

diff --cc recipes/gstreamer/gst-plugins.inc
index e205462,9ed29b3..5df9e48
mode 100755,100644..100755
--- 1/recipes/gstreamer/gst-plugins.inc
--- 2/recipes/gstreamer/gst-plugins.inc
+++ b/recipes/gstreamer/gst-plugins.inc
@@@ -3,9 -3,8 +3,9 @@@ 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 libsoup-2.4 flac libmatroska libcdio libid3tag', '', d)}"
 +DEPENDS += "${@base_conditional('DISTRO', 'vuplus', 'libmad libsoup-2.4 flac libmatroska libcdio libid3tag', '', d)}"
  
- INC_PR = "r8"
+ INC_PR = "r9"
  
  PACKAGES_DYNAMIC = "gst-plugin-*"