Support duo4kse.

6 files changed, 17 insertions, 7 deletions

diff --git a/meta-openvuplus/recipes-connectivity/packagegroups/packagegroup-vuplus-wlan.bb b/meta-openvuplus/recipes-connectivity/packagegroups/packagegroup-vuplus-wlan.bb
index a599538..acea501 100644
--- a/meta-openvuplus/recipes-connectivity/packagegroups/packagegroup-vuplus-wlan.bb
+++ b/meta-openvuplus/recipes-connectivity/packagegroups/packagegroup-vuplus-wlan.bb
@@ -59,5 +59,6 @@ RDEPENDS_${PN}_append = "\
 	rt2870sta \
 	${@base_conditional("MACHINE", "vuultimo4k", "vuplus-wifi-util-vuultimo4k", "", d)} \
 	${@base_conditional("MACHINE", "vuduo4k", "vuplus-wifi-util-vuduo4k", "", d)} \
+	${@base_conditional("MACHINE", "vuduo4kse", "vuplus-wifi-util-vuduo4kse", "", d)} \
 "
 
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 b3c3f93..3d2801a 100644
--- a/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
+++ b/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
@@ -64,6 +64,7 @@ python do_package_prepend () {
   ('vuuno4kse', 'uno4kse.png', 'vu_brown.png'),
   ('vuzero4k', 'zero4k.png', 'vu_brown.png'),
   ('vuduo4k', 'duo4k.png', 'vu_brown.png'),
+  ('vuduo4kse', 'duo4kse.png', 'vu_brown.png'),
   ]
   import os
   top = '${D}${PLUGINPATH}/public/images/'
diff --git a/meta-openvuplus/recipes-vuplus/e2openplugins/files/box_duo4kse.png b/meta-openvuplus/recipes-vuplus/e2openplugins/files/box_duo4kse.png
new file mode 100644
index 0000000..58a0652
--- /dev/null
+++ b/meta-openvuplus/recipes-vuplus/e2openplugins/files/box_duo4kse.png
diff --git a/meta-openvuplus/recipes-vuplus/e2openplugins/files/openwebif_support_vumodels.patch b/meta-openvuplus/recipes-vuplus/e2openplugins/files/openwebif_support_vumodels.patch
index a4ef179..b62031b 100644
--- a/meta-openvuplus/recipes-vuplus/e2openplugins/files/openwebif_support_vumodels.patch
+++ b/meta-openvuplus/recipes-vuplus/e2openplugins/files/openwebif_support_vumodels.patch
@@ -1,5 +1,5 @@
 diff --git a/plugin/controllers/models/info.py b/plugin/controllers/models/info.py
-index 446a97c..8e0e0f6 100644
+index 446a97c..3e8cb12 100644
 --- a/plugin/controllers/models/info.py
 +++ b/plugin/controllers/models/info.py
 @@ -317,7 +317,7 @@ def getInfo():
@@ -7,12 +7,12 @@ index 446a97c..8e0e0f6 100644
  
  	info['transcoding'] = False
 -	if (info['model'] in ("Solo²", "Duo²", "Solo SE", "Quad", "Quad Plus") or info['machinebuild'] in ('inihdp', 'hd2400', 'et10000', 'xpeedlx3', 'ew7356', 'dags3', 'dags4')):
-+	if (info['model'] in ("Duo4K", "Uno4Kse", "Uno4K", "Ultimo4K", "Solo4K", "Solo²", "Duo²", "Solo SE", "Quad", "Quad Plus") or info['machinebuild'] in ('inihdp', 'hd2400', 'et10000', 'xpeedlx3', 'ew7356', 'dags3', 'dags4')):
++	if (info['model'] in ("Duo4K", "Duo4Kse", "Uno4Kse", "Uno4K", "Ultimo4K", "Solo4K", "Solo²", "Duo²", "Solo SE", "Quad", "Quad Plus") or info['machinebuild'] in ('inihdp', 'hd2400', 'et10000', 'xpeedlx3', 'ew7356', 'dags3', 'dags4')):
  		if os.path.exists(eEnv.resolve('${libdir}/enigma2/python/Plugins/SystemPlugins/TransCodingSetup/plugin.pyo')) or os.path.exists(eEnv.resolve('${libdir}/enigma2/python/Plugins/SystemPlugins/TranscodingSetup/plugin.pyo')) or os.path.exists(eEnv.resolve('${libdir}/enigma2/python/Plugins/SystemPlugins/MultiTransCodingSetup/plugin.pyo')):
  			info['transcoding'] = True
  
 diff --git a/plugin/controllers/models/stream.py b/plugin/controllers/models/stream.py
-index cb33277..d75ca6f 100644
+index cb33277..5e3675a 100644
 --- a/plugin/controllers/models/stream.py
 +++ b/plugin/controllers/models/stream.py
 @@ -52,7 +52,7 @@ def getStream(session, request, m3ufile):
@@ -20,7 +20,7 @@ index cb33277..d75ca6f 100644
  	transcoder_port = None
  	args = ""
 -	if model in ("Solo²", "Duo²", "Solo SE", "Quad", "Quad Plus") or machinebuild in ('dags3', 'dags4'):
-+	if model in ("Duo4K", "Uno4Kse", "Uno4K", "Ultimo4K", "Solo4K", "Solo²", "Duo²", "Solo SE", "Quad", "Quad Plus") or machinebuild in ('dags3', 'dags4'):
++	if model in ("Duo4K", "Duo4Kse", "Uno4Kse", "Uno4K", "Ultimo4K", "Solo4K", "Solo²", "Duo²", "Solo SE", "Quad", "Quad Plus") or machinebuild in ('dags3', 'dags4'):
  		try:
  			transcoder_port = int(config.plugins.transcodingsetup.port.value)
  		except StandardError:
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
index 315022a..e2c16a8 100644
--- a/meta-openvuplus/recipes-vuplus/e2openplugins/files/openwebif_vu_box_remote.patch
+++ b/meta-openvuplus/recipes-vuplus/e2openplugins/files/openwebif_vu_box_remote.patch
@@ -14,14 +14,21 @@ index 9add982..da2be4a 100644
  		else:
  			info["boximage"] = "unknown.jpg"
 diff --git a/plugin/controllers/models/owibranding.py b/plugin/controllers/models/owibranding.py
-index 9b8f1e5..4bbf6fb 100644
+index 9b8f1e5..a6a5b29 100644
 --- a/plugin/controllers/models/owibranding.py
 +++ b/plugin/controllers/models/owibranding.py
-@@ -277,6 +277,8 @@ def getAllInfo():
+@@ -271,12 +271,14 @@ def getAllInfo():
+ 	info['type'] = type
+ 
+ 	remote = "dmm"
+-	if procmodel in ("solo", "duo", "uno", "solo2", "solose", "zero"):
++	if procmodel in ("solo", "duo", "uno", "solo2", "solose", "zero", "solo4k", "uno4k", "ultimo4k"):
+ 		remote = "vu_normal"
+ 	elif procmodel == "duo2":
  		remote = "vu_duo2"
  	elif procmodel == "ultimo":
  		remote = "vu_ultimo"
-+	elif procmodel in ("uno4kse", "zero4k", "duo4k"):
++	elif procmodel in ("uno4kse", "zero4k", "duo4k", "duo4kse"):
 +		remote = "vu_brown"
  	elif procmodel == "e3hd":
  		remote = "e3hd"
diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy.bb
index 6d8764b..a75b9ad 100644
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy.bb
@@ -22,6 +22,7 @@ EXTRA_OECONF_vuultimo4k += " --enable-ext-pid "
 EXTRA_OECONF_vuuno4k += " --enable-ext-pid "
 EXTRA_OECONF_vuuno4kse += " --enable-ext-pid "
 EXTRA_OECONF_vuduo4k += " --enable-ext-pid "
+EXTRA_OECONF_vuduo4kse += " --enable-ext-pid "
 
 S = "${WORKDIR}/git"