From 074c72d54a9227a85019b721cc6b336d688a9c3f Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sat, 16 Jan 2021 13:12:11 +0100 Subject: [PATCH 1/5] Add vdr-2.4.4-RecordingInfo.patch for extrecmenung plugin Add mcli to sysconfig's VDR_PLUGIN_ORDER Add extrecmenung to sysconfig's VDR_PLUGIN_ORDER --- vdr-2.4.4-RecordingInfo.patch | 73 +++++++++++++++++++++++++++++++++++ vdr.spec | 10 ++++- vdr.sysconfig | 2 + 3 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 vdr-2.4.4-RecordingInfo.patch diff --git a/vdr-2.4.4-RecordingInfo.patch b/vdr-2.4.4-RecordingInfo.patch new file mode 100644 index 0000000..22a2210 --- /dev/null +++ b/vdr-2.4.4-RecordingInfo.patch @@ -0,0 +1,73 @@ +diff --git a/recording.h b/recording.h +index 1ba16bdc..9988ca84 100644 +--- a/recording.h ++++ b/recording.h +@@ -41,6 +41,10 @@ enum eRecordingUsage { + ruCanceled = 0x8000, // the operation has been canceled, waiting for cleanup + }; + ++#ifndef EPGRENAME ++#define EPGRENAME ++#endif ++ + void RemoveDeletedRecordings(void); + void AssertFreeDiskSpace(int Priority = 0, bool Force = false); + ///< The special Priority value -1 means that we shall get rid of any +@@ -74,8 +78,6 @@ private: + char *fileName; + cRecordingInfo(const cChannel *Channel = NULL, const cEvent *Event = NULL); + bool Read(FILE *f); +- void SetData(const char *Title, const char *ShortText, const char *Description); +- void SetAux(const char *Aux); + public: + cRecordingInfo(const char *FileName); + ~cRecordingInfo(); +@@ -93,6 +95,8 @@ public: + bool Write(FILE *f, const char *Prefix = "") const; + bool Read(void); + bool Write(void) const; ++ void SetData(const char *Title, const char *ShortText, const char *Description); ++ void SetAux(const char *Aux); + }; + + class cRecording : public cListObject { +@@ -150,7 +154,7 @@ public: + ///< Returns the full path name to the recording directory, including the + ///< video directory and the actual '*.rec'. For disk file access use. + const char *Title(char Delimiter = ' ', bool NewIndicator = false, int Level = -1) const; +- const cRecordingInfo *Info(void) const { return info; } ++ cRecordingInfo *Info(void) const { return info; } + const char *PrefixFileName(char Prefix); + int HierarchyLevels(void) const; + void ResetResume(void) const; +diff --git a/recording.c b/recording.c +index 6bfbcff1..9ef8a9e1 100644 +--- a/recording.c ++++ b/recording.c +@@ -431,11 +431,26 @@ cRecordingInfo::~cRecordingInfo() + void cRecordingInfo::SetData(const char *Title, const char *ShortText, const char *Description) + { + if (!isempty(Title)) ++ { ++ if (!strcmp(Title, "-")) ++ ((cEvent *)event)->SetTitle(""); ++ else + ((cEvent *)event)->SetTitle(Title); ++ } + if (!isempty(ShortText)) ++ { ++ if (!strcmp(ShortText, "-")) ++ ((cEvent *)event)->SetShortText(""); ++ else + ((cEvent *)event)->SetShortText(ShortText); ++ } + if (!isempty(Description)) ++ { ++ if (!strcmp(Description, "-")) ++ ((cEvent *)event)->SetDescription(""); ++ else + ((cEvent *)event)->SetDescription(Description); ++ } + } + + void cRecordingInfo::SetAux(const char *Aux) diff --git a/vdr.spec b/vdr.spec index 87dcf7a..2ca1c86 100644 --- a/vdr.spec +++ b/vdr.spec @@ -30,7 +30,7 @@ Name: vdr Version: 2.4.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Video Disk Recorder License: GPLv2+ @@ -75,6 +75,8 @@ Patch10: http://www.udo-richter.de/vdr/files/vdr-2.1.5-naludump-0.1.diff Patch11: %{name}-2.4.0-mainmenuhooks101.patch # Sent upstream 2016-06-17 Patch15: %{name}-1.7.37-fedora-pkgconfig.patch +# https://gitlab.com/kamel5/extrecmenung/-/raw/master/contrib/vdr-2.4.4-RecordingInfo.patch +Patch16: %{name}-2.4.4-RecordingInfo.patch Patch99: %{name}-2.4.1-mark-obsolete-NidTid.patch BuildRequires: gcc @@ -201,6 +203,7 @@ sed \ %patch10 -p1 %patch11 -p1 %patch15 -p1 +%patch16 -p1 %patch99 -p1 # Patch APIVERSION TO 2.4.4 to match VDRVERSION @@ -547,6 +550,11 @@ useradd -r -g %{vdr_group} -d %{vardir} -s /sbin/nologin -M -N \ %changelog +* Sat Jan 16 2021 Martin Gansser - 2.4.4-2 +- Add vdr-2.4.4-RecordingInfo.patch for extrecmenung plugin +- Add mcli to sysconfig's VDR_PLUGIN_ORDER +- Add extrecmenung to sysconfig's VDR_PLUGIN_ORDER + * Wed Aug 26 2020 Martin Gansser - 2.4.4-1 - Update to 2.4.4 - Add vdr-2.4.1-mark-obsolete-NidTid.patch diff --git a/vdr.sysconfig b/vdr.sysconfig index 137a235..8510da7 100644 --- a/vdr.sysconfig +++ b/vdr.sysconfig @@ -18,6 +18,8 @@ VDR_OPTIONS=(--lirc --vfat --shutdown=vdr-shutdown.sh) # present when needed by other plugins at startup/shutdown. # VDR_PLUGIN_ORDER=" +mcli +extrecmenung dxr3 softdevice softhddevice From 4321d0eb4d599e70d856205cb4bf7fac85c5f1f1 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sat, 23 Jan 2021 09:53:14 +0100 Subject: [PATCH 2/5] Add vdr-2.4.4-RecordingInfo.patch for extrecmenung plugin Add mcli to sysconfig's VDR_PLUGIN_ORDER Add extrecmenung to sysconfig's VDR_PLUGIN_ORDER --- vdr-2.4.4-RecordingInfo.patch | 43 +++++++++++++---------------------- 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/vdr-2.4.4-RecordingInfo.patch b/vdr-2.4.4-RecordingInfo.patch index 22a2210..6a613f1 100644 --- a/vdr-2.4.4-RecordingInfo.patch +++ b/vdr-2.4.4-RecordingInfo.patch @@ -1,11 +1,12 @@ diff --git a/recording.h b/recording.h -index 1ba16bdc..9988ca84 100644 +index 6f26f2f6..718df343 100644 --- a/recording.h +++ b/recording.h -@@ -41,6 +41,10 @@ enum eRecordingUsage { +@@ -41,6 +41,11 @@ enum eRecordingUsage { ruCanceled = 0x8000, // the operation has been canceled, waiting for cleanup }; ++// workaround patch for enabling extra features in extrecmenung until vdr 2.5.2 is released +#ifndef EPGRENAME +#define EPGRENAME +#endif @@ -13,7 +14,7 @@ index 1ba16bdc..9988ca84 100644 void RemoveDeletedRecordings(void); void AssertFreeDiskSpace(int Priority = 0, bool Force = false); ///< The special Priority value -1 means that we shall get rid of any -@@ -74,8 +78,6 @@ private: +@@ -74,8 +79,6 @@ private: char *fileName; cRecordingInfo(const cChannel *Channel = NULL, const cEvent *Event = NULL); bool Read(FILE *f); @@ -22,7 +23,7 @@ index 1ba16bdc..9988ca84 100644 public: cRecordingInfo(const char *FileName); ~cRecordingInfo(); -@@ -93,6 +95,8 @@ public: +@@ -93,6 +96,8 @@ public: bool Write(FILE *f, const char *Prefix = "") const; bool Read(void); bool Write(void) const; @@ -31,7 +32,7 @@ index 1ba16bdc..9988ca84 100644 }; class cRecording : public cListObject { -@@ -150,7 +154,7 @@ public: +@@ -150,7 +155,7 @@ public: ///< Returns the full path name to the recording directory, including the ///< video directory and the actual '*.rec'. For disk file access use. const char *Title(char Delimiter = ' ', bool NewIndicator = false, int Level = -1) const; @@ -41,33 +42,21 @@ index 1ba16bdc..9988ca84 100644 int HierarchyLevels(void) const; void ResetResume(void) const; diff --git a/recording.c b/recording.c -index 6bfbcff1..9ef8a9e1 100644 +index 17467e36..a7f08a26 100644 --- a/recording.c +++ b/recording.c -@@ -431,11 +431,26 @@ cRecordingInfo::~cRecordingInfo() +@@ -430,11 +430,11 @@ cRecordingInfo::~cRecordingInfo() + void cRecordingInfo::SetData(const char *Title, const char *ShortText, const char *Description) { - if (!isempty(Title)) -+ { -+ if (!strcmp(Title, "-")) -+ ((cEvent *)event)->SetTitle(""); -+ else +- if (!isempty(Title)) ++ if (Title) ((cEvent *)event)->SetTitle(Title); -+ } - if (!isempty(ShortText)) -+ { -+ if (!strcmp(ShortText, "-")) -+ ((cEvent *)event)->SetShortText(""); -+ else +- if (!isempty(ShortText)) ++ if (ShortText) ((cEvent *)event)->SetShortText(ShortText); -+ } - if (!isempty(Description)) -+ { -+ if (!strcmp(Description, "-")) -+ ((cEvent *)event)->SetDescription(""); -+ else +- if (!isempty(Description)) ++ if (Description) ((cEvent *)event)->SetDescription(Description); -+ } } - - void cRecordingInfo::SetAux(const char *Aux) + From cc5238866194254eb3ebdea49787bc8c047f9c2e Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sat, 23 Jan 2021 09:55:01 +0100 Subject: [PATCH 3/5] Add modified vdr-2.4.4-RecordingInfo.patch for extrecmenung plugin --- vdr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr.spec b/vdr.spec index 2ca1c86..db6f0af 100644 --- a/vdr.spec +++ b/vdr.spec @@ -30,7 +30,7 @@ Name: vdr Version: 2.4.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Video Disk Recorder License: GPLv2+ @@ -550,6 +550,9 @@ useradd -r -g %{vdr_group} -d %{vardir} -s /sbin/nologin -M -N \ %changelog +* Fri Jan 22 2021 Martin Gansser - 2.4.4-3 +- Add modified vdr-2.4.4-RecordingInfo.patch for extrecmenung plugin + * Sat Jan 16 2021 Martin Gansser - 2.4.4-2 - Add vdr-2.4.4-RecordingInfo.patch for extrecmenung plugin - Add mcli to sysconfig's VDR_PLUGIN_ORDER From 87e04feb1ce5154e042d027c0a983dd49f94bc18 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Tue, 9 Feb 2021 09:42:15 +0100 Subject: [PATCH 4/5] Add systemd watchdog support in to unit file vdr.service Add systemctl daemon-reload, because after every update of vdr, it claims about missing systemd daemon-reload, fixes (BZ#1926084) --- vdr.service | 1 + vdr.spec | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/vdr.service b/vdr.service index e6cd3e6..74e221c 100644 --- a/vdr.service +++ b/vdr.service @@ -11,6 +11,7 @@ Type=notify ExecStartPre=/usr/lib/vdr/bin/vdr-check-setup ExecStart=/usr/sbin/runvdr ExecStop=-/usr/lib/vdr/bin/vdr-set-wakeup +WatchdogSec=60 Restart=on-failure RestartPreventExitStatus=2 diff --git a/vdr.spec b/vdr.spec index db6f0af..dfb3465 100644 --- a/vdr.spec +++ b/vdr.spec @@ -30,7 +30,7 @@ Name: vdr Version: 2.4.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Video Disk Recorder License: GPLv2+ @@ -550,6 +550,11 @@ useradd -r -g %{vdr_group} -d %{vardir} -s /sbin/nologin -M -N \ %changelog +* Tue Feb 09 2021 Martin Gansser - 2.4.4-4 +- Add systemd watchdog support in to unit file vdr.service +- Add systemctl daemon-reload, because after every update of vdr, + it claims about missing systemd daemon-reload, fixes (BZ#1926084) + * Fri Jan 22 2021 Martin Gansser - 2.4.4-3 - Add modified vdr-2.4.4-RecordingInfo.patch for extrecmenung plugin From adb20b2b7f5d86e9b8017259469b49b97b5bd2e1 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Tue, 9 Feb 2021 09:49:22 +0100 Subject: [PATCH 5/5] Add systemd watchdog support in to unit file vdr.service Add systemctl daemon-reload, because after every update of vdr, it claims about missing systemd daemon-reload, fixes (BZ#1926084) --- vdr.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vdr.spec b/vdr.spec index dfb3465..6bd6a12 100644 --- a/vdr.spec +++ b/vdr.spec @@ -450,6 +450,7 @@ useradd -r -g %{vdr_group} -d %{vardir} -s /sbin/nologin -M -N \ %post %systemd_post %{name}.service +systemctl daemon-reload %preun %systemd_preun %{name}.service