X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fffmpeg;h=b3838865e82eb8f533874ef298823b7524005a3b;hb=07f0e777f015303f1921f4d7e582890e8268563a;hp=5d4ebea39b2aca0889068e72e283b452ab4da093;hpb=24fd09e43c97759d1817da0c0b05dc075c1e0e11;p=ipfire-2.x.git

diff --git a/lfs/ffmpeg b/lfs/ffmpeg
index 5d4ebea39b..b3838865e8 100644
--- a/lfs/ffmpeg
+++ b/lfs/ffmpeg
@@ -24,17 +24,19 @@
 
 include Config
 
-VER        = 0.4.9-pre1
-
-THISAPP    = ffmpeg-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+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"
 
-DEPS       = "libvorbis lame"
+# 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 = ea5587e3c66d50b1503b82ac4179c303
+$(DL_FILE)_MD5 = 017ab929ff92be552debb65c589c2183
 
 install : $(TARGET)
 
@@ -76,14 +78,15 @@ $(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) && patch -Np1 < $(DIR_SRC)/src/patches/ffmpeg-0.4.9-pre1-gcc4-1.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ffmpeg-0.4.9-pre1-amr_fixes-1.patch
-	cd $(DIR_APP) && sed -i "s/static uint64/const uint64/" libavcodec/liba52/resample_mmx.c
-	cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared --enable-gpl \
-											--enable-pp --enable-pthreads --disable-ffplay \
-											--enable-xvid --disable-mmx
-	cd $(DIR_APP) && make
-	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	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)