Revert "python-six: Removal of python2 & 3 addon versions of six"

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

diff --git a/lfs/ffmpeg b/lfs/ffmpeg
index c324cbd0b98d6aed6455236008d0b64067dc6e87..a01189d9fdbac8f5a04e1436f56d0ce557f520a1 100644 (file)
--- a/lfs/ffmpeg
+++ b/lfs/ffmpeg
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2017 IPFire Team  <info@ipfire.org>                      #
+# Copyright (C) 2007-2020  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,7 +24,7 @@
 
 include Config
 
-VER        = 3.4
+VER        = 4.4
 
 THISAPP    = ffmpeg-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,9 +32,17 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ffmpeg
-PAK_VER    = 8
+PAK_VER    = 12
 
-DEPS       = "sdl lame libvorbis xvid"
+DEPS       = sdl lame libvorbis xvid
+
+ifeq "$(BUILD_ARCH)" "armv5tel"
+       LDFLAGS += -latomic
+endif
+
+ifeq "$(BUILD_ARCH)" "riscv64"
+       LDFLAGS += -latomic
+endif
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +52,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4d368db3431895d140e6f5f7b4987911
+$(DL_FILE)_MD5 = aa46d2168f30becd4fd3b22d2e8a91ec
 
 install : $(TARGET)
 
@@ -77,9 +85,14 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure \
+
+       cd $(DIR_APP) && \
+               CFLAGS="$(CFLAGS)" \
+               LDFLAGS="$(LDFLAGS)" \
+               ./configure \
                --prefix=/usr \
                --enable-shared \
+               --disable-static \
                --enable-gpl \
                --enable-version3 \
                --enable-avfilter \