X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fffmpeg;h=b8b0df4efab0c3bf7f477228613c1607ae21eb1e;hp=b3838865e82eb8f533874ef298823b7524005a3b;hb=eee037b8902c3163850069f302479e7733966bd0;hpb=274ebe1d9d3390b94afe42e5b96273e171c3c6d3

diff --git a/lfs/ffmpeg b/lfs/ffmpeg
index b3838865e8..b8b0df4efa 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-2018  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,19 +24,17 @@
 
 include Config
 
-VER        = 2008-04-13
-THISAPP    = ffmpeg-export-$(VER)
+VER        = 3.4
+
+THISAPP    = ffmpeg-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ffmpeg
-PAK_VER    = 5
-
-DEPS       = "ffmpeg-libs sdl lame libvorbis xvid"
+PAK_VER    = 8
 
-# Don't use PIC for libavcodec
-CFLAGS    += -fno-PIC -fno-strict-aliasing -Wa,--noexecstack
+DEPS       = "sdl lame libvorbis xvid"
 
 ###############################################################################
 # Top-level Rules
@@ -46,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 017ab929ff92be552debb65c589c2183
+$(DL_FILE)_MD5 = 4d368db3431895d140e6f5f7b4987911
 
 install : $(TARGET)
 
@@ -78,15 +76,16 @@ $(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
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--enable-shared \
+		--enable-gpl \
+		--enable-version3 \
+		--enable-avfilter \
+		--enable-avresample
+
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)