Merge branch 'next' into initscripts-cleanup

[ipfire-2.x.git] / lfs / ffmpeg

diff --git a/lfs/ffmpeg b/lfs/ffmpeg
index c84cb5d03f74bbeeda46d43c58b688b85e1995b4..b3838865e82eb8f533874ef298823b7524005a3b 100644 (file)
--- 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 xvid"
+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
-       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)