Update FFplay to 6.1.1 (#8119)

* Update FFplay to 6.1.1 * add clang option * [FFplay] Add explicit dependency on OpenSSL * Update F/FFMPEG/FFplay/build_tarballs.jl * [FFplay] Verbose installation --------- Co-authored-by: Mosè Giordano <[email protected]>
JuliaPackaging · Feb 25, 2024 · 39bd3e6 · 39bd3e6
1 parent 080fe17
commit 39bd3e6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/F/FFMPEG/FFplay/build_tarballs.jl b/F/FFMPEG/FFplay/build_tarballs.jl
@@ -18,11 +18,9 @@ dependencies = [
     BuildDependency("LibVPX_jll"), # We use the static archive
     Dependency("FFMPEG_jll"; compat=string(version)),
     Dependency("SDL2_jll"),
+    Dependency("OpenSSL_jll"; compat="3.0.9"),
 ]
 
-# FFplay 4.4.4 does not build on aarch64-apple
-filter!(p -> !(Sys.isapple(p) && arch(p) == "aarch64"), platforms)
-
 # Build the tarballs, and possibly a `build.jl` as well.
 build_tarballs(ARGS, name, version, sources, script(; ffplay=true), platforms, products, dependencies;
-               julia_compat="1.6", preferred_gcc_version=preferred_gcc_version)
+               julia_compat="1.6", preferred_gcc_version, clang_use_lld=false)
diff --git a/F/FFMPEG/common.jl b/F/FFMPEG/common.jl
@@ -124,7 +124,7 @@ sed -i 's/cpuflags="-march=$cpu"/cpuflags=""/g' configure
 make -j${nproc}
 if [[ "${FFPLAY}" == "true" ]]; then
     # Manually install only the FFplay binary
-    mv "ffplay${exeext}" "${bindir}/ffplay${exeext}"
+    install -Dvm 755 "ffplay${exeext}" "${bindir}/ffplay${exeext}"
 else
     # Install all FFMPEG stuff: libraries, executables, header files, etc...
     make install