python3-pyasn1: New package as required by aws-cli

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

diff --git a/lfs/ffmpeg b/lfs/ffmpeg
index 5d4ebea39b2aca0889068e72e283b452ab4da093..c324cbd0b98d6aed6455236008d0b64067dc6e87 100644 (file)
--- 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,17 +24,17 @@
 
 include Config
 
-VER        = 0.4.9-pre1
+VER        = 3.4
 
 THISAPP    = ffmpeg-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ffmpeg
-PAK_VER    = 1
+PAK_VER    = 8
 
-DEPS       = "libvorbis lame"
+DEPS       = "sdl lame libvorbis xvid"
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ea5587e3c66d50b1503b82ac4179c303
+$(DL_FILE)_MD5 = 4d368db3431895d140e6f5f7b4987911
 
 install : $(TARGET)
 
@@ -76,14 +76,16 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ffmpeg-0.4.9-pre1-gcc4-1.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ffmpeg-0.4.9-pre1-amr_fixes-1.patch
-       cd $(DIR_APP) && sed -i "s/static uint64/const uint64/" libavcodec/liba52/resample_mmx.c
-       cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared --enable-gpl \
-                                                                                       --enable-pp --enable-pthreads --disable-ffplay \
-                                                                                       --enable-xvid --disable-mmx
-       cd $(DIR_APP) && make
+       @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)