Merge remote-tracking branch 'OE-2.1/master' into vuplus-3.0

Conflicts:
	meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb

diff --cc meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
index b364ec6,d6ff47f..c35ccc7
--- 1/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
--- 2/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
@@@ -88,14 -89,17 +88,14 @@@ RDEPENDS_enigma2-plugin-systemplugins-b
  RDEPENDS_enigma2-plugin-systemplugins-backupsuiteusb = "enigma2-plugin-extensions-backupsuitehdd"
  
  PN = "enigma2"
- PR = "r80"
+ PR = "r82"
  
 -SRCDATE = "20121128"
 -#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
 -#have to specify a commit id or a tag name in SRCREV
 +inherit gitpkgv pythonnative
  
  ####################################################
 +PV = "experimental-gitr${SRCPV}"
 +PKGV = "experimental-gitr${GITPKGV}"
  BRANCH = "vuplus_experimental"
 -PV = "experimental-git${SRCDATE}"
  SRCREV = ""
  ####################################################
  

diff --cc meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.2.bb
index 42766a5,286bf22..54a9610
--- 1/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.2.bb
--- 2/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.2.bb
+++ b/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.2.bb
@@@ -3,9 -3,9 +3,9 @@@ PRIORITY = "required
  LICENSE = "CLOSED"
  
  DEPENDS = "mpfr gmp"
 -RDEPENDS = "sysfsutils vuplus-dvb-modules"
 +RDEPENDS_${PN} = "sysfsutils vuplus-dvb-modules"
  
- SRC_DATE = "20140721_0"
+ SRC_DATE = "20140725_0"
  
  PR = "r1_${SRC_DATE}"
  SRC_URI = ""

diff --cc meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb
index e0b9538,0000000..20caccc
mode 100644,000000..100644
--- 1/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb
--- /dev/null
+++ b/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb
@@@ -1,73 -1,0 +1,73 @@@
- PR = "r1"
 +SUMMARY = "Enigma2 set of packages for Vuplus"
 +SECTION = "vuplus/base"
 +LICENSE = "GPLv2"
 +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
++PR = "r2"
 +
 +inherit packagegroup
 +
 +PACKAGE_ARCH = "${MACHINE_ARCH}"
 +
 +RDEPENDS_${PN} += " \
 +  enigma2 \
 +  enigma2-defaultservices \
 +  enigma2-streamproxy \
 +  tuxbox-tuxtxt-32bpp \
 +  showiframe \
 +  enigma2-meta \
 +  enigma2-plugins-meta \
 +  enigma2-skins-meta \
 +  enigma2-plugin-extensions-mediascanner \
 +  enigma2-plugin-systemplugins-crashreport \
 +  enigma2-plugin-extensions-remotestreamconvert \
 +  enigma2-plugin-systemplugins-zappingmodeselection \
 +  enigma2-plugin-extensions-addstreamurl \
 +  enigma2-plugin-systemplugins-devicemanager \
 +  enigma2-plugin-systemplugins-videomode \
 +  enigma2-plugin-systemplugins-netdrive \
 +"
 +
 +RRECOMMENDS_${PN} += " \
 +  glib-networking \
 +  dvbsnoop \
 +"
 +
 +RDEPENDS_${PN} += " \
 +  aio-grab \
 +  python-misc python-shell python-ctypes \
 +  python-crypt \
 +  python-netserver \
 +  python-twisted-core \
 +  python-twisted-protocols \
 +  python-twisted-web \
 +  ${@base_contains("MACHINE_FEATURES", "wifi", "packagegroup-vuplus-wlan", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "webmanual", "vuplus-manual", "", d)} \
 +  enigma2-plugin-extensions-mediaplayer \
 +  enigma2-plugin-extensions-pictureplayer \
 +  enigma2-plugin-systemplugins-skinselector \
 +  enigma2-plugin-systemplugins-ui3dsetup \
 +  enigma2-plugin-systemplugins-uipositionsetup \
 +  enigma2-plugin-systemplugins-hdmicec \
 +  enigma2-plugin-extensions-openwebif \
 +  ${@base_contains("MACHINE_FEATURES", "wifi", "enigma2-plugin-systemplugins-wirelessaccesspoint", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "fan_simple", "enigma2-plugin-systemplugins-fancontrol","", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "fan_manual", "enigma2-plugin-systemplugins-manualfancontrol", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "rc_code", "enigma2-plugin-systemplugins-remotecontrolcode", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "led", "enigma2-plugin-systemplugins-ledbrightnesssetup", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "blindscan", "enigma2-plugin-systemplugins-blindscan  vuplus-blindscan-utils", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "fpgaupgrade", "enigma2-plugin-systemplugins-fpgaupgrade", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "firmwareupgrade", "enigma2-plugin-systemplugins-firmwareupgrade", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "hbbtv", "enigma2-plugin-extensions-hbbtv", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "streamtv", "enigma2-plugin-extensions-streamtv", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "dlna", "enigma2-plugin-extensions-dlnaserver enigma2-plugin-extensions-dlnabrowser", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "3gmodem", "enigma2-plugin-systemplugins-3gmodemmanager", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "autoshutdown", "enigma2-plugin-systemplugins-autoshutdown", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "transcoding", "enigma2-plugin-systemplugins-transcodingsetup enigma2-transtreamproxy", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "wol", "enigma2-plugin-systemplugins-wolsetup", "", d)} \
 +  ${@base_conditional("MACHINE", "vuduo2", "duo2lcd4linux lcd4linuxsupport", "", d)} \
 +  ${@base_conditional("MACHINE", "vuduo2", "vuplus-checkvfd", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "audioeffect", "enigma2-plugin-systemplugins-audioeffect", "", d)} \
 +"
 +
 +PACKAGE_ARCH = "${MACHINE_ARCH}"
 +