X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fvdr;h=f82df19feacb0d69d8467595d503aeefa9ddc0ca;hp=f881134dc2df5976e93d12ba2b353b4979b05e13;hb=b15b70bc6b6b5f6d8b62e5b730b68d86f59810e6;hpb=d2be7786f155aeaff75bccb47a6be8b8c1ed4dca

diff --git a/lfs/vdr b/lfs/vdr
index f881134dc2..f82df19fea 100644
--- a/lfs/vdr
+++ b/lfs/vdr
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  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,7 +24,12 @@
 
 include Config
 
-VER        = 1.7.41
+VER        = 2.0.5
+
+# VDRPLUGVER must match with APIVERSION in config.h
+# after change this update also all vdr plugins
+VDRPLUGVER = 2.0.0
+
 THISAPP    = vdr-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 
@@ -32,16 +37,18 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr
-PAK_VER    = 6
+PAK_VER    = 9
+
+SUP_ARCH   = none
 
-DEPS       = "freefont"
+DEPS       = "vdr_streamdev"
 
 MAKE_OPTIONS = \
 	PREFIX=/usr \
 	BINDIR=/usr/bin \
 	CACHEDIR=/var/cache/vdr \
 	CONFDIR=/etc/vdr \
-	INCDIR=/usr/include/vdr \
+	INCDIR=/usr/include \
 	LIBDIR=/usr/lib/vdr \
 	LOCDIR=/usr/share/locale \
 	MANDIR=/usr/share/man \
@@ -58,9 +65,9 @@ MAKE_OPTIONS = \
 
 objects = $(DL_FILE)
 
-$(DL_FILE)  = $(DL_FROM)/$(DL_FILE)
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5  = c7928bff45fa1c0e6dadf2c0a5adf94b
+$(DL_FILE)_MD5 = f58b9836a60440fde84480a2e37ee91d
 
 install : $(TARGET)
 
@@ -109,15 +116,26 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && make install-bin install-dirs install-includes $(MAKE_OPTIONS)
 	mv -v /usr/bin/vdr /usr/sbin/vdr
 
-	sed -e "s/VDR_PLUGIN_VERSION/$(VER)/" \
+	sed -e "s/VDR_PLUGIN_VERSION/$(VDRPLUGVER)/" \
 		< $(DIR_SRC)/config/vdr/runvdr > /usr/sbin/runvdr
 	chmod 755 /usr/sbin/runvdr
 
 	# Install configuration.
 	mkdir -pv /etc/vdr
 	mkdir -pv /etc/sysconfig/vdr-plugins.d
+	cd $(DIR_APP) && install -m 644 $(DIR_SRC)/config/vdr/vdr.sysconfig \
+		/etc/sysconfig/vdr
 	cd $(DIR_APP) && install -m 644 *.conf /etc/vdr
 
+	# Link development files.
+	mkdir -pv /usr/lib/vdr
+	cd $(DIR_APP) && cp -vf Make.global /usr/lib/vdr
+	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