Added faad2 to build, this enables mp4a playback for vlc.

[people/pmueller/ipfire-2.x.git] / lfs / videolan

diff --git a/lfs/videolan b/lfs/videolan
index d831a3a3838449394e69686b6914b7aae5de610a..17a9f7ac8cbe698ebf111ed7f32599c2f7b5baa6 100644 (file)
--- a/lfs/videolan
+++ b/lfs/videolan
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# 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        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,25 +24,30 @@
 
 include Config
 
-VER        = 0.8.5
-
+VER        = 0.8.6i
 THISAPP    = vlc-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE1   = $(THISAPP)-bugfix-080903.patch.bz2
+
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = videolan
-PAK_VER    = 1
+PAK_VER    = 5
+
+DEPS       = "libshout libmpeg2 libmad libdvbpsi directfb ffmpeg faad2"
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE)
+objects = $(DL_FILE) $(DL_FILE1)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+$(DL_FILE1) = $(DL_FROM)/$(DL_FILE1)
 
-$(DL_FILE)_MD5 = 90d19a5ba2ef2e03e6062fadc2e810d2
+$(DL_FILE)_MD5 = 3c90520c9f22a68d287458d5a8af989e
+$(DL_FILE1)_MD5 = 36ea293b5ebb604778b321b5e3e3cdc4
 
 install : $(TARGET)
 
@@ -76,11 +79,26 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr \
-                               --disable-wxwidgets --disable-skins2 --without-x \
-                               --enable-httpd --enable-ncurses
-       cd $(DIR_APP) && make
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       #Apply some patched from videolan 8.6-bugfix branch,
+       #ignore the error because one patch is already applied
+       -cd $(DIR_APP) && bzip2 -d -c $(DIR_DL)/$(DL_FILE1) | patch -p1
+       cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared --with-ffmpeg-tree=/usr/src/ffmpeg \
+                                                                  --with-ffmpeg-config=/usr/src/ffmpeg \
+                                                               --disable-wxwidgets --disable-skins2 \
+                                                               --enable-httpd --enable-pth --enable-shout \
+                                                               --enable-smb --enable-cddax --enable-ncurses \
+                                                               --enable-a52 --enable-dts --enable-alsa \
+                                                               --enable-unicode-utf8 --enable-v4l --enable-vcd \
+                                                               --enable-ogg --enable-vorbis --enable-theora \
+                                                               --enable-mad --enable-v4l --enable-dvb \
+                                                               --with-dvb=/usr/src/v4l-dvb \
+                                                               --with-v4l=/usr/src/v4l-dvb \
+                                                               --enable-libdvbpsi --enable-faac --enable-mkv \
+                                                               --enable-x264 --enable-release --enable-sout \
+                                                               --disable-nls --enable-faad \
+                                                               --enable-directfb --with-directfb=/usr/src/directfb
+       cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)