X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=blobdiff_plain;f=meta-openvuplus%2Frecipes-vuplus%2Fopera-hbbtv%2Fopera-hbbtv_0.2.bb;h=8bcb3941fb845d9934d76e470185212b74b5e932;hp=93fc0ffc6327cd527e0d8bccb6dd380b69664771;hb=1ce02ae815519d744bd5d850a784163feed1b82a;hpb=62c6cf38a4fc3b98419de1d11e50320c2acfd453

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
index 93fc0ff..8bcb394 100644
--- a/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.2.bb
+++ b/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.2.bb
@@ -1,11 +1,13 @@
 DESCRIPTION = "opera-hbbtv"
 PRIORITY = "required"
 LICENSE = "CLOSED"
+require conf/license/license-close.inc
 
 DEPENDS = "mpfr gmp"
+DEPENDS += "${@base_contains("GST_VERSION", "1.0", "gstreamer1.0", "gstreamer", d)}"
 RDEPENDS_${PN} = "sysfsutils"
 
-SRC_DATE = "20150224_0"
+SRC_DATE = "20150410_1"
 
 PR = "r2_${SRC_DATE}"
 SRC_URI = ""
@@ -32,7 +34,7 @@ libdirectfb_vuplus.so"
 
 S = "${WORKDIR}/opera-hbbtv"
 
-SRC_FILE = "opera-hbbtv_${SRC_DATE}_OE30.tar.gz"
+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 << +
@@ -57,11 +59,13 @@ do_install() {
 	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_install_append() {
+	GST_REQUIRED_VERSION=$(pkg-config --list-all | grep gstreamer-[0-9].* | awk -F "-| " '{print $2}')
+	GST_VERSION=$(pkg-config --modversion "gstreamer-$GST_REQUIRED_VERSION >= $GST_REQUIRED_VERSION")
+	mv ${D}/usr/local/hbb-browser/root/jsplugins/ooif-gst-$GST_VERSION.so ${D}/usr/local/hbb-browser/root/jsplugins/ooif.so
+	rm -f ${D}/usr/local/hbb-browser/root/jsplugins/ooif-gst*.so
+	mv ${D}/usr/local/hbb-browser/root/video/videobackend-gst-$GST_VERSION.so ${D}/usr/local/hbb-browser/root/video/videobackend.so
+	rm -f ${D}/usr/local/hbb-browser/root/video/videobackend-gst*.so
 }
 
 do_package_qa() {
@@ -74,6 +78,6 @@ PACKAGES = "${PN}"
 
 FILES_${PN} = "/"
 
-SRC_URI[md5sum] = "e85fd1a4ccdd93a06a9110ec17c07689"
-SRC_URI[sha256sum] = "e19f43c78b178faed1ce92fa45ca88b868f3c667b97028cb2e59d6a9852b2f1b"
+SRC_URI[md5sum] = "d29ca7a0b7f6c9071300cd8dc66f1278"
+SRC_URI[sha256sum] = "4c08c9e3605eb6f4b7d3c3e49f59291883e89701794e5dec92e4085106182742"