X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fffmpeg;h=b3838865e82eb8f533874ef298823b7524005a3b;hp=9f204d481215185dc7ea5047076b3111e27f3627;hb=17f7f41e4147c5653591c1413e576d72461cc1cb;hpb=d1b6aa72bb7eff5246de5c1d5a8e945def73f5c1

diff --git a/lfs/ffmpeg b/lfs/ffmpeg
index 9f204d4812..b3838865e8 100644
--- a/lfs/ffmpeg
+++ b/lfs/ffmpeg
@@ -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,15 +24,19 @@
 
 include Config
 
-VER        = 20051126
-
-THISAPP    = ffmpeg-$(VER)
+VER        = 2008-04-13
+THISAPP    = ffmpeg-export-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ffmpeg
-PAK_VER    = 1
+PAK_VER    = 5
+
+DEPS       = "ffmpeg-libs sdl lame libvorbis xvid"
+
+# Don't use PIC for libavcodec
+CFLAGS    += -fno-PIC -fno-strict-aliasing -Wa,--noexecstack
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = f9e50bf9ee1dd248a276bf9bd4d606e0
+$(DL_FILE)_MD5 = 017ab929ff92be552debb65c589c2183
 
 install : $(TARGET)
 
@@ -77,14 +79,14 @@ $(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) && sed -i "s/static uint64/const uint64/" \
-				libavcodec/liba52/resample_mmx.c
-	cd $(DIR_APP) && ./configure --prefix=/usr --enable-gpl --enable-shared \
-				--enable-pthreads --disable-ffplay --enable-pp \
-				--enable-mp3lame --enable-libogg --enable-vorbis \
-				--enable-xvid --enable-a52
-	cd $(DIR_APP) && make
-	cd $(DIR_APP) && make -C doc ff{mpeg,play,server}.1
-	cd $(DIR_APP) && make install
+	ln -s $(THISAPP) /usr/src/ffmpeg
+	cd $(DIR_SRC)/ffmpeg && ./configure --prefix=/usr \
+                                     --enable-shared \
+									 --enable-postproc \
+									 --enable-pthreads \
+									 --enable-gpl
+	cd $(DIR_SRC)/ffmpeg && make $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_SRC)/ffmpeg && make install
+	cd $(DIR_SRC)/ffmpeg && make install-libs
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)