suricata: Change midstream policy to "pass-flow"

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

diff --git a/lfs/ffmpeg b/lfs/ffmpeg
index ef6a1bc7d1fafb6861b07a9e13dea4479fc3dc1c..0118f75f243e6e39bdcf6f23de02fbc31247f2d8 100644 (file)
--- a/lfs/ffmpeg
+++ b/lfs/ffmpeg
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2023  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        #
@@ -26,24 +26,20 @@ include Config
 
 SUMMARY           = Library for working with various multimedia formats
 
-VER        = 4.4
+VER        = 6.0
 
 THISAPP    = ffmpeg-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ffmpeg
-PAK_VER    = 13
+PAK_VER    = 16
 
 DEPS       = sdl2 lame libvorbis xvid
 
 SERVICES   =
 
-ifeq "$(BUILD_ARCH)" "armv6l"
-       LDFLAGS += -latomic
-endif
-
 ifeq "$(BUILD_ARCH)" "riscv64"
        LDFLAGS += -latomic
 endif
@@ -56,7 +52,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = a8dc007e260896228789d27339402e846cd21758e02c7a8d66a745ced2d1bbef4aa9c18c9b7cefef004b5ffa3fc859e2a2474c957bdf9ff27e82cec72ed4a5bf
+$(DL_FILE)_BLAKE2 = c70884911f3a3e40fe87473f241a2a56b303f5abe7f1d7fa797d05e29e00971f98cbf37832c1c3dc5fa949a5beddef05a6ec55ae6668091976ea870ad93c0e8d
 
 install : $(TARGET)
 
@@ -89,7 +85,7 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ffmpeg-6.0-mathpops-clip-constants-used-with-shift.patch
        cd $(DIR_APP) && \
                CFLAGS="$(CFLAGS)" \
                LDFLAGS="$(LDFLAGS)" \
@@ -100,7 +96,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --enable-gpl \
                --enable-version3 \
                --enable-avfilter \
-               --enable-avresample
+               --disable-doc
 
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install