vdr: update to 2.4.4

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/packages/vdr_eepg b/config/rootfiles/packages/vdr_eepg
index 8355a461439b59d9756b686b754a5ab114acf099..ffbe460786da4f073afe9ad5fab6d6fd8fede77d 100644 (file)
--- a/config/rootfiles/packages/vdr_eepg
+++ b/config/rootfiles/packages/vdr_eepg
@@ -1,2 +1,2 @@
 etc/vdr/plugins/eepg
-usr/lib/vdr/libvdr-eepg.so.2.4.1
+usr/lib/vdr/libvdr-eepg.so.2.4.4

diff --git a/config/rootfiles/packages/vdr_epgsearch b/config/rootfiles/packages/vdr_epgsearch
index 2402626dded89e8d908cdf11912ea78ebaff2bd5..30f7e088bba7036ea21a618b7712ac9dae38facb 100644 (file)
--- a/config/rootfiles/packages/vdr_epgsearch
+++ b/config/rootfiles/packages/vdr_epgsearch
@@ -5,10 +5,10 @@ etc/sysconfig/vdr-plugins.d/quickepgsearch.conf
 etc/vdr/plugins/epgsearch
 etc/vdr/plugins/epgsearch/conf.d
 usr/bin/createcats
-usr/lib/vdr/libvdr-conflictcheckonly.so.2.4.1
-usr/lib/vdr/libvdr-epgsearch.so.2.4.1
-usr/lib/vdr/libvdr-epgsearchonly.so.2.4.1
-usr/lib/vdr/libvdr-quickepgsearch.so.2.4.1
+usr/lib/vdr/libvdr-conflictcheckonly.so.2.4.4
+usr/lib/vdr/libvdr-epgsearch.so.2.4.4
+usr/lib/vdr/libvdr-epgsearchonly.so.2.4.4
+usr/lib/vdr/libvdr-quickepgsearch.so.2.4.4
 #var/lib/vdr
 #var/lib/vdr/data
 var/lib/vdr/data/epgsearch

diff --git a/config/rootfiles/packages/vdr_streamdev b/config/rootfiles/packages/vdr_streamdev
index bd17db85cdb04849d36bbc5d13fcc9549d926317..6bc36f6d271634d0489c339dc99bd90bb18230c4 100644 (file)
--- a/config/rootfiles/packages/vdr_streamdev
+++ b/config/rootfiles/packages/vdr_streamdev
@@ -4,4 +4,4 @@ etc/vdr/plugins/streamdev-server
 etc/vdr/plugins/streamdev-server/streamdevhosts.conf
 #usr/lib/vdr/bin
 usr/lib/vdr/bin/externremux.sh
-usr/lib/vdr/libvdr-streamdev-server.so.2.4.1
+usr/lib/vdr/libvdr-streamdev-server.so.2.4.4

diff --git a/lfs/vdr b/lfs/vdr
index e40174e24237efa982f9f288b40c8bc8083830d4..836983f508d1bb74f18747f5188e81c23bb2ebe0 100644 (file)
--- a/lfs/vdr
+++ b/lfs/vdr
@@ -24,11 +24,11 @@
 
 include Config
 
-VER        = 2.4.1
+VER        = 2.4.4
 
 # VDRPLUGVER must match with APIVERSION in config.h
 # after change this update also all vdr plugins
-VDRPLUGVER = 2.4.1
+VDRPLUGVER = 2.4.4
 
 THISAPP    = vdr-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -37,7 +37,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr
-PAK_VER    = 11
+PAK_VER    = 12
 
 DEPS       = vdr_streamdev
 
@@ -65,7 +65,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b2897fe6b6e6711d512a69642b1b8ec1
+$(DL_FILE)_MD5 = ccf724c157740b2b153ca41ad38f1217
 
 install : $(TARGET)
 
@@ -98,8 +98,6 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       # stime was removed from glibc with version 2.31
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vdr/vdr-2.4.1_replace_stime.patch
 
        # Compile main package.
        cd $(DIR_APP) && make $(MAKE_OPTIONS) $(MAKETUNING) vdr include-dir

diff --git a/lfs/vdr_dvbapi b/lfs/vdr_dvbapi
index 8be532f57ca14976fac21eda8022b428f80f913a..6d6dcf36a92f4db6e2792f0c3ab1411461aa0786 100644 (file)
--- a/lfs/vdr_dvbapi
+++ b/lfs/vdr_dvbapi
@@ -33,11 +33,11 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr_dvbapi
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       =
 
-VDRPLUGVER = 2.4.1
+VDRPLUGVER = 2.4.4
 
 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 CFLAGS    += $(EXTRA_FLAGS)

diff --git a/lfs/vdr_eepg b/lfs/vdr_eepg
index 34ecdb30c4b808f7d475b9a92235d6b60b3413cc..8a165012defcf5dfcec949ffea1090c537aa6800 100644 (file)
--- a/lfs/vdr_eepg
+++ b/lfs/vdr_eepg
@@ -36,11 +36,11 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr_eepg
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       =
 
-VDRPLUGVER = 2.4.1
+VDRPLUGVER = 2.4.4
 
 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 CFLAGS    += $(EXTRA_FLAGS)

diff --git a/lfs/vdr_epgsearch b/lfs/vdr_epgsearch
index 607030d30319c72f48e69730e8793e816fb2ced1..9d1a9afc80312941147f59f019978a7211e7d2a6 100644 (file)
--- a/lfs/vdr_epgsearch
+++ b/lfs/vdr_epgsearch
@@ -33,11 +33,11 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/vdr-plugin-epgsearch
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr_epgsearch
-PAK_VER    = 8
+PAK_VER    = 9
 
 DEPS       =
 
-VDRPLUGVER = 2.4.1
+VDRPLUGVER = 2.4.4
 
 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 CFLAGS    += $(EXTRA_FLAGS)

diff --git a/lfs/vdr_streamdev b/lfs/vdr_streamdev
index 254203c235162d0a8a3059fb46fae43e09ddfc6e..b884e032855f05f335e2d4a694d8bba542f2980c 100644 (file)
--- a/lfs/vdr_streamdev
+++ b/lfs/vdr_streamdev
@@ -34,11 +34,11 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr_streamdev
-PAK_VER    = 3
+PAK_VER    = 4
 
 DEPS       =
 
-VDRPLUGVER = 2.4.1
+VDRPLUGVER = 2.4.4
 
 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 CFLAGS    += $(EXTRA_FLAGS)

diff --git a/src/patches/vdr/vdr-2.4.1_replace_stime.patch b/src/patches/vdr/vdr-2.4.1_replace_stime.patch
deleted file mode 100644 (file)
index e0d1c1d..0000000
--- a/src/patches/vdr/vdr-2.4.1_replace_stime.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From dcfa8ba29f4c95edbdceb0f1bbae0e62fa40c4e2 Mon Sep 17 00:00:00 2001
-From: Manuel Reimer <manuel.reimer@gmx.de>
-Date: Sat, 14 Dec 2019 12:01:13 +0100
-Subject: [PATCH 1/2] Replace obsolete stime() function with clock_settime()
-
----
- eit.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/eit.c b/eit.c
-index 50d8229..82294dc 100644
---- a/eit.c
-+++ b/eit.c
-@@ -391,7 +391,9 @@ cTDT::cTDT(const u_char *Data)
-   if (abs(diff) > MAX_TIME_DIFF) {
-      mutex.Lock();
-      if (abs(diff) > MAX_ADJ_DIFF) {
--        if (stime(&dvbtim) == 0)
-+        timespec ts = {0};
-+        ts.tv_sec = dvbtim;
-+        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");
-
-From 3395a81a07416f54b0aa94ba709b902d72dacce7 Mon Sep 17 00:00:00 2001
-From: Manuel Reimer <manuel.reimer@gmx.de>
-Date: Sun, 15 Dec 2019 11:26:42 +0100
-Subject: [PATCH 2/2] Fix "struct timespec has more than one member" warning
-
----
- eit.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/eit.c b/eit.c
-index 82294dc..098e627 100644
---- a/eit.c
-+++ b/eit.c
-@@ -391,7 +391,7 @@ cTDT::cTDT(const u_char *Data)
-   if (abs(diff) > MAX_TIME_DIFF) {
-      mutex.Lock();
-      if (abs(diff) > MAX_ADJ_DIFF) {
--        timespec ts = {0};
-+        timespec ts = {};
-         ts.tv_sec = dvbtim;
-         if (clock_settime(CLOCK_REALTIME, &ts) == 0)
-            isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(dvbtim), dvbtim);