Increase dvbapp PR.

Fix TranscodingSetup in Vu_HD skin.
Remove Transcoding inetd patch.

diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
index 2e370c5..51fa926 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
@@ -85,7 +85,7 @@ RDEPENDS_enigma2-plugin-systemplugins-3gmodemmanager = "ppp usb-modeswitch usb-m
 RDEPENDS_enigma2-plugin-systemplugins-devicemanager = "util-linux-blkid ntfs-3g dosfstools"
 
 PN = "enigma2"
-PR = "r20"
+PR = "r21"
 
 SRCDATE = "20121128"
 #SRCDATE is NOT used by git to checkout a specific revision
@@ -109,7 +109,6 @@ SRC_URI = "git://code.vuplus.com/git/dvbapp.git;protocol=http;branch=${BRANCH};t
            file://enigma2_vuplus_vfd_mode.patch;patch=1;pnum=1 \
            file://enigma2_vuplus_addlibpythondeps.patch;patch=1;pnum=1 \
           file://enigma2_vuplus_pluginbrowser.patch;striplevel=1 \
-          file://enigma2_vuplus_transcodingsetup_inetd.patch;striplevel=1 \
            file://enigma2_vuplus_proc_oom_score_adj.patch;striplevel=1 \
            file://MyriadPro-Regular.otf \
            file://MyriadPro-Semibold.otf \

diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_skin.patch b/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_skin.patch
index d123bf9..6cd7d81 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_skin.patch
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_skin.patch
@@ -3009,10 +3009,10 @@ index 0000000..9d4f458
 +      *.png
 diff --git a/data/Vu_HD/skin.xml b/data/Vu_HD/skin.xml
 new file mode 100755
-index 0000000..06205e7
+index 0000000..45c42d3
 --- /dev/null
 +++ b/data/Vu_HD/skin.xml
-@@ -0,0 +1,3452 @@
+@@ -0,0 +1,3460 @@
 +<skin>
 +      <!-- VU+ skin (skin.xml)  -->
 +      <output id="0">
@@ -6453,6 +6453,14 @@ index 0000000..06205e7
 +              <widget name="config" zPosition="2" position="5,70" size="550,70" scrollbarMode="showOnDemand" transparent="1" />
 +              <widget source="text" render="Label" position="20,140" size="520,130" font="Regular;18" halign="center" valign="center" />
 +      </screen>
++      <screen name="TranscodingSetup_ext" position="center,center" size="560,320" title="Transcoding Setup" >
++              <ePixmap pixmap="skin_default/buttons/red.png" position="110,10" size="140,40" alphatest="on" />
++              <ePixmap pixmap="skin_default/buttons/green.png" position="310,10" size="140,40" alphatest="on" />
++              <widget source="key_red" render="Label" position="110,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" foregroundColor="#ffffff" transparent="1" />
++              <widget source="key_green" render="Label" position="310,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" foregroundColor="#ffffff" transparent="1" />
++              <widget name="config" zPosition="2" position="5,70" size="550,120" scrollbarMode="showOnDemand" transparent="1" />
++              <widget source="text" render="Label" position="20,190" size="520,130" font="Regular;18" halign="center" valign="center" />
++      </screen>
 +
 +      <!-- ZappingModeSelection Plugin -->
 +      <screen name="ZappingModeSelection" position="center,center" size="560,250" title="Zapping Mode Selection" >

diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_transcodingsetup_inetd.patch b/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_transcodingsetup_inetd.patch
deleted file mode 100644 (file)
index 3900484..0000000
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_transcodingsetup_inetd.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/lib/python/Plugins/SystemPlugins/TransCodingSetup/plugin.py b/lib/python/Plugins/SystemPlugins/TransCodingSetup/plugin.py
-index 09ec093..e46422a 100755
---- a/lib/python/Plugins/SystemPlugins/TransCodingSetup/plugin.py
-+++ b/lib/python/Plugins/SystemPlugins/TransCodingSetup/plugin.py
-@@ -37,10 +37,10 @@ class TranscodingSetupInit:
- 
-       def setTranscoding(self, transcoding, port):
-               if not self.getModel():
--                      print "This plugin is only supported for solo2/duo2."
-+#                     print "This plugin is only supported for solo2/duo2."
-                       return -8
-               if transcoding not in ["enabled","disabled"] or port not in ["8001","8002"]:
--                      print "Input error."
-+#                     print "Input error."
-                       return -7
-               if not fileExists("/proc/stb/encoder/enable"):
-                       return -1
-@@ -57,7 +57,7 @@ class TranscodingSetupInit:
-               return res
- 
-       def setEncoder(self,mode = "disabled"):
--              print "<TranscodingSetup> set encoder : %s" % mode
-+#             print "<TranscodingSetup> set encoder : %s" % mode
-               mode = mode.strip(' ').strip('\n')
-               try:
-                       fd = open("/proc/stb/encoder/enable",'r')
-@@ -79,7 +79,7 @@ class TranscodingSetupInit:
-                       return -1
- 
-       def setPort(self, port = "8001"):
--              print "<TranscodingSetup> set port : %s" % port
-+#             print "<TranscodingSetup> set port : %s" % port
-               try:
-                       fp = file('/etc/inetd.conf', 'r')
-                       datas = fp.readlines()
-@@ -115,6 +115,8 @@ class TranscodingSetupInit:
-       def inetdRestart(self):
-               if fileExists("/etc/init.d/inetd"):
-                       os_system("/etc/init.d/inetd restart")
-+              elif fileExists("/etc/init.d/inetd.busybox"):
-+                      os_system("/etc/init.d/inetd.busybox restart")
- 
-       def getModel(self):
-               if fileExists("/proc/stb/info/vumodel"):
-@@ -182,7 +184,7 @@ class TranscodingSetup(Screen,ConfigListScreen, TranscodingSetupInit):
-       def keySave(self):
-               transcoding = config.plugins.transcodingsetup.transcoding.value
-               port = config.plugins.transcodingsetup.port.value
--              print "<TranscodingSetup> Transcoding %s(port : %s)"%(transcoding, port)
-+#             print "<TranscodingSetup> Transcoding %s(port : %s)"%(transcoding, port)
-               ret = self.setupTranscoding(transcoding, port)
-               if ret is not None and ret <0 :
-                       self.resetConfig()