openssl: update to 1.1.1k

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

diff --git a/lfs/ffmpeg b/lfs/ffmpeg
index 41b939c22386b679f059e0632795d06f1c970d77..1efa14a367850b86b5670b6fa405f1a0439c4a40 100644 (file)
--- a/lfs/ffmpeg
+++ b/lfs/ffmpeg
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2021  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        #
@@ -32,10 +32,18 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ffmpeg
-PAK_VER    = 11
+PAK_VER    = 12
 
 DEPS       = sdl lame libvorbis xvid
 
+ifeq "$(BUILD_ARCH)" "armv6l"
+       LDFLAGS += -latomic
+endif
+
+ifeq "$(BUILD_ARCH)" "riscv64"
+       LDFLAGS += -latomic
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -78,9 +86,13 @@ $(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 \