X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fvdr;h=b7ed2c3efb72c73a3f9c8554bea2cd5ef16d45fe;hp=01f592ae1540adade578b0ec81746d572950416b;hb=fa49910fa8cb713c9df965891aff257e6fd2832e;hpb=75a16ec4855e6bf780e7f39d4a4c75ed2fbf544a

diff --git a/lfs/vdr b/lfs/vdr
index 01f592ae1..b7ed2c3ef 100644
--- a/lfs/vdr
+++ b/lfs/vdr
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2013  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,34 +24,48 @@
 
 include Config
 
-VER        = 1.6.0
+VER        = 2.0.4
+
+# 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
-DL_FILE1   = vdr-streamdev-20080325-http-0_4.tgz
-DL_FILE2   = vdr-softdevice-cvs-2008-04-16.tar.bz2
-
 
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr
-PAK_VER    = 1
-
-DEPS       = "freefont fontconfig"
+PAK_VER    = 9
+
+DEPS       = "vdr_streamdev"
+
+MAKE_OPTIONS = \
+	PREFIX=/usr \
+	BINDIR=/usr/bin \
+	CACHEDIR=/var/cache/vdr \
+	CONFDIR=/etc/vdr \
+	INCDIR=/usr/include \
+	LIBDIR=/usr/lib/vdr \
+	LOCDIR=/usr/share/locale \
+	MANDIR=/usr/share/man \
+	RESDIR=/usr/share/vdr \
+	RUNDIR=/var/run \
+	VARDIR=/var \
+	VIDEODIR=/var/video \
+	CFLAGS="$(CFLAGS)" \
+	CXXFLAGS="$(CXXFLAGS)"
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) $(DL_FILE1) $(DL_FILE2)
+objects = $(DL_FILE)
 
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE1) = $(DL_FROM)/$(DL_FILE1)
-$(DL_FILE2) = $(DL_FROM)/$(DL_FILE2)
+$(DL_FILE)  = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 76f4ebe6525a35e33313d27a3f8e80c0
-$(DL_FILE1)_MD5 = 874026c643601692077c42ee7a70b720
-$(DL_FILE2)_MD5 = 2b2eec38a653c205967849efb907b707
+$(DL_FILE)_MD5  = 8effb19fe09eb6c057ce354fe8f6be9f
 
 install : $(TARGET)
 
@@ -84,16 +98,45 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP)/PLUGINS/src && tar zxf $(DIR_DL)/$(DL_FILE1)
-	cd $(DIR_APP)/PLUGINS/src && ln -s streamdev-0.3.3-20080325-http streamdev
-	cd $(DIR_APP)/PLUGINS/src && tar jxf $(DIR_DL)/$(DL_FILE2)
-	cd $(DIR_APP)/PLUGINS/src && ln -s softdevice-cvs-2008-04-16 softdevice
-	cd $(DIR_APP)/PLUGINS/src/softdevice && ./configure
-	cd $(DIR_APP) && make VIDEODIR=/var/video plugins $(MAKETUNING)
-	cd $(DIR_APP) && make VIDEODIR=/var/video vdr $(MAKETUNING)
-	cd $(DIR_APP) && make PREFIX=. DESTDIR=/opt/vdr/ install
-	-mkdir -p /opt/vdr/etc
-	cd $(DIR_APP) && install *.conf /opt/vdr/etc/
-	cp -Rvf $(DIR_SRC)/config/vdr /opt
+
+	# Compile main package.
+	cd $(DIR_APP) && make $(MAKE_OPTIONS) $(MAKETUNING) vdr include-dir
+
+	# Compile bundled plugins.
+	#cd $(DIR_APP) && for plugin in ...; do \
+	#	make $(MAKETUNING) -C PLUGINS/src/$$plugin VDRDIR=$(DIR_APP) \
+	#		CFLAGS="$(CFLAGS) -I$(DIR_APP)/include" \
+	#		CXXFLAGS="$(CXXFLAGS) -I$(DIR_APP)/include" \
+	#		PLGCFG=$(DIR_APP)/plugins.mk all || exit 1; \
+	#done
+
+	# Install main package.
+	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/$(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 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
+	ln -sf ../init.d/vdr /etc/rc.d/rc6.d/K40vdr
+	install -v -m 644 $(DIR_SRC)/config/backup/includes/vdr \
+		/var/ipfire/backup/addons/includes/vdr
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)