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=1a5be1819434c9228a2739f50390734f02fd87f0;hp=936036e717ac9ff4fd45e458c025d637e2f4ced7;hb=67297e7ad907edcffcf485eee8224bb1231ce475;hpb=956f60e825dfbd7ad5c470692579f4eb96b6f782

diff --git a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc
index 936036e..1a5be18 100644
--- a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc
+++ b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc
@@ -2,43 +2,37 @@ 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 = "r13"
 
 inherit task
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-DEPENDS_${PN} += " \
-	enigma2-plugin-extensions-openwebif \
-	enigma2-plugin-extensions-remotestreamconvert \
-	enigma2-plugin-extensions-addstreamurl \
-"
-
 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-factorytest \
-	enigma2-plugin-systemplugins-crashreport \
-	enigma2-plugin-extensions-remotestreamconvert \
-	enigma2-plugin-systemplugins-zappingmodeselection \
- 	enigma2-plugin-extensions-addstreamurl \
-	enigma2-plugin-extensions-remotestreamconvert \
+  enigma2 \
+  enigma2-defaultservices \
+  enigma2-streamproxy \
+  tuxbox-tuxtxt-32bpp \
+  showiframe \
+  enigma2-meta \
+  enigma2-plugins-meta \
+  enigma2-skins-meta \
+  enigma2-plugin-extensions-mediascanner \
+  enigma2-plugin-systemplugins-factorytest \
+  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 \
 "
 
-# 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-crypt \
   python-netserver \
@@ -46,27 +40,33 @@ RRECOMMENDS_${PN} += " \
   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", "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)} \
-
 PACKAGE_ARCH = "${MACHINE_ARCH}"
+