Merge branch 'master' of code.vuplus.com:/opt/repository/openvuplus

Conflicts:
	meta-bsp/vuduo2/conf/machine/vuduo2.conf
	meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc

diff --git a/meta-bsp/vuduo2/conf/machine/vuduo2.conf b/meta-bsp/vuduo2/conf/machine/vuduo2.conf
index 8519ce0..d657abe 100644 (file)
--- a/meta-bsp/vuduo2/conf/machine/vuduo2.conf
+++ b/meta-bsp/vuduo2/conf/machine/vuduo2.conf
@@ -13,6 +13,7 @@ MACHINE_FEATURES += "streamtv"
 MACHINE_FEATURES += "dlna"
 MACHINE_FEATURES += "3gmodem"
 MACHINE_FEATURES += "webif"
+MACHINE_FEATURES += "autoshutdown"
 MACHINE_FEATURES += "transcoding"
 
 IMAGE_UNPACK_PATH = "vuplus/duo2"

diff --git a/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.1.bb b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.1.bb
index 5c61468..bc99eae 100644 (file)
--- a/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.1.bb
+++ b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.1.bb
@@ -6,11 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
                     file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \
                     file://gst/tta/crc32.h;beginline=12;endline=29;md5=71a904d99ce7ae0c1cf129891b98145c"
 
-DEPENDS += "libmusicbrainz tremor curl libmms"
+DEPENDS += "libmusicbrainz tremor curl libmms librtmp"
 DEPENDS += "gst-plugins-base"
 CONFLICTS = "librsvg"
 
-PR = "r0"
+PR = "r1"
 GIT_PV = ""
 
 SRCREV = "852d247947a21d472d7766f51148b5ea7b12ef12"

diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
index 4fe9248..364f033 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
@@ -77,7 +77,10 @@ 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-3gmodemmanager = "ppp usb-modeswitch usb-modeswitch-data wvdial wvstreamsa \
+       kernel-module-ppp-async kernel-module-ppp-deflate kernel-module-ppp-synctty kernel-module-ppp-generic kernel-module-usbserial \
+"
+
 
 RDEPENDS_enigma2-plugin-systemplugins-devicemanager = "util-linux-blkid ntfs-3g dosfstools"
 

diff --git a/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.1.bb b/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.1.bb
index ad7f42e..0d3fe73 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.1.bb
+++ b/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.1.bb
@@ -5,7 +5,7 @@ LICENSE = "CLOSED"
 DEPENDS = "tslib mpfr gmp"
 RDEPENS = "tslib-conf libts-1.0-0 libsysfs2 libgmp3 libmpfr1"
 
-SRC_DATE = "20121128_1"
+SRC_DATE = "20130122_1"
 
 PR = "r1_${SRC_DATE}"
 SRC_URI = "http://code.vuplus.com/download/build.fc3abf29fb03f797e78f907928125638/embedded/opera-sdk-build-package/opera-hbbtv_${SRC_DATE}.tar.gz"
@@ -33,5 +33,5 @@ PACKAGES = "${PN}"
 
 FILES_${PN} = "/"
 
-SRC_URI[md5sum] = "e534839ac1aedaf2bcdf0e5c277e631c"
-SRC_URI[sha256sum] = "9738b06ed35632a675de0cf95bd123d7f9759927a96910c28294ee723fead181"
+SRC_URI[md5sum] = "ae2d63b91728367210547a2aa8612daf"
+SRC_URI[sha256sum] = "39230e0f70337ed4c02077b0bb8f0c1c7adc9ed756e41141ca4a3971c9453d81"

diff --git a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc
index adea4b4..30d14fb 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc
+++ b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc
@@ -23,7 +23,6 @@ RDEPENDS_${PN} += " \
        enigma2-plugin-extensions-remotestreamconvert \
        enigma2-plugin-systemplugins-zappingmodeselection \
        enigma2-plugin-extensions-addstreamurl \
-       vuplus-blindscan-utils \
        enigma2-plugin-systemplugins-devicemanager \
 "
 
@@ -49,7 +48,7 @@ RDEPENDS_${PN} += " \
   ${@base_contains("MACHINE_FEATURES", "rc_code", "enigma2-plugin-systemplugins-remotecontrolcode", "", d)} \
   ${@base_contains("MACHINE_FEATURES", "led", "enigma2-plugin-systemplugins-ledbrightnesssetup", "", d)} \
   ${@base_contains("MACHINE_FEATURES", "webif", "enigma2-plugin-extensions-openwebif", "", d)} \
-  ${@base_contains("MACHINE_FEATURES", "blindscan", "enigma2-plugin-systemplugins-blindscan", "", d)} \
+  ${@base_contains("MACHINE_FEATURES", "blindscan", "enigma2-plugin-systemplugins-blindscan  vuplus-blindscan-utils", "", d)} \
   ${@base_contains("MACHINE_FEATURES", "fpgaupgrade", "enigma2-plugin-systemplugins-fpgaupgrade", "", d)} \
   ${@base_contains("MACHINE_FEATURES", "firmwareupgrade", "enigma2-plugin-systemplugins-firmwareupgrade", "", d)} \
   ${@base_contains("MACHINE_FEATURES", "hbbtv", "enigma2-plugin-extensions-hbbtv", "", d)} \

diff --git a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-essential.bb b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-essential.bb
index 8972e43..78e5542 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-essential.bb
+++ b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-essential.bb
@@ -7,10 +7,9 @@ RDEPENDS_${PN} = '${ESSENTIAL_RDEPENDS}'
 
 RRECOMMENDS_${PN} = '${ESSENTIAL_RRECOMMENDS}'
 
-#RDEPENDS_${PN} += '${KERNEL_3G_MODULES}'
 RDEPENDS_${PN} += '${KERNEL_DVB_MODULES}'
 
-PR = "r0"
+PR = "r1"
 
 inherit task
 
@@ -34,15 +33,6 @@ ESSENTIAL_RRECOMMENDS = " \
        kernel-module-ext2 \
 "
 
-KERNEL_3G_MODULES = " \
-        kernel-module-ppp-async \
-        kernel-module-ppp-deflate \
-        kernel-module-ppp-synctty \
-        kernel-module-ppp-generic \
-        kernel-module-slhc \
-        kernel-module-usbserial \
-"
-
 KERNEL_DVB_MODULES = " \
         kernel-module-em28xx-dvb \
         kernel-module-dvb-usb-a800 \