Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

packages/3rdparty/multimedia/vdr-plugin-vnsiserver/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-vnsiserver"
-PKG_VERSION="cd5023b"
+PKG_VERSION="e2e6804"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/3rdparty/multimedia/vdr-plugin-vnsiserver/patches/cd5023b/vdr-plugin-vnsiserver-02_vdr-2.1.2-buildfix.patch

@@ -1,45 +0,0 @@
-commit 23a2343b962777ae0dc206934abf1202c271f1e6
-Author: Stefan Saraev <stefan@saraev.ca>
-Date:   Sat Oct 19 21:56:23 2013 +0300
-
-    vdr 2.1.2 buildfix
-
-diff --git a/videobuffer.c b/videobuffer.c
-index 0c26807..c393827 100644
---- a/videobuffer.c
-+++ b/videobuffer.c
-@@ -386,7 +386,7 @@ bool cVideoBufferFile::Init()
-       m_Filename = cString::sprintf("%s/Timeshift-%d.vnsi", TimeshiftBufferDir, m_ClientID);
-   }
-   else
--    m_Filename = cString::sprintf("%s/Timeshift-%d.vnsi", VideoDirectory, m_ClientID);
-+    m_Filename = cString::sprintf("%s/Timeshift-%d.vnsi", cVideoDirectory::Name(), m_ClientID);
- 
-   m_Fd = open(m_Filename, O_RDWR | O_CREAT | O_TRUNC, S_IRWXU);
-   if (m_Fd == -1)
-diff --git a/vnsiclient.c b/vnsiclient.c
-index b724ce7..ecbcd7f 100644
---- a/vnsiclient.c
-+++ b/vnsiclient.c
-@@ -1403,7 +1403,7 @@ bool cVNSIClient::processTIMER_Update() /* OPCODE 85 */
- bool cVNSIClient::processRECORDINGS_GetDiskSpace() /* OPCODE 100 */
- {
-   int FreeMB;
--  int Percent = VideoDiskSpace(&FreeMB);
-+  int Percent = cVideoDirectory::VideoDiskSpace(&FreeMB);
-   int Total   = (FreeMB / (100 - Percent)) * 100;
- 
-   m_resp->add_U32(Total);
-diff --git a/vnsiserver.c b/vnsiserver.c
-index 5748da8..568d481 100644
---- a/vnsiserver.c
-+++ b/vnsiserver.c
-@@ -213,7 +213,7 @@ void cVNSIServer::Action(void)
-   }
-   else
-   {
--    cmd = cString::sprintf("rm -f %s/*.vnsi", VideoDirectory);
-+    cmd = cString::sprintf("rm -f %s/*.vnsi", cVideoDirectory::Name());
-   }
-   int ret = system(cmd);
- 

packages/3rdparty/multimedia/vdr-plugin-vnsiserver/patches/vdr-plugin-vnsiserver-01_makefile.patch

@@ -6,7 +6,7 @@ index 8f37c92..94869aa 100644
  # This name will be used in the '-P...' option of VDR to load the plugin.
  # By default the main source file also carries this name.
  
--PLUGIN = vnsiserver4
+-PLUGIN = vnsiserver5
 +PLUGIN = vnsiserver
  
  ### The version number of this plugin (taken from the main source file):

packages/addons/service/multimedia/vdr-addon/changelog.txt

@@ -1,3 +1,6 @@
+4.0.3
+- update to vdr-plugin-vnsiserver-e2e6804 (vnsi5)
+
 4.0.2
 - update to vdr-2.1.2
 - update to vdr-plugin-streamdev-a9c2adb

packages/addons/service/multimedia/vdr-addon/meta

@@ -21,7 +21,7 @@
 
 PKG_NAME="vdr-addon"
 PKG_VERSION="4.0"
-PKG_REV="2"
+PKG_REV="3"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"

packages/mediacenter/xbmc-pvr-addons/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-pvr-addons"
-PKG_VERSION="d4cb4d5"
+PKG_VERSION="e2e6804"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"