From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arne Fitzenreiter To: development@lists.ipfire.org Subject: [PATCH] vdr: update to 2.4.4 Date: Mon, 23 Nov 2020 18:27:46 +0100 Message-ID: <20201123172746.25850-1-arne_f@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8801661763059246620==" List-Id: --===============8801661763059246620== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Arne Fitzenreiter --- 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 diff --git a/config/rootfiles/packages/vdr_eepg b/config/rootfiles/packages/v= dr_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/packa= ges/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/packa= ges/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 @@ =20 include Config =20 -VER =3D 2.4.1 +VER =3D 2.4.4 =20 # VDRPLUGVER must match with APIVERSION in config.h # after change this update also all vdr plugins -VDRPLUGVER =3D 2.4.1 +VDRPLUGVER =3D 2.4.4 =20 THISAPP =3D vdr-$(VER) DL_FILE =3D $(THISAPP).tar.bz2 @@ -37,7 +37,7 @@ DL_FROM =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) PROG =3D vdr -PAK_VER =3D 11 +PAK_VER =3D 12 =20 DEPS =3D vdr_streamdev =20 @@ -65,7 +65,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D b2897fe6b6e6711d512a69642b1b8ec1 +$(DL_FILE)_MD5 =3D ccf724c157740b2b153ca41ad38f1217 =20 install : $(TARGET) =20 @@ -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 =20 # 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 =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) PROG =3D vdr_dvbapi -PAK_VER =3D 2 +PAK_VER =3D 3 =20 DEPS =3D =20 -VDRPLUGVER =3D 2.4.1 +VDRPLUGVER =3D 2.4.4 =20 EXTRA_FLAGS=3D -D_FILE_OFFSET_BITS=3D64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_S= OURCE CFLAGS +=3D $(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 =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) PROG =3D vdr_eepg -PAK_VER =3D 2 +PAK_VER =3D 3 =20 DEPS =3D =20 -VDRPLUGVER =3D 2.4.1 +VDRPLUGVER =3D 2.4.4 =20 EXTRA_FLAGS=3D -D_FILE_OFFSET_BITS=3D64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_S= OURCE CFLAGS +=3D $(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 =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/vdr-plugin-epgsearch TARGET =3D $(DIR_INFO)/$(THISAPP) PROG =3D vdr_epgsearch -PAK_VER =3D 8 +PAK_VER =3D 9 =20 DEPS =3D =20 -VDRPLUGVER =3D 2.4.1 +VDRPLUGVER =3D 2.4.4 =20 EXTRA_FLAGS=3D -D_FILE_OFFSET_BITS=3D64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_S= OURCE CFLAGS +=3D $(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 =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) PROG =3D vdr_streamdev -PAK_VER =3D 3 +PAK_VER =3D 4 =20 DEPS =3D =20 -VDRPLUGVER =3D 2.4.1 +VDRPLUGVER =3D 2.4.4 =20 EXTRA_FLAGS=3D -D_FILE_OFFSET_BITS=3D64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_S= OURCE CFLAGS +=3D $(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 -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) =3D=3D 0) -+ timespec ts =3D {0}; -+ ts.tv_sec =3D dvbtim; -+ if (clock_settime(CLOCK_REALTIME, &ts) =3D=3D 0) - isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeTo= String(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 -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 =3D {0}; -+ timespec ts =3D {}; - ts.tv_sec =3D dvbtim; - if (clock_settime(CLOCK_REALTIME, &ts) =3D=3D 0) - isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeTo= String(loctim), loctim, *TimeToString(dvbtim), dvbtim); --=20 2.17.1 --===============8801661763059246620==--