vdr: update to 2.4.7

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/rootfiles/packages/aarch64/vdr_dvbapi b/config/rootfiles/packages/aarch64/vdr_dvbapi
index 4c5b98c94aa91a11f7bcc9b63294fce26186955e..b874d9e7e92bc9c3be7bf4b416d27988a5a9b74c 100644 (file)
--- 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 4c5b98c94aa91a11f7bcc9b63294fce26186955e..b874d9e7e92bc9c3be7bf4b416d27988a5a9b74c 100644 (file)
--- 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 0545463fa4a43b042c75b52bf521d9db83808fd4..011e69fa3b4a2706d8e078d8360508077d3ff958 100644 (file)
--- 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 9c30b1a83ab222dea90b8431f469bba898a2d717..4f8389cc90ef669a90db747090cb0064763c8f31 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.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 9cbe89afacb7b1527eb3acc4dc102a25e6c3d272..9143aec024e8068fbe8cf007a119de179e92a010 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.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 c7edbb1800d1058ac1c4ce98dc4c64531a4d2d46..3cd8440f0e2e85fa310447da02d2cc04152af6ed 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.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 4c5b98c94aa91a11f7bcc9b63294fce26186955e..b874d9e7e92bc9c3be7bf4b416d27988a5a9b74c 100644 (file)
--- 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 a3eebfacd793eb3e658f0184b61ec6a49ab439e8..ad68636bf94edeaed48474de8d7eed7fbe2dba21 100644 (file)
--- a/lfs/vdr
+++ b/lfs/vdr
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # 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 6be8cbe91b9b69a723cc2517c439384c12acd165..adf60b39d59cfd2012771843901cc218c18bc041 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    = 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 2fc83dc965f87e43991ac73524d60fbb352db084..40b7811aa47b312c9d6479bcec18faf532cec8fb 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    = 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 a719336dd5c24ef9ec8e423208a57e24b99ad4d6..f2a88f87b658ab34e3e04aee47f2e01a4c0d0105 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    = 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 c3c8d04ca599b82ca7d68560a74b04a247dd8349..58c5a6438901227f65a0952c6046df0c48eb2ca1 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    = 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)