From 481c21b89cc8ad494cfa6d146d858fb28ae0f461 Mon Sep 17 00:00:00 2001 From: hschang Date: Wed, 15 Nov 2017 16:15:32 +0900 Subject: [openwebif] Fix box and remote display. --- .../enigma2-plugin-extensions-openwebif.bb | 28 +++++-- .../e2openplugins/files/box_solo4k.png | Bin 0 -> 12313 bytes .../e2openplugins/files/box_ultimo4k.png | Bin 0 -> 7696 bytes .../e2openplugins/files/box_uno4k.png | Bin 0 -> 11229 bytes .../e2openplugins/files/box_uno4kse.png | Bin 0 -> 39913 bytes .../files/openwebif_vu_box_remote.patch | 81 +++++++++++++++++++++ .../e2openplugins/files/rc_brown.png | Bin 0 -> 86119 bytes 7 files changed, 103 insertions(+), 6 deletions(-) create mode 100644 meta-openvuplus/recipes-vuplus/e2openplugins/files/box_solo4k.png create mode 100644 meta-openvuplus/recipes-vuplus/e2openplugins/files/box_ultimo4k.png create mode 100644 meta-openvuplus/recipes-vuplus/e2openplugins/files/box_uno4k.png create mode 100644 meta-openvuplus/recipes-vuplus/e2openplugins/files/box_uno4kse.png create mode 100644 meta-openvuplus/recipes-vuplus/e2openplugins/files/openwebif_vu_box_remote.patch create mode 100644 meta-openvuplus/recipes-vuplus/e2openplugins/files/rc_brown.png diff --git a/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb b/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb index 82784f1..f3d3eb7 100644 --- a/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb +++ b/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb @@ -12,12 +12,20 @@ SRCREV_pn-${PN}="d84307958746e6a597b43defe5bd1cb78fd745c8" inherit gitpkgv PV = "1+git${SRCPV}" PKGV = "1+git${GITPKGV}" -PR = "r5" +PR = "r6" require openplugins-distutils.inc -SRC_URI += " file://openwebif_support_vumodels.patch" -SRC_URI += " file://openwebif_block_in_qpip.patch" +SRC_URI = "git://github.com/E2OpenPlugins/e2openplugin-${MODULE}.git;protocol=git \ + file://openwebif_support_vumodels.patch \ + file://openwebif_block_in_qpip.patch \ + file://openwebif_vu_box_remote.patch \ + file://rc_brown.png \ + file://box_solo4k.png \ + file://box_uno4k.png \ + file://box_ultimo4k.png \ + file://box_uno4kse.png \ +" # Just a quick hack to "compile" it do_compile() { @@ -29,6 +37,11 @@ PLUGINPATH = "/usr/lib/enigma2/python/Plugins/Extensions/${MODULE}" do_install_append() { install -d ${D}${PLUGINPATH} cp -rp ${S}/plugin/* ${D}${PLUGINPATH} + install -m 0755 ${WORKDIR}/rc_brown.png ${D}${PLUGINPATH}/public/images/remotes/vu_brown.png + install -m 0755 ${WORKDIR}/box_solo4k.png ${D}${PLUGINPATH}/public/images/boxes/solo4k.png + install -m 0755 ${WORKDIR}/box_uno4k.png ${D}${PLUGINPATH}/public/images/boxes/uno4k.png + install -m 0755 ${WORKDIR}/box_ultimo4k.png ${D}${PLUGINPATH}/public/images/boxes/ultimo4k.png + install -m 0755 ${WORKDIR}/box_uno4kse.png ${D}${PLUGINPATH}/public/images/boxes/uno4kse.png } python do_package_prepend () { @@ -41,9 +54,10 @@ python do_package_prepend () { ('vuzero', 'zero.jpg', 'vu_normal.png'), ('vuultimo', 'ultimo.jpg', 'vu_ultimo.png'), ('vuuno', 'uno.jpg', 'vu_normal.png'), - ('vuultimo4k', 'unknown.jpg', 'vu_normal.png'), - ('vuuno4k', 'unknown.jpg', 'vu_normal.png'), - ('vuuno4kse', 'unknown.jpg', 'vu_normal.png'), + ('vusolo4k', 'solo4k.png', 'vu_normal.png'), + ('vuuno4k', 'uno4k.png', 'vu_normal.png'), + ('vuultimo4k', 'ultimo4k.png', 'vu_normal.png'), + ('vuuno4kse', 'uno4kse.png', 'vu_brown.png'), ] import os top = '${D}${PLUGINPATH}/public/images/' @@ -68,3 +82,5 @@ FILES_${PN} = "${PLUGINPATH}" do_populate_sysroot[noexec] = "1" +PACKAGE_ARCH = "${MACHINE_ARCH}" + diff --git a/meta-openvuplus/recipes-vuplus/e2openplugins/files/box_solo4k.png b/meta-openvuplus/recipes-vuplus/e2openplugins/files/box_solo4k.png new file mode 100644 index 0000000..3a25533 Binary files /dev/null and b/meta-openvuplus/recipes-vuplus/e2openplugins/files/box_solo4k.png differ diff --git a/meta-openvuplus/recipes-vuplus/e2openplugins/files/box_ultimo4k.png b/meta-openvuplus/recipes-vuplus/e2openplugins/files/box_ultimo4k.png new file mode 100644 index 0000000..4a62bed Binary files /dev/null and b/meta-openvuplus/recipes-vuplus/e2openplugins/files/box_ultimo4k.png differ diff --git a/meta-openvuplus/recipes-vuplus/e2openplugins/files/box_uno4k.png b/meta-openvuplus/recipes-vuplus/e2openplugins/files/box_uno4k.png new file mode 100644 index 0000000..9dc59d0 Binary files /dev/null and b/meta-openvuplus/recipes-vuplus/e2openplugins/files/box_uno4k.png differ diff --git a/meta-openvuplus/recipes-vuplus/e2openplugins/files/box_uno4kse.png b/meta-openvuplus/recipes-vuplus/e2openplugins/files/box_uno4kse.png new file mode 100644 index 0000000..0e54f76 Binary files /dev/null and b/meta-openvuplus/recipes-vuplus/e2openplugins/files/box_uno4kse.png differ diff --git a/meta-openvuplus/recipes-vuplus/e2openplugins/files/openwebif_vu_box_remote.patch b/meta-openvuplus/recipes-vuplus/e2openplugins/files/openwebif_vu_box_remote.patch new file mode 100644 index 0000000..270d8d5 --- /dev/null +++ b/meta-openvuplus/recipes-vuplus/e2openplugins/files/openwebif_vu_box_remote.patch @@ -0,0 +1,81 @@ +diff --git a/plugin/controllers/ajax.py b/plugin/controllers/ajax.py +index 9add982..da2be4a 100644 +--- a/plugin/controllers/ajax.py ++++ b/plugin/controllers/ajax.py +@@ -92,7 +92,9 @@ class AjaxController(BaseController): + info = getInfo() + type = getBoxType() + +- if fileExists(getPublicPath("/images/boxes/"+type+".jpg")): ++ if fileExists(getPublicPath("/images/boxes/"+type+".png")): ++ info["boximage"] = type+".png" ++ elif fileExists(getPublicPath("/images/boxes/"+type+".jpg")): + info["boximage"] = type+".jpg" + else: + info["boximage"] = "unknown.jpg" +diff --git a/plugin/controllers/models/owibranding.py b/plugin/controllers/models/owibranding.py +index 9b8f1e5..835cee5 100644 +--- a/plugin/controllers/models/owibranding.py ++++ b/plugin/controllers/models/owibranding.py +@@ -277,6 +277,8 @@ def getAllInfo(): + remote = "vu_duo2" + elif procmodel == "ultimo": + remote = "vu_ultimo" ++ elif procmodel == "uno4kse": ++ remote = "vu_brown" + elif procmodel == "e3hd": + remote = "e3hd" + elif procmodel in ("et9x00", "et9000", "et9200", "et9500"): +diff --git a/plugin/public/static/remotes/vu_brown.html b/plugin/public/static/remotes/vu_brown.html +new file mode 100644 +index 0000000..b7835d3 +--- /dev/null ++++ b/plugin/public/static/remotes/vu_brown.html +@@ -0,0 +1,47 @@ ++ ++ ++ mute ++ Power ++ text ++ subtitle ++ 1 ++ 2 ++ 3 ++ 4 ++ 5 ++ 6 ++ 7 ++ 8 ++ 9 ++ 0 ++ previous ++ next ++ red ++ green ++ yellow ++ blue ++ up ++ down ++ left ++ right ++ OK ++ volume up ++ volume down ++ exit ++ epg ++ channelup ++ channeldown ++ menu ++ videoaltlast ++ audio ++ timer ++ help ++ rewind ++ play ++ pause ++ forward ++ tv ++ record ++ stop ++ radio ++ diff --git a/meta-openvuplus/recipes-vuplus/e2openplugins/files/rc_brown.png b/meta-openvuplus/recipes-vuplus/e2openplugins/files/rc_brown.png new file mode 100644 index 0000000..bafdc52 Binary files /dev/null and b/meta-openvuplus/recipes-vuplus/e2openplugins/files/rc_brown.png differ -- cgit