webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-26 19:00:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

vdr: update to 2.4.1

Browse Source 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
2020-02-16 11:48:22 +01:00
parent 06fc566a0a
commit eb7066388b
16 changed files with 131 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch
View File

@@ -1,82 +0,0 @@
diff -up epgsearch-1.0.1.beta2/epgsearch.c~ epgsearch-1.0.1.beta2/epgsearch.c
--- epgsearch-1.0.1.beta2/epgsearch.c~ 2012-06-11 20:01:54.000000000 +0300
+++ epgsearch-1.0.1.beta2/epgsearch.c 2012-06-12 22:20:38.740086339 +0300
@@ -446,16 +446,16 @@ bool cPluginEpgsearch::Start(void)
LoadConfD();
LoadUserVars();
- ChannelGroups.Load(AddDirectory(CONFIGDIR, "epgsearchchangrps.conf"), true);
- Blacklists.Load(AddDirectory(CONFIGDIR, "epgsearchblacklists.conf"));
- SearchExts.Load(AddDirectory(CONFIGDIR, "epgsearch.conf"));
- SearchTemplates.Load(AddDirectory(CONFIGDIR, "epgsearchtemplates.conf"));
- RecsDone.Load(AddDirectory(CONFIGDIR, "epgsearchdone.data"));
- SwitchTimers.Load(AddDirectory(CONFIGDIR, "epgsearchswitchtimers.conf"));
- NoAnnounces.Load(AddDirectory(CONFIGDIR, "noannounce.conf"));
- DefTimerCheckModes.Load(AddDirectory(CONFIGDIR, "deftimerchkmodes.conf"));
- TimersDone.Load(AddDirectory(CONFIGDIR, "timersdone.conf"));
- PendingNotifications.Load(AddDirectory(CONFIGDIR, "pendingnotifications.conf"));
+ ChannelGroups.Load("/var/lib/vdr/data/epgsearch/epgsearchchangrps.conf", true);
+ Blacklists.Load("/var/lib/vdr/data/epgsearch/epgsearchblacklists.conf");
+ SearchExts.Load("/var/lib/vdr/data/epgsearch/epgsearch.conf");
+ SearchTemplates.Load("/var/lib/vdr/data/epgsearch/epgsearchtemplates.conf");
+ RecsDone.Load("/var/lib/vdr/data/epgsearch/epgsearchdone.data");
+ SwitchTimers.Load("/var/lib/vdr/data/epgsearch/epgsearchswitchtimers.conf");
+ NoAnnounces.Load("/var/lib/vdr/data/epgsearch/noannounce.conf");
+ DefTimerCheckModes.Load("/var/lib/vdr/data/epgsearch/deftimerchkmodes.conf");
+ TimersDone.Load("/var/lib/vdr/data/epgsearch/timersdone.conf");
+ PendingNotifications.Load("/var/lib/vdr/data/epgsearch/pendingnotifications.conf");
cSearchTimerThread::Init(this);
cSwitchTimerThread::Init();
diff -up epgsearch-1.0.1.beta2/epgsearchcfg.c~ epgsearch-1.0.1.beta2/epgsearchcfg.c
--- epgsearch-1.0.1.beta2/epgsearchcfg.c~ 2012-06-11 19:43:52.000000000 +0300
+++ epgsearch-1.0.1.beta2/epgsearchcfg.c 2012-06-12 22:20:39.169055465 +0300
@@ -80,7 +80,7 @@ cEPGSearchConfig::cEPGSearchConfig(void)
strcpy(MailAuthUser, "");
strcpy(MailAuthPass, "");
strcpy(LastMailConflicts, "");
- mailViaScript = 1;
+ mailViaScript = 0;
manualTimerCheckDefault = 0;
noAnnounceWhileReplay = 0;
TimerProgRepeat = 0;
diff -up epgsearch-1.0.1.beta2/scripts/recordingdone.sh~ epgsearch-1.0.1.beta2/scripts/recordingdone.sh
--- epgsearch-1.0.1.beta2/scripts/recordingdone.sh~ 2012-06-12 22:19:28.570878733 +0300
+++ epgsearch-1.0.1.beta2/scripts/recordingdone.sh 2012-06-12 22:20:39.536029167 +0300
@@ -60,10 +60,10 @@ CTIME_FROM_RECORDING=yes
SVDRPSEND=svdrpsend
# Home of EPGsearch
-EPGSEARCH_HOME="/etc/vdr/plugins"
+EPGSEARCH_HOME="/var/lib/vdr/data/epgsearch"
# Video root
-VIDEO_ROOT="/video"
+VIDEO_ROOT="/var/video"
# do not edit below this line
#------------------------------------------------------------------------------
diff -up epgsearch-1.0.1.beta2/scripts/recrep.sh~ epgsearch-1.0.1.beta2/scripts/recrep.sh
--- epgsearch-1.0.1.beta2/scripts/recrep.sh~ 2012-06-11 19:43:51.000000000 +0300
+++ epgsearch-1.0.1.beta2/scripts/recrep.sh 2012-06-12 22:20:39.914002061 +0300
@@ -15,7 +15,7 @@
# adjust the following lines to your config
# your plugins config dir
-PLUGINCONFDIR=/var/lib/vdr/plugins/epgsearch
+PLUGINCONFDIR=/etc/vdr/plugins/epgsearch
# path to svdrpsend
SVDRPSEND=svdrpsend
# the key used to call epgsearch
diff -up epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh~ epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh
--- epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh~ 2012-06-11 19:43:51.000000000 +0300
+++ epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh 2012-06-12 22:20:40.723944345 +0300
@@ -15,7 +15,7 @@
#<Configuration>
# Your timers.conf
-TIMERS="/video/timers.conf"
+TIMERS="/etc/vdr/timers.conf"
#</Configuration>

82
src/patches/vdr-epgsearch-2.4.0-debian-paths.patch Normal file
View File

@@ -0,0 +1,82 @@
diff -Naur vdr-plugin-epgsearch.org/epgsearch.c vdr-plugin-epgsearch/epgsearch.c
--- vdr-plugin-epgsearch.org/epgsearch.c 2020-02-16 07:56:33.307310006 +0100
+++ vdr-plugin-epgsearch/epgsearch.c 2020-02-16 07:50:53.826938247 +0100
@@ -465,16 +465,16 @@
LoadConfD();
LoadUserVars();
- ChannelGroups.Load(AddDirectory(CONFIGDIR, "epgsearchchangrps.conf"), true);
- Blacklists.Load(AddDirectory(CONFIGDIR, "epgsearchblacklists.conf"));
- SearchExts.Load(AddDirectory(CONFIGDIR, "epgsearch.conf"));
- SearchTemplates.Load(AddDirectory(CONFIGDIR, "epgsearchtemplates.conf"));
- RecsDone.Load(AddDirectory(CONFIGDIR, "epgsearchdone.data"));
- SwitchTimers.Load(AddDirectory(CONFIGDIR, "epgsearchswitchtimers.conf"));
- NoAnnounces.Load(AddDirectory(CONFIGDIR, "noannounce.conf"));
- DefTimerCheckModes.Load(AddDirectory(CONFIGDIR, "deftimerchkmodes.conf"));
- TimersDone.Load(AddDirectory(CONFIGDIR, "timersdone.conf"));
- PendingNotifications.Load(AddDirectory(CONFIGDIR, "pendingnotifications.conf"));
+ ChannelGroups.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "epgsearchchangrps.conf"), true);
+ Blacklists.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "epgsearchblacklists.conf"));
+ SearchExts.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "epgsearch.conf"));
+ SearchTemplates.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "epgsearchtemplates.conf"));
+ RecsDone.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "epgsearchdone.data"));
+ SwitchTimers.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "epgsearchswitchtimers.conf"));
+ NoAnnounces.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "noannounce.conf"));
+ DefTimerCheckModes.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "deftimerchkmodes.conf"));
+ TimersDone.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "timersdone.conf"));
+ PendingNotifications.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "pendingnotifications.conf"));
cSearchTimerThread::Init(this);
cSwitchTimerThread::Init();
diff -Naur vdr-plugin-epgsearch.org/epgsearchcfg.c vdr-plugin-epgsearch/epgsearchcfg.c
--- vdr-plugin-epgsearch.org/epgsearchcfg.c 2020-02-16 07:56:33.323310490 +0100
+++ vdr-plugin-epgsearch/epgsearchcfg.c 2020-02-16 07:51:58.065261524 +0100
@@ -76,7 +76,7 @@
strcpy(MailAuthUser, "");
strcpy(MailAuthPass, "");
strcpy(LastMailConflicts, "");
- mailViaScript = 1;
+ mailViaScript = 0;
manualTimerCheckDefault = 0;
noAnnounceWhileReplay = 0;
TimerProgRepeat = 0;
diff -Naur vdr-plugin-epgsearch.org/scripts/recordingdone.sh vdr-plugin-epgsearch/scripts/recordingdone.sh
--- vdr-plugin-epgsearch.org/scripts/recordingdone.sh 2020-02-16 07:56:33.319310370 +0100
+++ vdr-plugin-epgsearch/scripts/recordingdone.sh 2020-02-16 07:53:37.255598512 +0100
@@ -60,10 +60,10 @@
SVDRPSEND=svdrpsend
# Home of EPGsearch
-EPGSEARCH_HOME="/etc/vdr/plugins"
+EPGSEARCH_HOME="/var/lib/vdr/data/epgsearch"
# Video root
-VIDEO_ROOT="/video"
+VIDEO_ROOT="/var/video"
# do not edit below this line
#------------------------------------------------------------------------------
diff -Naur vdr-plugin-epgsearch.org/scripts/recrep.sh vdr-plugin-epgsearch/scripts/recrep.sh
--- vdr-plugin-epgsearch.org/scripts/recrep.sh 2020-02-16 07:56:33.319310370 +0100
+++ vdr-plugin-epgsearch/scripts/recrep.sh 2020-02-16 07:54:21.508751492 +0100
@@ -15,7 +15,7 @@
# adjust the following lines to your config
# your plugins config dir
-PLUGINCONFDIR=/var/lib/vdr/plugins/epgsearch
+PLUGINCONFDIR=/etc/vdr/plugins/epgsearch
# path to svdrpsend
SVDRPSEND=svdrpsend
# the key used to call epgsearch
diff -Naur vdr-plugin-epgsearch.org/scripts/timercmds-auxinfo.sh vdr-plugin-epgsearch/scripts/timercmds-auxinfo.sh
--- vdr-plugin-epgsearch.org/scripts/timercmds-auxinfo.sh 2020-02-16 07:56:33.319310370 +0100
+++ vdr-plugin-epgsearch/scripts/timercmds-auxinfo.sh 2020-02-16 07:54:58.685432309 +0100
@@ -15,7 +15,7 @@
#<Configuration>
# Your timers.conf
-TIMERS="/video/timers.conf"
+TIMERS="/etc/vdr/timers.conf"
#</Configuration>

29
src/patches/vdr-streamdev_recordings-64.patch
View File

@@ -1,29 +0,0 @@
diff -Naur vdr-streamdev-10db11ac.org/server/connectionHTTP.c vdr-streamdev-10db11ac/server/connectionHTTP.c
--- vdr-streamdev-10db11ac.org/server/connectionHTTP.c 2013-02-18 12:43:02.000000000 +0100
+++ vdr-streamdev-10db11ac/server/connectionHTTP.c 2013-04-29 15:16:40.049168127 +0200
@@ -455,11 +455,11 @@
return NULL;
char *p = NULL;
- unsigned long l = strtoul(FileBase, &p, 0);
+ unsigned long long l = strtoull(FileBase, &p, 0);
if (p != FileBase && l > 0L) {
if (*p == ':') {
// get recording by dev:inode
- unsigned long inode = strtoul(p + 1, &p, 0);
+ unsigned long long inode = strtoull(p + 1, &p, 0);
if (*p == 0 && inode > 0) {
struct stat st;
cThreadLock RecordingsLock(&Recordings);
diff -Naur vdr-streamdev-10db11ac.org/server/menuHTTP.c vdr-streamdev-10db11ac/server/menuHTTP.c
--- vdr-streamdev-10db11ac.org/server/menuHTTP.c 2013-02-18 12:43:02.000000000 +0100
+++ vdr-streamdev-10db11ac/server/menuHTTP.c 2013-04-29 15:15:30.352502787 +0200
@@ -28,7 +28,7 @@
{
struct stat st;
if (stat(current->FileName(), &st) == 0)
- return cString::sprintf("%lu:%lu.rec", st.st_dev, st.st_ino);
+ return cString::sprintf("%llu:%llu.rec", (unsigned long long) st.st_dev, (unsigned long long) st.st_ino);
return "";
}