Merge remote-tracking branch 'erik/sendEmail' into core67-merge

[people/teissler/ipfire-2.x.git] / lfs / vdr

diff --git a/lfs/vdr b/lfs/vdr
index 2e4153e934d7fd4700f258eb231327ad39efffa4..46ea5d3f90b45994bde0fa9e6e9b60805c85926d 100644 (file)
--- 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-2012  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        #
@@ -30,31 +30,33 @@ DL_FILE    = $(THISAPP).tar.bz2
 DL_FILE1   = vdr-streamdev-20080325-http-0_4.tgz
 DL_FILE2   = vdr-softdevice-0.5.0.tgz
 DL_FILE3   = vidix-1.0.0.tar.bz2
+DL_FILE4   = vdr-epgsearch-0.9.24.tgz
 
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr
-PAK_VER    = 4
+PAK_VER    = 5
 
-DEPS       = "freefont fontconfig"
+DEPS       = "freefont"
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) $(DL_FILE1) $(DL_FILE2) $(DL_FILE3)
+objects = $(DL_FILE) $(DL_FILE1) $(DL_FILE2) $(DL_FILE3) $(DL_FILE4)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 $(DL_FILE1) = $(DL_FROM)/$(DL_FILE1)
 $(DL_FILE2) = $(DL_FROM)/$(DL_FILE2)
 $(DL_FILE3) = $(DL_FROM)/$(DL_FILE3)
+$(DL_FILE4) = $(DL_FROM)/$(DL_FILE4)
 
 $(DL_FILE)_MD5 = 76f4ebe6525a35e33313d27a3f8e80c0
 $(DL_FILE1)_MD5 = 874026c643601692077c42ee7a70b720
 $(DL_FILE2)_MD5 = e106876497db478f3b9ba4da0e5532f8
 $(DL_FILE3)_MD5 = 3471d1f385871f7e00e6e178ccdfff0b
-
+$(DL_FILE4)_MD5 = 4f0b1d7bdc6f24478f2670769547d7db
 
 install : $(TARGET)
 
@@ -87,6 +89,13 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+
+       # Install obsolete V4L1 videodev header.
+       cp $(DIR_SRC)/config/include/obsolete_videodev.h /usr/include/linux/videodev.h
+
+       # Accept also DVB_API_VERSION 5
+       cd $(DIR_APP) && sed -i -e "s|DVB_API_VERSION != 3|& \&\& DVB_API_VERSION != 5|g" dvbdevice.h
+       
        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 zxf $(DIR_DL)/$(DL_FILE2)
@@ -95,6 +104,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP)/PLUGINS/src && tar jxf $(DIR_DL)/$(DL_FILE3)
        cd $(DIR_APP)/PLUGINS/src && ln -s vidix-1.0.0 vidix
        cd $(DIR_APP)/PLUGINS/src/vidix && ./configure
+       cd $(DIR_APP)/PLUGINS/src && tar xvf $(DIR_DL)/$(DL_FILE4)
+       cd $(DIR_APP)/PLUGINS/src && ln -s epgsearch-0.9.24 epgsearch
+       cd $(DIR_APP) && patch -Np1 -i PLUGINS/src/epgsearch/patches/MainMenuHooks-v1_0.patch 
+       cd $(DIR_APP)/PLUGINS/src/epgsearch && sed -i '/include/a #include <langinfo.h>/' \
+               epgsearch.c
+       cd $(DIR_APP)/PLUGINS/src/epgsearch && patch -Np1 < $(DIR_SRC)/src/patches/vdr-plugin-epgsearch-gcc44.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vdr-1.6.0-gcc44-fixes.patch
        cd $(DIR_APP) && make VIDEODIR=/var/video plugins $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make VIDEODIR=/var/video vdr $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make DFB_SUPPORT=1  FB_SUPPORT=1  VIDIX_SUPPORT=1  $(MAKETUNING) $(EXTRA_MAKE)
@@ -107,5 +123,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        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
+
+       # Remove obsolete V4L1 videodev header.
+       rm -f /usr/include/linux/videodev.h
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)