X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fffmpeg;h=b3838865e82eb8f533874ef298823b7524005a3b;hp=113b7e916e6546f6278c446c3dceea11f2ad2b8b;hb=e97d4c98963477b5247005d33acd9d4b5fe1ca8e;hpb=c8119900f6800538f3e89c1c25df2fa89a871fd9

diff --git a/lfs/ffmpeg b/lfs/ffmpeg
index 113b7e916e..b3838865e8 100644
--- a/lfs/ffmpeg
+++ b/lfs/ffmpeg
@@ -31,10 +31,13 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ffmpeg
-PAK_VER    = 3
+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
 ###############################################################################
@@ -79,11 +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-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)