From: kos <kos@dev3>
Date: Tue, 11 Dec 2012 05:33:09 +0000 (+0900)
Subject: Merge branch 'master' of http://192.168.102.71/openvuplus
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=commitdiff_plain;h=462d73d2987416bb23b756e4379a1c830e925604

Merge branch 'master' of 192.168.102.71/openvuplus

Conflicts:
	meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
	meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc
---

462d73d2987416bb23b756e4379a1c830e925604
diff --cc meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
index bd6d959,cd8c8fa..8fadfd6
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
@@@ -6,11 -6,11 +6,9 @@@ DEPENDS = "jpeg libungif libmad libpng 
  	dreambox-dvbincludes freetype libdvbsi++ python swig-native \
  	libfribidi libxmlccwrap libdreamdvd gstreamer gst-plugin-dvbmediasink \
  	gst-plugins-bad gst-plugins-good gst-plugins-ugly python-wifi \
- 	hostap-daemon bridge-utils \
+ 	hostap-daemon bridge-utils ntfs-3g dosfstools \
  "
  
--# DEPENDS += "wvdial wvstreams ppp usbmodeswitch usbmodeswitch-data djmount minidlna"
--
  RDEPENDS_GST= "gst-plugins-base-decodebin gst-plugins-base-decodebin2 gst-plugins-base-app gst-plugins-bad-fragmented \
  		gst-plugins-good-id3demux gst-plugins-ugly-mad gst-plugins-base-ogg gst-plugins-base-playbin \
          	gst-plugins-base-typefindfunctions gst-plugins-base-audioconvert gst-plugins-base-audioresample \
@@@ -67,22 -67,15 +65,24 @@@ SUMMARY_enigma2-plugin-systemplugins-ne
  RDEPENDS_enigma2-plugin-extensions-webbrowser = "python-gdata libqtwebkite4 vuplus-webbrowser-utils qt4-embedded-fonts qt4-embedded-plugin-imageformat-gif qt4-embedded-plugin-imageformat-ico qt4-embedded-plugin-imageformat-jpeg qt4-embedded-plugin-imageformat-mng qt4-embedded-plugin-imageformat-svg qt4-embedded-plugin-imageformat-tiff qt4-embedded-plugin-iconengine-svgicon "
  SUMMARY_enigma2-plugin-systemplugins-crashreport = "automatically send crashlogs to Vu+"
  RDEPENDS_enigma2-plugin-systemplugins-crashreport = "python-twisted-mail python-twisted-names python-compression python-mime python-email"
 -RDEPENDS_enigma2-plugin-systemplugins-3gmodemmanager = "ppp usbmodeswitch usbmodeswitch-data wvdial wvstreams libwvutils4.6 libwvstreams-extras libuniconf4.6"
  RDEPENDS_enigma2-plugin-systemplugins-wirelessaccesspoint = "hostap-daemon bridge-utils"
 +
  RDEPENDS_enigma2-plugin-extensions-streamtv = "librtmp0 gst-plugins-bad-rtmp "
 -RDEPENDS_enigma2-plugin-extensions-dlnabrowser = "djmount fuse-utils libfuse2 libupnp3 kernel-module-fuse "
 -RDEPENDS_enigma2-plugin-extensions-dlnaserver = "minidlna libexif12 libavformat52 libavutil50 libavcodec52 libgsm1 libmp3lame0 libschroedinger-1.0-0 libtheora0 liboil"
 +
 +DEPENDS += "djmount minidlna"
 +RDEPENDS_enigma2-plugin-extensions-dlnaserver = "minidlna "
 +RDEPENDS_enigma2-plugin-extensions-dlnabrowser = "djmount kernel-module-fuse fuse-utils"
 +
 +DEPENDS += "opera-hbbtv"
 +RDEPENDS_enigma2-plugin-extensions-hbbtv = "opera-hbbtv"
 +
 +DEPENDS += "wvdial wvstreams ppp usb-modeswitch usb-modeswitch-data"
 +RDEPENDS_enigma2-plugin-systemplugins-3gmodemmanager = "ppp usb-modeswitch usb-modeswitch-data wvdial wvstreams kernel-module-usbserial"
 +
+ RDEPENDS_enigma2-plugin-systemplugins-devicemanager = "util-linux-blkid ntfs-3g dosfstools"
+ 
  PN = "enigma2"
- PR = "r40"
 -PR = "r42"
++PR = "r43"
  
  SRCDATE = "20121128"
  #SRCDATE is NOT used by git to checkout a specific revision
diff --cc meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc
index d93ba90,bd40509..ad0eb50
--- a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc
+++ b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc
@@@ -2,7 -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 = "r2"
++INC_PR = "r3"
  
  inherit task
  
@@@ -23,10 -23,15 +23,11 @@@ RDEPENDS_${PN} += " 
  	enigma2-plugin-extensions-remotestreamconvert \
  	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 \