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

diff --git a/lfs/ffmpeg b/lfs/ffmpeg
index f8022990ba..b3838865e8 100644
--- a/lfs/ffmpeg
+++ b/lfs/ffmpeg
@@ -31,9 +31,12 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ffmpeg
-PAK_VER    = 2
+PAK_VER    = 5
 
-DEPS       = "sdl lame libvorbis libxvid"
+DEPS       = "ffmpeg-libs sdl lame libvorbis xvid"
+
+# Don't use PIC for libavcodec
+CFLAGS    += -fno-PIC -fno-strict-aliasing -Wa,--noexecstack
 
 ###############################################################################
 # Top-level Rules
@@ -79,14 +82,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	ln -s $(THISAPP) /usr/src/ffmpeg
 	cd $(DIR_SRC)/ffmpeg && ./configure --prefix=/usr \
                                      --enable-shared \
-				     --enable-postproc \
-				     --enable-gpl \
-				     --enable-libmp3lame \
-				     --enable-libvorbis \
-				     --enable-libxvid
-	cd $(DIR_SRC)/ffmpeg && make
+									 --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
-	ldconfig
-#	@rm -rf $(DIR_APP)
+	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)