X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fvdr;h=e40174e24237efa982f9f288b40c8bc8083830d4;hb=391540d9d82b42042756c67b2f5676d799d92f59;hp=161b04ee1e8cd3446b7d51cca0baeb9ba85bce52;hpb=47a83092b5a6f2fa13d1c95de75b7bea4eb90da2;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/vdr b/lfs/vdr
index 161b04ee1e..e40174e242 100644
--- a/lfs/vdr
+++ b/lfs/vdr
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  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.0.3
+VER        = 2.4.1
 
 # VDRPLUGVER must match with APIVERSION in config.h
 # after change this update also all vdr plugins
-VDRPLUGVER = 2.0.0
+VDRPLUGVER = 2.4.1
 
 THISAPP    = vdr-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -37,9 +37,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr
-PAK_VER    = 8
+PAK_VER    = 11
 
-DEPS       = "vdr_streamdev"
+DEPS       = vdr_streamdev
 
 MAKE_OPTIONS = \
 	PREFIX=/usr \
@@ -63,9 +63,9 @@ MAKE_OPTIONS = \
 
 objects = $(DL_FILE)
 
-$(DL_FILE)  = $(DL_FROM)/$(DL_FILE)
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5  = dd8fb1642bdfa7feb0e9a8ae41e9ef2f
+$(DL_FILE)_MD5 = b2897fe6b6e6711d512a69642b1b8ec1
 
 install : $(TARGET)
 
@@ -98,6 +98,8 @@ $(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
@@ -131,6 +133,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	ln -svf ../../include/vdr/config.h /usr/lib/vdr/config.h
 	ln -svf ../../include/vdr/device.h /usr/lib/vdr/device.h
 
+	#install initscripts
+	$(call INSTALL_INITSCRIPT,vdr)
+
 	# Install start links and backup include file.
 	ln -sf ../init.d/vdr /etc/rc.d/rc3.d/S60vdr
 	ln -sf ../init.d/vdr /etc/rc.d/rc0.d/K40vdr