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 af5b92150b1edf2be7264fe83f7acceb384e2c17..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        #
@@ -38,7 +38,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr
 PAK_VER    = 5
 
-DEPS       = "freefont fontconfig"
+DEPS       = "freefont"
 
 ###############################################################################
 # Top-level Rules
@@ -89,7 +89,10 @@ $(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
        
@@ -104,6 +107,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        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)
@@ -116,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)