From: kos <kos@dev3>
Date: Wed, 6 Nov 2013 00:30:04 +0000 (+0900)
Subject: removed openwebif patch.
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=commitdiff_plain;h=1014b79a945f682ab93befb19b477faa69bb1d51;hp=f32df5284b7f558e8c89c95ec9d2e416081ec02d

removed openwebif patch.
---

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 a344976..390f696 100644
--- a/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
+++ b/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
@@ -9,12 +9,10 @@ RDEPENDS_${PN} = "python-cheetah python-json python-unixadmin python-misc python
 inherit gitpkgv
 PV = "0.1+git${SRCPV}"
 PKGV = "0.1+git${GITPKGV}"
-PR = "r0.80"
+PR = "r0.81"
 
 require openplugins.inc
 
-SRC_URI += " file://openwebif-transcoding-support.patch;apply=yes;striplevel=1 "
-
 # Just a quick hack to "compile" it
 do_compile() {
 	cheetah-compile -R --nobackup ${S}/plugin
diff --git a/meta-openvuplus/recipes-vuplus/e2openplugins/files/openwebif-transcoding-support.patch b/meta-openvuplus/recipes-vuplus/e2openplugins/files/openwebif-transcoding-support.patch
deleted file mode 100644
index 6786fdd..0000000
--- a/meta-openvuplus/recipes-vuplus/e2openplugins/files/openwebif-transcoding-support.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/plugin/controllers/models/stream.py b/plugin/controllers/models/stream.py
-index 9c6df86..e267010 100644
---- a/plugin/controllers/models/stream.py
-+++ b/plugin/controllers/models/stream.py
-@@ -49,7 +49,7 @@ def getStream(session, request, m3ufile):
- 	if model in ("solo2","duo2"):
- 		if "device" in request.args :
- 			if request.args["device"][0] == "phone" :
--				portNumber = 8002;
-+				portNumber = 8002
- 	if "port" in request.args:
- 		portNumber = request.args["port"][0]
- 	response = "#EXTM3U \n#EXTVLCOPT--http-reconnect=true \n%shttp://%s:%s/%s\n" % (progopt,request.getRequestHostname(), portNumber, sRef)
-@@ -81,7 +81,7 @@ def getTS(self, request):
- 		if model in ("solo2","duo2"):
- 			if "device" in request.args :
- 				if request.args["device"][0] == "phone" :
--					portNumber = 8003;
-+					portNumber = 8002
- 		if "port" in request.args:
- 			portNumber = request.args["port"][0]
- 		response = "#EXTM3U\n#EXTVLCOPT--http-reconnect=true \n%shttp://%s:%s/file?file=%s\n" % (progopt,request.getRequestHostname(), portNumber, quote(filename))
-diff --git a/plugin/controllers/views/ajax/movies.tmpl b/plugin/controllers/views/ajax/movies.tmpl
-index a0fdf85..9028c7f 100755
---- a/plugin/controllers/views/ajax/movies.tmpl
-+++ b/plugin/controllers/views/ajax/movies.tmpl
-@@ -56,7 +56,7 @@
- 							<img align="top" src="../images/ico_stream.png" title="Stream $movie.eventname" border="0">
- 						</a>
- 						<a href="#" onclick="jumper8003('$quote($movie.filename)');">
--							<img align="top" src="../images/ico_stream.png" title="Stream(8003) $movie.eventname" border="0">
-+							<img align="top" src="../images/ico_stream.png" title="Stream Port 8002 $movie.eventname" border="0">
- 						</a>
- 						#else
- 						<a target="_blank" href='/web/ts.m3u?file=$quote($movie.filename)'>