From da1dbfef9ab02d72d32f4649efcd834c1d249944 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 19 Oct 2013 22:30:54 +0300 Subject: [PATCH] vdr: update to vdr-2.1.2 --- .../vdr-epgsearch-02_vdr-2.1.2-buildfix.patch | 19 +++++ ...vdr-live-0.3.0-05_vdr-2.1.2-buildfix.patch | 76 +++++++++++++++++++ ...ugin-streamdev-03_vdr-2.1.2-buildfix.patch | 25 ++++++ ...gin-vnsiserver-02_vdr-2.1.2-buildfix.patch | 45 +++++++++++ ...ugin-xmltv2vdr-01_vdr-2.1.2-buildfix.patch | 19 +++++ .../vdr-plugin-xvdr-vdr-2.1.2-buildfix.patch | 32 ++++++++ packages/3rdparty/multimedia/vdr/package.mk | 2 +- 7 files changed, 217 insertions(+), 1 deletion(-) create mode 100644 packages/3rdparty/multimedia/vdr-epgsearch/patches/vdr-epgsearch-02_vdr-2.1.2-buildfix.patch create mode 100644 packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.3.0-05_vdr-2.1.2-buildfix.patch create mode 100644 packages/3rdparty/multimedia/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-03_vdr-2.1.2-buildfix.patch create mode 100644 packages/3rdparty/multimedia/vdr-plugin-vnsiserver/patches/cd5023b/vdr-plugin-vnsiserver-02_vdr-2.1.2-buildfix.patch create mode 100644 packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-01_vdr-2.1.2-buildfix.patch create mode 100644 packages/3rdparty/multimedia/vdr-plugin-xvdr/patches/vdr-plugin-xvdr-vdr-2.1.2-buildfix.patch diff --git a/packages/3rdparty/multimedia/vdr-epgsearch/patches/vdr-epgsearch-02_vdr-2.1.2-buildfix.patch b/packages/3rdparty/multimedia/vdr-epgsearch/patches/vdr-epgsearch-02_vdr-2.1.2-buildfix.patch new file mode 100644 index 0000000000..4a1a5f1f23 --- /dev/null +++ b/packages/3rdparty/multimedia/vdr-epgsearch/patches/vdr-epgsearch-02_vdr-2.1.2-buildfix.patch @@ -0,0 +1,19 @@ +commit e8bb2e8e0ef3602fc8cb252cee541bed5d45fc5c +Author: Stefan Saraev +Date: Sat Oct 19 22:19:10 2013 +0300 + + vdr 2.1.2 buildfix + +diff --git a/uservars.h b/uservars.h +index f098750..a0e047c 100644 +--- a/uservars.h ++++ b/uservars.h +@@ -538,7 +538,7 @@ class cVideodirVar : public cInternalVar { + cVideodirVar() : cInternalVar("videodir") {} + string Evaluate(const cEvent*, bool escapeStrings = false) + { +- return VideoDirectory; ++ return cVideoDirectory::Name(); + } + }; + diff --git a/packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.3.0-05_vdr-2.1.2-buildfix.patch b/packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.3.0-05_vdr-2.1.2-buildfix.patch new file mode 100644 index 0000000000..dd576b9e10 --- /dev/null +++ b/packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.3.0-05_vdr-2.1.2-buildfix.patch @@ -0,0 +1,76 @@ +commit 0f8a281027f852ed5968361bcb7420ed242d0476 +Author: Stefan Saraev +Date: Sat Oct 19 22:15:14 2013 +0300 + + vdr 2.1.2 buildfix + +diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp +index 80f145b..6da5285 100644 +--- a/pages/recordings.ecpp ++++ b/pages/recordings.ecpp +@@ -79,7 +79,7 @@ for (deletions_type::const_iterator it = deletions.begin(); it != deletions.end( + deletions.clear(); + + int FreeMB, UsedMB; +-int Percent = VideoDiskSpace(&FreeMB, &UsedMB); ++int Percent = cVideoDirectory::VideoDiskSpace(&FreeMB, &UsedMB); + int Minutes = int(double(FreeMB) / MB_PER_MINUTE); + int Hours = Minutes / 60; + Minutes %= 60; +diff --git a/recman.cpp b/recman.cpp +index 6a2fc00..9ed88f0 100644 +--- a/recman.cpp ++++ b/recman.cpp +@@ -112,7 +112,7 @@ namespace vdrlive { + if (found == string::npos) + return false; + +- string newname = string(VideoDirectory) + "/" + name + oldname.substr(found); ++ string newname = string(cVideoDirectory::Name()) + "/" + name + oldname.substr(found); + + if (!MoveDirectory(oldname.c_str(), newname.c_str(), copy)) { + esyslog("[LIVE]: renaming failed from '%s' to '%s'", oldname.c_str(), newname.c_str()); +diff --git a/tntconfig.cpp b/tntconfig.cpp +index 3325776..161fdc4 100644 +--- a/tntconfig.cpp ++++ b/tntconfig.cpp +@@ -279,7 +279,7 @@ namespace vdrlive { + // inserted by 'tadi' -- not verified, not counterchecked yet! + //app.mapUrl("^/vlc/(.+)", "static@tntnet") + // .setPathInfo("/$1") +- // .pushArg(string("DocumentRoot=") + VideoDirectory); ++ // .pushArg(string("DocumentRoot=") + cVideoDirectory::Name()); + + // the following selects the theme specific 'theme.css' file + // inserted by 'tadi' -- verified with above, but not counterchecked yet! +diff --git a/tools.cpp b/tools.cpp +index c744d06..cb3529e 100644 +--- a/tools.cpp ++++ b/tools.cpp +@@ -365,7 +365,7 @@ namespace vdrlive { + stat(source.c_str(), &st1); + stat(target.c_str(),&st2); + if (!copy && (st1.st_dev == st2.st_dev)) { +- if (!RenameVideoFile(source.c_str(), target.c_str())) { ++ if (!cVideoDirectory::RenameVideoFile(source.c_str(), target.c_str())) { + esyslog("[LIVE]: rename failed from %s to %s", source.c_str(), target.c_str()); + return false; + } +@@ -461,7 +461,7 @@ namespace vdrlive { + size_t found = source.find_last_of(delim); + if (found != std::string::npos) { + source = source.substr(0, found); +- while (source != VideoDirectory) { ++ while (source != cVideoDirectory::Name()) { + found = source.find_last_of(delim); + if (found == std::string::npos) + break; +@@ -478,7 +478,7 @@ namespace vdrlive { + size_t found = target.find_last_of(delim); + if (found != std::string::npos) { + target = target.substr(0, found); +- while (target != VideoDirectory) { ++ while (target != cVideoDirectory::Name()) { + found = target.find_last_of(delim); + if (found == std::string::npos) + break; diff --git a/packages/3rdparty/multimedia/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-03_vdr-2.1.2-buildfix.patch b/packages/3rdparty/multimedia/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-03_vdr-2.1.2-buildfix.patch new file mode 100644 index 0000000000..99fba05523 --- /dev/null +++ b/packages/3rdparty/multimedia/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-03_vdr-2.1.2-buildfix.patch @@ -0,0 +1,25 @@ +From 18f51127373375ce189be498a64cc286114f142f Mon Sep 17 00:00:00 2001 +From: Stefan Saraev +Date: Sat, 19 Oct 2013 21:40:14 +0300 +Subject: [PATCH] vdr 2.1.2 buildfix + +--- + server/connectionVTP.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/server/connectionVTP.c b/server/connectionVTP.c +index 55c92de..57bb64b 100644 +--- a/server/connectionVTP.c ++++ b/server/connectionVTP.c +@@ -1377,7 +1377,7 @@ bool cConnectionVTP::CmdSTAT(const char *Option) + if (*Option) { + if (strcasecmp(Option, "DISK") == 0) { + int FreeMB, UsedMB; +- int Percent = VideoDiskSpace(&FreeMB, &UsedMB); ++ int Percent = cVideoDirectory::VideoDiskSpace(&FreeMB, &UsedMB); + Reply(250, "%dMB %dMB %d%%", FreeMB + UsedMB, FreeMB, Percent); + } + else if (strcasecmp(Option, "NAME") == 0) { +-- +1.7.2.5 + diff --git a/packages/3rdparty/multimedia/vdr-plugin-vnsiserver/patches/cd5023b/vdr-plugin-vnsiserver-02_vdr-2.1.2-buildfix.patch b/packages/3rdparty/multimedia/vdr-plugin-vnsiserver/patches/cd5023b/vdr-plugin-vnsiserver-02_vdr-2.1.2-buildfix.patch new file mode 100644 index 0000000000..686ce54cad --- /dev/null +++ b/packages/3rdparty/multimedia/vdr-plugin-vnsiserver/patches/cd5023b/vdr-plugin-vnsiserver-02_vdr-2.1.2-buildfix.patch @@ -0,0 +1,45 @@ +commit 23a2343b962777ae0dc206934abf1202c271f1e6 +Author: Stefan Saraev +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); + diff --git a/packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-01_vdr-2.1.2-buildfix.patch b/packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-01_vdr-2.1.2-buildfix.patch new file mode 100644 index 0000000000..463382e35d --- /dev/null +++ b/packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-01_vdr-2.1.2-buildfix.patch @@ -0,0 +1,19 @@ +commit 6d5c30323f49c7960c873a423ec948834bbe8737 +Author: Stefan Saraev +Date: Sat Oct 19 22:24:10 2013 +0300 + + vdr 2.1.2 buildfix + +diff --git a/xmltv2vdr.cpp b/xmltv2vdr.cpp +index b367508..7b61c61 100644 +--- a/xmltv2vdr.cpp ++++ b/xmltv2vdr.cpp +@@ -274,7 +274,7 @@ cGlobals::cGlobals() + imgdelafter=30; + soundex=false; + +- if (asprintf(&epgfile_store,"%s/epg.db",VideoDirectory)==-1) {}; ++ if (asprintf(&epgfile_store,"%s/epg.db",cVideoDirectory::Name())==-1) {}; + + if (!CheckEPGDir("/var/run/vdr")) + { diff --git a/packages/3rdparty/multimedia/vdr-plugin-xvdr/patches/vdr-plugin-xvdr-vdr-2.1.2-buildfix.patch b/packages/3rdparty/multimedia/vdr-plugin-xvdr/patches/vdr-plugin-xvdr-vdr-2.1.2-buildfix.patch new file mode 100644 index 0000000000..2a82b25b9b --- /dev/null +++ b/packages/3rdparty/multimedia/vdr-plugin-xvdr/patches/vdr-plugin-xvdr-vdr-2.1.2-buildfix.patch @@ -0,0 +1,32 @@ +commit 45b2e4ce57e345a9b9344d5b8d8f46155b872a27 +Author: Stefan Saraev +Date: Sat Oct 19 21:48:49 2013 +0300 + + vdr 2.1.2 buildfix + +diff --git a/src/config/config.c b/src/config/config.c +index e058e96..1aaf9b8 100644 +--- a/src/config/config.c ++++ b/src/config/config.c +@@ -45,7 +45,7 @@ cXVDRServerConfig::cXVDRServerConfig() + } + + void cXVDRServerConfig::Load() { +- cLiveQueue::SetTimeShiftDir(VideoDirectory); ++ cLiveQueue::SetTimeShiftDir(cVideoDirectory::Name()); + cRecordingsCache::GetInstance().LoadResumeData(); + + if(!cConfig::Load(AddDirectory(ConfigDirectory, GENERAL_CONFIG_FILE), true, false)) +diff --git a/src/xvdr/xvdrclient.c b/src/xvdr/xvdrclient.c +index a1a9460..e15dd8f 100644 +--- a/src/xvdr/xvdrclient.c ++++ b/src/xvdr/xvdrclient.c +@@ -1385,7 +1385,7 @@ bool cXVDRClient::processTIMER_Update() /* OPCODE 85 */ + bool cXVDRClient::processRECORDINGS_GetDiskSpace() /* OPCODE 100 */ + { + int FreeMB; +- int Percent = VideoDiskSpace(&FreeMB); ++ int Percent = cVideoDirectory::VideoDiskSpace(&FreeMB); + int Total = (FreeMB / (100 - Percent)) * 100; + + m_resp->put_U32(Total); diff --git a/packages/3rdparty/multimedia/vdr/package.mk b/packages/3rdparty/multimedia/vdr/package.mk index e475592141..9be5511504 100644 --- a/packages/3rdparty/multimedia/vdr/package.mk +++ b/packages/3rdparty/multimedia/vdr/package.mk @@ -20,7 +20,7 @@ ################################################################################ PKG_NAME="vdr" -PKG_VERSION="2.1.1" +PKG_VERSION="2.1.2" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL"