vdr: update to 2.4.4

This commit is contained in:
CvH 2020-11-01 20:18:38 +01:00
parent 8f34ea5db0
commit 7cfef2ad29
4 changed files with 6 additions and 36 deletions

View File

@ -4,8 +4,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="vdr"
PKG_VERSION="2.4.1"
PKG_SHA256="25c3f835c4f3ff92cd2db10c004439ef22c2e895193c77fbe8cc7eac4858a1dc"
PKG_VERSION="2.4.4"
PKG_SHA256="8a04d12af73d15daed2f9864a9ca0cfb25400da388c41e8476048c61b7ee2c5a"
PKG_LICENSE="GPL"
PKG_SITE="http://www.tvdr.de"
PKG_URL="http://ftp.tvdr.de/vdr-$PKG_VERSION.tar.bz2"

View File

@ -3,7 +3,7 @@ Subject: [PATCH] decrease channels.conf autosave delay
--- a/vdr.c
+++ b/vdr.c
@@ -74,7 +74,7 @@
@@ -80,7 +80,7 @@
#define SHUTDOWNCANCELPROMPT 5 // seconds to wait in user prompt to allow canceling shutdown
#define RESTARTCANCELPROMPT 5 // seconds to wait in user prompt before restarting on SIGHUP
#define MANUALSTART 600 // seconds the next timer must be in the future to assume manual start

View File

@ -3,7 +3,7 @@ ERROR: no OSD provider available - using dummy OSD!
--- a/osd.c
+++ b/osd.c
@@ -2027,8 +2027,6 @@ cOsd *cOsdProvider::NewOsd(int Left, int Top, uint Level)
@@ -2029,8 +2029,6 @@ cOsd *cOsdProvider::NewOsd(int Left, int Top, uint Level)
}
return Osd;
}
@ -14,7 +14,7 @@ ERROR: no OSD provider available - using dummy OSD!
--- a/vdr.c
+++ b/vdr.c
@@ -765,12 +765,6 @@ int main(int argc, char *argv[])
@@ -784,11 +784,6 @@ int main(int argc, char *argv[])
Folders.Load(AddDirectory(ConfigDirectory, "folders.conf"));
CamResponsesLoad(AddDirectory(ConfigDirectory, "camresponses.conf"), true);
@ -23,7 +23,5 @@ ERROR: no OSD provider available - using dummy OSD!
- fprintf(stderr, "vdr: %s\n", msg);
- esyslog("ERROR: %s", msg);
- }
-
// Recordings:
cRecordings::Update();
// Recordings:

View File

@ -1,28 +0,0 @@
From 0cf5d433583ead5a634f7bea9e08236bc1805318 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Mon, 3 Feb 2020 23:41:55 +0000
Subject: [PATCH] replace obsolete stime after glibc-2.31
---
eit.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/eit.c b/eit.c
index 50d8229..60c295d 100644
--- a/eit.c
+++ b/eit.c
@@ -391,7 +391,10 @@ cTDT::cTDT(const u_char *Data)
if (abs(diff) > MAX_TIME_DIFF) {
mutex.Lock();
if (abs(diff) > MAX_ADJ_DIFF) {
- if (stime(&dvbtim) == 0)
+ struct timespec ts;
+ ts.tv_sec = dvbtim;
+ ts.tv_nsec = 0;
+ if (clock_settime(CLOCK_REALTIME, &ts) == 0)
isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(dvbtim), dvbtim);
else
esyslog("ERROR while setting system time: %m");
--
2.20.1