Merge branch 'master' of http://192.168.102.71/openvuplus

[vuplus_openvuplus_3.0] / meta-openvuplus / recipes-vuplus / tasks / task-vuplus-enigma2.inc

diff --git a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc
index e66d192..ad0eb50 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc
+++ b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc
@@ -2,7 +2,7 @@ SUMMARY = "Enigma2 Task for Vuplus"
 SECTION = "vuplus/base"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-INC_PR = "r1"
+INC_PR = "r3"
 
 inherit task
 
@@ -24,14 +24,10 @@ RDEPENDS_${PN} += " \
        enigma2-plugin-systemplugins-zappingmodeselection \
        enigma2-plugin-extensions-addstreamurl \
        enigma2-plugin-extensions-remotestreamconvert \
+       vuplus-blindscan-utils \
+       enigma2-plugin-systemplugins-devicemanager \
 "
 
-# vuplus-blindscan-utils \
-# enigma2-plugin-systemplugins-3gmodemmanager \
-# enigma2-plugin-extensions-streamtv \
-# enigma2-plugin-extensions-dlnaserver \
-# enigma2-plugin-extensions-dlnabrowser \
-
 RDEPENDS_${PN} += " \
   aio-grab \
   python-crypt \
@@ -42,6 +38,7 @@ RDEPENDS_${PN} += " \
   ${@base_contains("MACHINE_FEATURES", "wifi", "task-vuplus-wlan", "", d)} \
   enigma2-plugin-extensions-mediaplayer \
   enigma2-plugin-extensions-pictureplayer \
+  enigma2-plugin-extensions-vuplusevent \
   enigma2-plugin-systemplugins-skinselector \
   enigma2-plugin-systemplugins-ui3dsetup \
   enigma2-plugin-systemplugins-uipositionsetup \
@@ -55,7 +52,10 @@ RDEPENDS_${PN} += " \
   ${@base_contains("VUPLUS_FEATURES", "blindscan", "enigma2-plugin-systemplugins-blindscan", "", 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-systemplugins-hbbtv", "", 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)} \
 "
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"