Merge branch 'next'

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

diff --git a/lfs/ffmpeg b/lfs/ffmpeg
index 0795afff834aab796e33eb51e27fb052e87dda8f..a01189d9fdbac8f5a04e1436f56d0ce557f520a1 100644 (file)
--- a/lfs/ffmpeg
+++ b/lfs/ffmpeg
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.2.3
+VER        = 4.4
 
 THISAPP    = ffmpeg-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,10 +32,18 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ffmpeg
-PAK_VER    = 10
+PAK_VER    = 12
 
 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 = 695fad11f3baf27784e24cb0e977b65a
+$(DL_FILE)_MD5 = aa46d2168f30becd4fd3b22d2e8a91ec
 
 install : $(TARGET)
 
@@ -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 \