This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via e4f287a268c490e393e2e7ffd5bdd8246c3d3f76 (commit) from 2cb220fd3cbff4382656b30d02facdd9df81775e (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit e4f287a268c490e393e2e7ffd5bdd8246c3d3f76 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Nov 23 18:27:46 2020 +0100
vdr: update to 2.4.4
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/packages/vdr_eepg | 2 +- config/rootfiles/packages/vdr_epgsearch | 8 ++--- config/rootfiles/packages/vdr_streamdev | 2 +- lfs/vdr | 10 +++--- lfs/vdr_dvbapi | 4 +-- lfs/vdr_eepg | 4 +-- lfs/vdr_epgsearch | 4 +-- lfs/vdr_streamdev | 4 +-- src/patches/vdr/vdr-2.4.1_replace_stime.patch | 47 --------------------------- 9 files changed, 18 insertions(+), 67 deletions(-) delete mode 100644 src/patches/vdr/vdr-2.4.1_replace_stime.patch
Difference in files: diff --git a/config/rootfiles/packages/vdr_eepg b/config/rootfiles/packages/vdr_eepg index 8355a4614..ffbe46078 100644 --- 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 2402626dd..30f7e088b 100644 --- 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 bd17db85c..6bc36f6d2 100644 --- 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 e40174e24..836983f50 100644 --- 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 8be532f57..6d6dcf36a 100644 --- 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 34ecdb30c..8a165012d 100644 --- 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 607030d30..9d1a9afc8 100644 --- 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 254203c23..b884e0328 100644 --- 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 index e0d1c1def..000000000 --- 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);
hooks/post-receive -- IPFire 2.x development tree