From f56e93b9b43d21885b09ecc7c451a63693ca890d Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 21 Jul 2021 21:49:19 +0200 Subject: [PATCH] vdr: update to 2.4.7 Signed-off-by: Arne Fitzenreiter --- config/rootfiles/packages/aarch64/vdr_dvbapi | 2 +- config/rootfiles/packages/armv6l/vdr_dvbapi | 2 +- config/rootfiles/packages/i586/vdr_dvbapi | 4 ++-- config/rootfiles/packages/vdr_eepg | 2 +- config/rootfiles/packages/vdr_epgsearch | 8 ++++---- config/rootfiles/packages/vdr_streamdev | 2 +- config/rootfiles/packages/x86_64/vdr_dvbapi | 2 +- lfs/vdr | 10 +++++----- lfs/vdr_dvbapi | 4 ++-- lfs/vdr_eepg | 4 ++-- lfs/vdr_epgsearch | 4 ++-- lfs/vdr_streamdev | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/config/rootfiles/packages/aarch64/vdr_dvbapi b/config/rootfiles/packages/aarch64/vdr_dvbapi index 4c5b98c94a..b874d9e7e9 100644 --- a/config/rootfiles/packages/aarch64/vdr_dvbapi +++ b/config/rootfiles/packages/aarch64/vdr_dvbapi @@ -1,3 +1,3 @@ etc/sysconfig/vdr-plugins.d/dvbapi.conf etc/vdr/plugins/dvbapi -usr/lib/vdr/libvdr-dvbapi.so.2.4.3 +usr/lib/vdr/libvdr-dvbapi.so.2.4.7 diff --git a/config/rootfiles/packages/armv6l/vdr_dvbapi b/config/rootfiles/packages/armv6l/vdr_dvbapi index 4c5b98c94a..b874d9e7e9 100644 --- a/config/rootfiles/packages/armv6l/vdr_dvbapi +++ b/config/rootfiles/packages/armv6l/vdr_dvbapi @@ -1,3 +1,3 @@ etc/sysconfig/vdr-plugins.d/dvbapi.conf etc/vdr/plugins/dvbapi -usr/lib/vdr/libvdr-dvbapi.so.2.4.3 +usr/lib/vdr/libvdr-dvbapi.so.2.4.7 diff --git a/config/rootfiles/packages/i586/vdr_dvbapi b/config/rootfiles/packages/i586/vdr_dvbapi index 0545463fa4..011e69fa3b 100644 --- a/config/rootfiles/packages/i586/vdr_dvbapi +++ b/config/rootfiles/packages/i586/vdr_dvbapi @@ -1,4 +1,4 @@ etc/sysconfig/vdr-plugins.d/dvbapi.conf etc/vdr/plugins/dvbapi -usr/lib/vdr/libvdr-dvbapi.so.2.4.3 -usr/lib/vdr/libvdr-dvbapi.so.2.4.3-sse +usr/lib/vdr/libvdr-dvbapi.so.2.4.7 +usr/lib/vdr/libvdr-dvbapi.so.2.4.7-sse diff --git a/config/rootfiles/packages/vdr_eepg b/config/rootfiles/packages/vdr_eepg index 9c30b1a83a..4f8389cc90 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.3 +usr/lib/vdr/libvdr-eepg.so.2.4.7 diff --git a/config/rootfiles/packages/vdr_epgsearch b/config/rootfiles/packages/vdr_epgsearch index 9cbe89afac..9143aec024 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.3 -usr/lib/vdr/libvdr-epgsearch.so.2.4.3 -usr/lib/vdr/libvdr-epgsearchonly.so.2.4.3 -usr/lib/vdr/libvdr-quickepgsearch.so.2.4.3 +usr/lib/vdr/libvdr-conflictcheckonly.so.2.4.7 +usr/lib/vdr/libvdr-epgsearch.so.2.4.7 +usr/lib/vdr/libvdr-epgsearchonly.so.2.4.7 +usr/lib/vdr/libvdr-quickepgsearch.so.2.4.7 #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 c7edbb1800..3cd8440f0e 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.3 +usr/lib/vdr/libvdr-streamdev-server.so.2.4.7 diff --git a/config/rootfiles/packages/x86_64/vdr_dvbapi b/config/rootfiles/packages/x86_64/vdr_dvbapi index 4c5b98c94a..b874d9e7e9 100644 --- a/config/rootfiles/packages/x86_64/vdr_dvbapi +++ b/config/rootfiles/packages/x86_64/vdr_dvbapi @@ -1,3 +1,3 @@ etc/sysconfig/vdr-plugins.d/dvbapi.conf etc/vdr/plugins/dvbapi -usr/lib/vdr/libvdr-dvbapi.so.2.4.3 +usr/lib/vdr/libvdr-dvbapi.so.2.4.7 diff --git a/lfs/vdr b/lfs/vdr index a3eebfacd7..ad68636bf9 100644 --- a/lfs/vdr +++ b/lfs/vdr @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team # +# Copyright (C) 2007-2021 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,11 +24,11 @@ include Config -VER = 2.4.4 +VER = 2.4.7 # VDRPLUGVER must match with APIVERSION! in config.h # after change this update also all vdr plugins -VDRPLUGVER = 2.4.3 +VDRPLUGVER = 2.4.7 THISAPP = vdr-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -67,7 +67,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ccf724c157740b2b153ca41ad38f1217 +$(DL_FILE)_MD5 = 24ff672a7c73118a912bd8c6cdd0aae4 install : $(TARGET) @@ -101,7 +101,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vdr-2.4-gcc-11.patch +# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vdr-2.4-gcc-11.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 6be8cbe91b..adf60b39d5 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 = 4 +PAK_VER = 5 DEPS = -VDRPLUGVER = 2.4.3 +VDRPLUGVER = 2.4.7 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 2fc83dc965..40b7811aa4 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 = 4 +PAK_VER = 5 DEPS = -VDRPLUGVER = 2.4.3 +VDRPLUGVER = 2.4.7 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 a719336dd5..f2a88f87b6 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 = 10 +PAK_VER = 11 DEPS = -VDRPLUGVER = 2.4.3 +VDRPLUGVER = 2.4.7 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 c3c8d04ca5..58c5a64389 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 = 5 +PAK_VER = 6 DEPS = -VDRPLUGVER = 2.4.3 +VDRPLUGVER = 2.4.7 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE CFLAGS += $(EXTRA_FLAGS) -- 2.39.5