X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=blobdiff_plain;f=meta-openvuplus%2Frecipes-vuplus%2Fe2openplugins%2Fenigma2-plugin-extensions-openwebif.bb;h=b3c3f93ddcf36c016721544d2d1322bf052203c9;hp=2c0798cd39f3f062d96b9c906c83503a66426ddd;hb=b3c10d75cdbdecf044df85d2dda62ff4c409a4d3;hpb=0d6acda3c9daf671af6c3a8e02270bae96286cd6

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 2c0798c..b3c3f93 100644
--- a/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
+++ b/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
@@ -4,14 +4,30 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://README;firstline=10;lastline=12;md5=9c14f792d0aeb54e15490a28c89087f7"
 
 DEPENDS = "python-cheetah-native"
-RDEPENDS_${PN} = "python-cheetah python-json python-unixadmin python-misc python-pyopenssl aio-grab"
+RDEPENDS_${PN} = "python-cheetah python-json python-unixadmin python-misc python-pyopenssl \
+		python-shell aio-grab python-compression python-numbers python-zopeinterface \
+"
 
+SRCREV_pn-${PN}="d84307958746e6a597b43defe5bd1cb78fd745c8"
 inherit gitpkgv
-PV = "0.1+git${SRCPV}"
-PKGV = "0.1+git${GITPKGV}"
-PR = "r0.82"
+PV = "1+git${SRCPV}"
+PKGV = "1+git${GITPKGV}"
+PR = "r9"
 
-require openplugins.inc
+require openplugins-distutils.inc
+
+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 \
+	file://box_zero4k.png \
+	file://box_duo4k.png \
+"
 
 # Just a quick hack to "compile" it
 do_compile() {
@@ -20,39 +36,57 @@ do_compile() {
 }
 
 PLUGINPATH = "/usr/lib/enigma2/python/Plugins/Extensions/${MODULE}"
-do_install() {
+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
+	install -m 0755 ${WORKDIR}/box_zero4k.png ${D}${PLUGINPATH}/public/images/boxes/zero4k.png
+	install -m 0755 ${WORKDIR}/box_duo4k.png ${D}${PLUGINPATH}/public/images/boxes/duo4k.png
 }
 
 python do_package_prepend () {
-	boxtypes = [
-		('bm750', 'duo.jpg', 'vu_normal.png'),
-		('vuduo2', 'duo2.jpg', 'vu_normal.png'),
-		('vusolo', 'solo.jpg', 'vu_normal.png'),
-		('vusolo2', 'solo2.jpg', 'vu_normal.png'),
-		('vusolose', 'solose.jpg', 'vu_normal.png'),
-		('vuultimo', 'ultimo.jpg', 'vu_ultimo.png'),
-		('vuuno', 'uno.jpg', 'vu_normal.png'),
-	]
-	import os
-	top = '${D}${PLUGINPATH}/public/images/'
-	target_box = 'unknown.jpg'
-	target_remote = 'ow_remote.png'
-	for x in boxtypes:
-		if x[0] == '${MACHINE}':
-			target_box = x[1]
-			target_remote = x[2]
-			break
-	for root, dirs, files in os.walk(top + 'boxes', topdown=False):
-		for name in files:
-			if target_box != name and name != 'unknown.jpg':
-				os.remove(os.path.join(root, name))
-	for root, dirs, files in os.walk(top + 'remotes', topdown=False):
-		for name in files:
-			if target_remote != name and name != 'ow_remote.png':
-				os.remove(os.path.join(root, name))
+  boxtypes = [
+  ('bm750', 'duo.jpg', 'vu_normal.png'),
+  ('vuduo2', 'duo2.jpg', 'vu_duo2.png'),
+  ('vusolo', 'solo.jpg', 'vu_normal.png'),
+  ('vusolo2', 'solo2.jpg', 'vu_normal.png'),
+  ('vusolose', 'solose.jpg', 'vu_normal.png'),
+  ('vuzero', 'zero.jpg', 'vu_normal.png'),
+  ('vuultimo', 'ultimo.jpg', 'vu_ultimo.png'),
+  ('vuuno', 'uno.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'),
+  ('vuzero4k', 'zero4k.png', 'vu_brown.png'),
+  ('vuduo4k', 'duo4k.png', 'vu_brown.png'),
+  ]
+  import os
+  top = '${D}${PLUGINPATH}/public/images/'
+  target_box = 'unknown.jpg'
+  target_remote = 'ow_remote.png'
+  for x in boxtypes:
+    if x[0] == '${MACHINE}':
+      target_box = x[1]
+      target_remote = x[2]
+      break
+  for root, dirs, files in os.walk(top + 'boxes', topdown=False):
+    for name in files:
+      if target_box != name and name != 'unknown.jpg':
+        os.remove(os.path.join(root, name))
+  for root, dirs, files in os.walk(top + 'remotes', topdown=False):
+    for name in files:
+      if target_remote != name and name != 'ow_remote.png':
+        os.remove(os.path.join(root, name))
 }
 
 FILES_${PN} = "${PLUGINPATH}"
-PACKAGES = "${PN}"
+
+do_populate_sysroot[noexec] = "1"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+