Update FFMPEG to 6.1.1 (JuliaPackaging#8090)

* Update version of FFMPEG

* allow ffplay on mac/aarch64

* Compat macos < 10.13

* Update F/FFMPEG/FFMPEG/build_tarballs.jl

Co-authored-by: Mosè Giordano <[email protected]>

* Revert formatting

* Restore fix

---------

Co-authored-by: Mosè Giordano <[email protected]>

Author: 2 people

F/FFMPEG/FFMPEG/build_tarballs.jl

@@ -12,7 +12,6 @@ products = [
     LibraryProduct(["libavdevice", "avdevice"], :libavdevice),
     LibraryProduct(["libavfilter", "avfilter"], :libavfilter),
     LibraryProduct(["libavformat", "avformat"], :libavformat),
-    LibraryProduct(["libavresample", "avresample"], :libavresample),
     LibraryProduct(["libavutil", "avutil"], :libavutil),
     LibraryProduct(["libpostproc", "postproc"], :libpostproc),
     LibraryProduct(["libswresample", "swresample"], :libswresample),
@@ -44,4 +43,4 @@ dependencies = [
 
 # Build the tarballs, and possibly a `build.jl` as well.
 build_tarballs(ARGS, name, version, sources, script(; ffplay=false), platforms, products, dependencies;
-               julia_compat="1.6", preferred_gcc_version=preferred_gcc_version)
+    julia_compat="1.6", preferred_gcc_version=preferred_gcc_version, clang_use_lld=false)

F/FFMPEG/common.jl

@@ -3,13 +3,20 @@
 using BinaryBuilder, Pkg
 
 name = "FFMPEG"
-version_string = "4.4.4"   # when patch number is zero, they use X.Y format
+version_string = "6.1.1"   # when patch number is zero, they use X.Y format
 version = VersionNumber(version_string)
 
 # Collection of sources required to build FFMPEG
 sources = [
-    ArchiveSource("https://ffmpeg.org/releases/ffmpeg-$(version_string).tar.xz",
-                  "e80b380d595c809060f66f96a5d849511ef4a76a26b76eacf5778b94c3570309"),
+    ArchiveSource(
+        "https://ffmpeg.org/releases/ffmpeg-$(version_string).tar.xz",
+        "8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968",
+    ),
+    ## FFmpeg 6.1.1 does not work with macos 10.13 or earlier.
+    ArchiveSource(
+        "https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.13.sdk.tar.xz",
+        "a3a077385205039a7c6f9e2c98ecdf2a720b2a819da715e03e0630c75782c1e4",
+    ),
 ]
 
 # Bash recipe for building across all platforms
@@ -48,15 +55,16 @@ else
     export ccARCH="x86_64"
 fi
 
-if [[ "${target}" == arm-* ]]; then
-    export CUDA_ARGS=""
-elif [[ "${target}" == *-apple-* ]]; then
-    export CUDA_ARGS=""
-elif [[ "${target}" == *-unknown-freebsd* ]]; then
-    export CUDA_ARGS=""
-else
-    export CUDA_ARGS="--enable-nvenc --enable-cuda-llvm"
-fi
+if [[ "${target}" == x86_64-apple-darwin* ]]; then 
+    export MACOSX_DEPLOYMENT_TARGET=10.13 
+    pushd ${WORKSPACE}/srcdir/MacOSX10.*.sdk 
+    rm -rf /opt/${target}/${target}/sys-root/System 
+    cp -a usr/* "/opt/${target}/${target}/sys-root/usr/" 
+    cp -a System "/opt/${target}/${target}/sys-root/" 
+    popd
+fi 
+
+export CUDA_ARGS=""
 
 EXTRA_FLAGS=()
 if [[ "${target}" == *-darwin* ]]; then
@@ -93,7 +101,6 @@ sed -i 's/cpuflags="-march=$cpu"/cpuflags=""/g' configure
   --enable-pic         \
   --disable-debug      \
   --disable-doc        \
-  --enable-avresample  \
   --enable-libaom      \
   --enable-libass      \
   --enable-libfdk-aac  \