X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fffmpeg;h=cd9e8b61fdd956a2133ac62353c34fec3b458f87;hb=9c8395456753ac6b7fd0141a6b0be83415841bf0;hp=74947311fcbfbabf51e00071d6bf4f9f74ff2353;hpb=c6f96750ba3131a58f3cd998f73b5c1ad9bc903c;p=ipfire-2.x.git

diff --git a/lfs/ffmpeg b/lfs/ffmpeg
index 74947311fc..cd9e8b61fd 100644
--- a/lfs/ffmpeg
+++ b/lfs/ffmpeg
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2017 IPFire Team  <info@ipfire.org>                      #
 #                                                                             #
 # 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        #
@@ -24,20 +24,17 @@
 
 include Config
 
-VER        = 2008-04-13
-THISAPP    = ffmpeg-export-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+VER        = 3.2.4
+THISAPP    = ffmpeg-$(VER)
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ffmpeg
-PAK_VER    = 5
+PAK_VER    = 6
 
 DEPS       = "ffmpeg-libs sdl lame libvorbis xvid"
 
-# Don't use PIC for libavcodec
-CFLAGS    += -fno-PIC -fno-strict-aliasing -Wa,--noexecstack
-
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -46,7 +43,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 017ab929ff92be552debb65c589c2183
+$(DL_FILE)_MD5 = 39fd71024ac76ba35f04397021af5606
 
 install : $(TARGET)
 
@@ -78,16 +75,14 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@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
-	ldconfig
-#	@rm -rf $(DIR_APP)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure --prefix=/usr \
+				--enable-shared \
+				--enable-postproc \
+				--enable-pthreads \
+				--enable-gpl
+	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_APP) && make install
+	cd $(DIR_APP) && make install-libs
+	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)