[hbbtv] upgraded to 'opera-hbbtv_0.2.bb'

sorry about confused for miss of name.
add missing volume control.

4 files changed, 64 insertions, 54 deletions

diff --git a/recipes/enigma2/enigma2.bb b/recipes/enigma2/enigma2.bb
index 28aaa2b..6b28ec2 100644
--- a/recipes/enigma2/enigma2.bb
+++ b/recipes/enigma2/enigma2.bb
@@ -4,7 +4,7 @@ DEPENDS = "jpeg libungif libmad libpng libsigc++-1.2 gettext-native \
 	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 wvdial wvstreams ppp usbmodeswitch usbmodeswitch-data \
-	hostap-daemon bridge-utils mpfr gmp tslib vbrowser util-linux-ng ntfs-3g dosfstools "
+	hostap-daemon bridge-utils mpfr gmp tslib opera-hbbtv util-linux-ng ntfs-3g dosfstools "
 RDEPENDS = "python-codecs python-core python-lang python-re python-threading \
 	python-xml python-fcntl gst-plugin-decodebin gst-plugin-decodebin2 python-stringold \
 	python-pickle gst-plugin-app gst-plugin-fragmented \
@@ -74,13 +74,12 @@ RDEPENDS_enigma2-plugin-extensions-streamtv = "librtmp0 gst-plugin-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"
 RDEPENDS_enigma2-plugin-extensions-hbbtv = "tslib-conf libts-1.0-0 libsysfs2 libgmp3 libmpfr1 opera-hbbtv"
-RDEPENDS_enigma2-plugin-extensions-vbrowser = "libsysfs2 vuplus-dvb-modules vbrowser"
 RDEPENDS_enigma2-plugin-systemplugins-devicemanager = "util-linux-ng-blkid ntfs-3g dosfstools"
 
 RDEPENDS_enigma2-plugin-systemplugins-netdrive = "curlftpfs kernel-module-fuse libfuse2"
 
 PN = "enigma2"
-PR = "r133"
+PR = "r134"
 
 SRCDATE = "20110922"
 SRCREV = "5e19a3f8a5e8ce8a4e2cb2b601a1b8ef3554e4be"
diff --git a/recipes/opera-hbbtv/opera-hbbtv_0.2.bb b/recipes/opera-hbbtv/opera-hbbtv_0.2.bb
new file mode 100644
index 0000000..de96d96
--- /dev/null
+++ b/recipes/opera-hbbtv/opera-hbbtv_0.2.bb
@@ -0,0 +1,56 @@
+DESCRIPTION = "opera-hbbtv"
+LICENSE = "proprietary"
+
+PRIORITY = "required"
+
+SRC_DATE = "20140714_0"
+
+DEPENDS = "jpeg"
+RDEPENS = "sysfsutils vuplus-dvb-modules"
+
+PR = "r1_${SRC_DATE}"
+SRC_URI = ""
+
+INHIBIT_PACKAGE_STRIP = "1"
+S = "${WORKDIR}/opera-hbbtv"
+
+SRC_FILE = "opera-hbbtv_${SRC_DATE}.tar.gz"
+do_fetch() {
+	if [ ! -e ${DL_DIR}/${SRC_FILE} -a -e /etc/vuplus_browser.pwd ]; then
+sshpass -f /etc/vuplus_browser.pwd sftp -o StrictHostKeyChecking=no guestuser@code.vuplus.com << +
+get ${SRC_FILE}
+bye
++
+	fi
+	cp -av ${DL_DIR}/${SRC_FILE} ${WORKDIR}/
+}
+
+do_unpack() {
+	tar xvfz ${SRC_FILE}
+}
+
+do_compile() {
+}
+
+do_install() {
+	install -d ${D}/usr/local/hbb-browser
+	mv ${S}/opera/* ${D}/usr/local/hbb-browser/
+	install -d ${D}/usr/lib
+	mv ${S}/dfb/usr/lib/* ${D}/usr/lib/
+}
+
+package_do_shlibs_append() {
+        deps_path = d.getVar('PKGDEST', True)
+        deps = deps_path + "/opera-hbbtv.shlibdeps"
+        tmp = "/tmp/.opera-hbbtv.shlibdeps"
+        os.system("sed -e '/vbrowser/d' %s > %s" % (deps, tmp))
+        os.system("cp %s %s" % (tmp, deps))
+}
+
+do_package_qa() {
+}
+
+PACKAGES = ${PN}
+
+FILES_${PN} = "/"
+
diff --git a/recipes/tasks/task-vuplus-enigma2.bb b/recipes/tasks/task-vuplus-enigma2.bb
index c8b0bf8..ed3b7e6 100644
--- a/recipes/tasks/task-vuplus-enigma2.bb
+++ b/recipes/tasks/task-vuplus-enigma2.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Vuplus: E2 Task for the Vuplus Distribution"
 SECTION = "vuplus/base"
 LICENSE = "MIT"
-PR = "r36"
+PR = "r37"
 
 inherit task
 
@@ -66,13 +66,13 @@ RDEPENDS_task-vuplus-enigma2_append_vusolo = "\
 
 RDEPENDS_task-vuplus-enigma2_append_bm750 = "\
   enigma2-plugin-systemplugins-fancontrol \
-  enigma2-plugin-extensions-vbrowser \
+  enigma2-plugin-extensions-hbbtv \
   enigma2-plugin-systemplugins-audioeffect \
 "
 RDEPENDS_task-vuplus-enigma2_append_vuduo2 = "\
   enigma2-plugin-systemplugins-remotecontrolcode \
   enigma2-plugin-systemplugins-hdmicec \
-  enigma2-plugin-extensions-vbrowser \
+  enigma2-plugin-extensions-hbbtv \
   duo2lcd4linux \
   lcd4linuxsupport \
   vuplus-blindscan-utils \
@@ -90,7 +90,7 @@ RDEPENDS_task-vuplus-enigma2_append_vuduo2 = "\
 RDEPENDS_task-vuplus-enigma2_append_vusolo2 = "\
   enigma2-plugin-systemplugins-remotecontrolcode \
   enigma2-plugin-systemplugins-hdmicec \
-  enigma2-plugin-extensions-vbrowser \
+  enigma2-plugin-extensions-hbbtv \
   enigma2-plugin-systemplugins-firmwareupgrade \
   enigma2-plugin-systemplugins-manualfancontrol \
   enigma2-plugin-systemplugins-autoshutdown \
@@ -107,7 +107,7 @@ RDEPENDS_task-vuplus-enigma2_append_vuuno = "\
   enigma2-plugin-systemplugins-blindscan \
   enigma2-plugin-systemplugins-manualfancontrol \
   enigma2-plugin-systemplugins-remotecontrolcode \
-  enigma2-plugin-extensions-vbrowser \
+  enigma2-plugin-extensions-hbbtv \
 "
 RDEPENDS_task-vuplus-enigma2_append_vuultimo = "\
   vuplus-blindscan-utils \
@@ -116,7 +116,7 @@ RDEPENDS_task-vuplus-enigma2_append_vuultimo = "\
   enigma2-plugin-systemplugins-manualfancontrol \
   enigma2-plugin-systemplugins-remotecontrolcode \
   enigma2-plugin-systemplugins-ledbrightnesssetup \
-  enigma2-plugin-extensions-vbrowser \
+  enigma2-plugin-extensions-hbbtv \
 "
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes/vbrowser/vbrowser_0.1.bb b/recipes/vbrowser/vbrowser_0.1.bb
deleted file mode 100644
index a405112..0000000
--- a/recipes/vbrowser/vbrowser_0.1.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-DESCRIPTION = "vbrowser"
-LICENSE = "proprietary"
-
-PRIORITY = "required"
-
-SRC_DATE = "20140711_0"
-
-RDEPENS = "sysfsutils vuplus-dvb-modules"
-
-PR = "r1_${SRC_DATE}"
-SRC_URI = ""
-
-INHIBIT_PACKAGE_STRIP = "1"
-S = "${WORKDIR}/vbrowser"
-
-SRC_FILE = "vbrowser_${SRC_DATE}.tar.gz"
-do_fetch() {
-	if [ ! -e ${DL_DIR}/${SRC_FILE} -a -e /etc/vuplus_browser.pwd ]; then
-sshpass -f /etc/vuplus_browser.pwd sftp -o StrictHostKeyChecking=no guestuser@code.vuplus.com << +
-get ${SRC_FILE}
-bye
-+
-	fi
-	cp -av ${DL_DIR}/${SRC_FILE} ${WORKDIR}/
-}
-
-do_unpack() {
-	tar xvfz ${SRC_FILE}
-}
-
-do_compile() {
-}
-
-do_install() {
-	install -d ${D}/usr/local/vbrowser
-	mv ${S}/* ${D}/usr/local/vbrowser/
-}
-
-do_package_qa() {
-}
-
-PACKAGES = ${PN}
-
-FILES_${PN} = "/"
-