X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus;a=blobdiff_plain;f=meta-openvuplus%2Frecipes-vuplus%2Ftasks%2Ftask-vuplus-enigma2.inc;h=1319783480f29d231ff31ff28b88efb98238f8c9;hp=df4a9a852b85220fcab35efc22a586411e96dee0;hb=853bf8dbb70cda94cba711aecef366fb6eaceeb5;hpb=0e6c5d97c12ae5eb100dc835a2ec6df30c9ebb95

diff --git a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc
index df4a9a8..1319783 100644
--- a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc
+++ b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc
@@ -2,16 +2,12 @@ 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 = "r0"
+INC_PR = "r15"
 
 inherit task
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-#DEPENDS_${PN} += " \
-#	enigma2-plugin-extensions-openwebif \
-#"
-
 RDEPENDS_${PN} += " \
   enigma2 \
   enigma2-defaultservices \
@@ -27,59 +23,52 @@ RDEPENDS_${PN} += " \
   enigma2-plugin-extensions-remotestreamconvert \
   enigma2-plugin-systemplugins-zappingmodeselection \
   enigma2-plugin-extensions-addstreamurl \
+  enigma2-plugin-systemplugins-devicemanager \
+  enigma2-plugin-systemplugins-videomode \
+  enigma2-plugin-systemplugins-netdrive \
 "
 
-# vuplus-blindscan-utils \
-# enigma2-plugin-systemplugins-3gmodemmanager \
-# enigma2-plugin-extensions-streamtv \
-# enigma2-plugin-extensions-dlnaserver \
-# enigma2-plugin-extensions-dlnabrowser \
-
 RRECOMMENDS_${PN} += " \
+  glib-networking \
+"
+
+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", "task-vuplus-wlan", "", d)} \
+  ${@base_contains("VUPLUS_FEATURES", "webmanual", "vuplus-manual", "", 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 \
   enigma2-plugin-systemplugins-hdmicec \
-"
-#  ${@base_contains("MACHINE_FEATURES", "wifi", "enigma2-plugin-systemplugins-wirelessaccesspoint", "", d)} \
-#"
-
-RDEPENDS_${PN} += " \
+  ${@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", "webif", "enigma2-plugin-extensions-openwebif", "", 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)} \
 "
 
-#RDEPENDS_task-vuplus-enigma2_append_bm750 = "\
-#  enigma2-plugin-systemplugins-fancontrol \
-#"
-# vuplus-webbrowser-utils enigma2-plugin-extensions-webbrowser
-
-#RDEPENDS_task-vuplus-enigma2_append_vuuno = "\
-#  enigma2-plugin-systemplugins-fpgaupgrade \
-#  enigma2-plugin-systemplugins-blindscan \
-#  enigma2-plugin-systemplugins-manualfancontrol \
-#  enigma2-plugin-systemplugins-remotecontrolcode \
-#"
-# vuplus-webbrowser-utils enigma2-plugin-extensions-webbrowser
-
-#RDEPENDS_task-vuplus-enigma2_append_vuultimo = "\
-#  enigma2-plugin-systemplugins-firmwareupgrade \
-#  enigma2-plugin-systemplugins-blindscan \
-#  enigma2-plugin-systemplugins-manualfancontrol \
-#  enigma2-plugin-systemplugins-remotecontrolcode \
-#  enigma2-plugin-systemplugins-ledbrightnesssetup \
-#"
-# vuplus-webbrowser-utils enigma2-plugin-extensions-webbrowser
-
 PACKAGE_ARCH = "${MACHINE_ARCH}"
+