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

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

diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
index 594d95e..2461ab4 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
@@ -74,9 +74,8 @@ DEPENDS += "djmount minidlna"
 RDEPENDS_enigma2-plugin-extensions-dlnaserver = "minidlna "
 RDEPENDS_enigma2-plugin-extensions-dlnabrowser = "djmount kernel-module-fuse fuse-utils"
 
-DEPENDS += "vbrowser"
+DEPENDS += "opera-hbbtv"
 RDEPENDS_enigma2-plugin-extensions-hbbtv = "opera-hbbtv"
-RDEPENDS_enigma2-plugin-extensions-vbrowser = "vbrowser"
 
 DEPENDS += "wvdial wvstreams ppp usb-modeswitch usb-modeswitch-data"
 RDEPENDS_enigma2-plugin-systemplugins-3gmodemmanager = "ppp usb-modeswitch usb-modeswitch-data wvdial wvstreams \
@@ -90,7 +89,7 @@ RDEPENDS_enigma2-plugin-systemplugins-backupsuitehdd = "mtd-utils-mkfs.ubifs mtd
 RDEPENDS_enigma2-plugin-systemplugins-backupsuiteusb = "enigma2-plugin-extensions-backupsuitehdd"
 
 PN = "enigma2"
-PR = "r74"
+PR = "r75"
 
 SRCDATE = "20121128"
 #SRCDATE is NOT used by git to checkout a specific revision

diff --git a/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.2.bb b/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.2.bb
new file mode 100644 (file)
index 0000000..9bbb8a8
--- /dev/null
+++ b/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.2.bb
@@ -0,0 +1,76 @@
+DESCRIPTION = "opera-hbbtv"
+PRIORITY = "required"
+LICENSE = "CLOSED"
+
+DEPENDS = "mpfr gmp"
+RDEPENDS = "sysfsutils vuplus-dvb-modules"
+
+SRC_DATE = "20140714_0"
+
+PR = "r1_${SRC_DATE}"
+SRC_URI = ""
+
+INHIBIT_PACKAGE_STRIP = "1"
+PRIVATE_LIBS_${PN} = "libopera_hbbtv.so \
+libdsmcc.so \
+libdirect-1.4.so.6 \
+libdirectfb-1.4.so.6 \
+libfusion-1.4.so.6 \
+libdirectfbwm_default.so \
+libdirectfb_linux_input.so \
+libdirectfb_devmem.so \
+libdirectfb_dummy.so \
+libdirectfb_fbdev.so \
+libidirectfbfont_dgiff.so \
+libidirectfbvideoprovider_v4l.so \
+libidirectfbvideoprovider_gif.so \
+libidirectfbimageprovider_dfiff.so \
+libidirectfbimageprovider_gif.so \
+libidirectfbimageprovider_jpeg.so \
+libicoreresourcemanager_test.so \
+libdirectfb_vuplus.so"
+
+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 = "${PKGDEST}/${PN}.shlibdeps"
+       tmp = "/tmp/.${PN}.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} = "/"
+
+SRC_URI[md5sum] = "3f28e2f90b2e596c2d5137baeb1d7444"
+SRC_URI[sha256sum] = "5514aefb8a753d8ee9da6bc35ff7d7df8b74edbafcbc0fbd1b177b587a202ba8"
+

diff --git a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc
index 328d838..efc1208 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc
+++ b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc
@@ -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 = "r18"
+INC_PR = "r19"
 
 inherit task
 
@@ -56,7 +56,7 @@ RDEPENDS_${PN} += " \
   ${@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-vbrowser", "", 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)} \

diff --git a/meta-openvuplus/recipes-vuplus/vbrowser/vbrowser_0.1.bb b/meta-openvuplus/recipes-vuplus/vbrowser/vbrowser_0.1.bb
deleted file mode 100644 (file)
index f4a0410..0000000
--- a/meta-openvuplus/recipes-vuplus/vbrowser/vbrowser_0.1.bb
+++ /dev/null
@@ -1,66 +0,0 @@
-DESCRIPTION = "vbrowser"
-PRIORITY = "required"
-LICENSE = "CLOSED"
-
-RDEPENDS = "sysfsutils vuplus-dvb-modules"
-
-SRC_DATE = "20140711_0"
-
-PR = "r1_${SRC_DATE}"
-SRC_URI = ""
-
-INHIBIT_PACKAGE_STRIP = "1"
-PRIVATE_LIBS_${PN} = "libopera_hbbtv.so \
-libdsmcc.so \
-libdirect-1.4.so.6 \
-libdirectfb-1.4.so.6 \
-libfusion-1.4.so.6 \
-libdirectfbwm_default.so \
-libdirectfb_linux_input.so \
-libdirectfb_devmem.so \
-libdirectfb_dummy.so \
-libdirectfb_fbdev.so \
-libidirectfbfont_dgiff.so \
-libidirectfbvideoprovider_v4l.so \
-libidirectfbvideoprovider_gif.so \
-libidirectfbimageprovider_dfiff.so \
-libidirectfbimageprovider_gif.so \
-libidirectfbimageprovider_jpeg.so \
-libicoreresourcemanager_test.so \
-libdirectfb_vuplus.so"
-
-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} = "/"
-
-SRC_URI[md5sum] = "4bfb6efd0eb24ed78c12d9b62064a657"
-SRC_URI[sha256sum] = "a23e65491089df3e77b8d63b6a023a6a6bc7e82d03d58f36f1a07b6ca8f60379"
-