diff options
Diffstat (limited to 'coin/provisioning/common/unix/install-ffmpeg.sh')
-rwxr-xr-x | coin/provisioning/common/unix/install-ffmpeg.sh | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/coin/provisioning/common/unix/install-ffmpeg.sh b/coin/provisioning/common/unix/install-ffmpeg.sh index 94d032ed..67255e3c 100755 --- a/coin/provisioning/common/unix/install-ffmpeg.sh +++ b/coin/provisioning/common/unix/install-ffmpeg.sh @@ -11,9 +11,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="n6.1.1" +version="n7.0" url_public="https://github.com/FFmpeg/FFmpeg/archive/$version.tar.gz" -sha1="59e0c3c4cc48e9c60073495f8c045329bb21f446" +sha1="042260ec5013eb29c89c13443a0f42cbe6fbceaa" url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz" ffmpeg_name="FFmpeg-$version" @@ -71,11 +71,26 @@ build_ffmpeg() { } if [ "$os" == "linux" ]; then + build_type="$2" + install_ff_nvcodec_headers ffmpeg_config_options+=" --enable-openssl" + + if [ "$build_type" != "static" ]; then + ffmpeg_config_options+=" --enable-shared --disable-static" + fi + build_ffmpeg - sudo mv "$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name" "/usr/local" + + output_dir="$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name" + + if [ "$build_type" != "static" ]; then + fix_dependencies="${BASH_SOURCE%/*}/../shared/fix_ffmpeg_dependencies.sh" + "$fix_dependencies" "$output_dir" + fi + + sudo mv "$output_dir" "/usr/local" SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name" elif [ "$os" == "macos" ] || [ "$os" == "macos-universal" ]; then @@ -111,3 +126,5 @@ elif [ "$os" == "macos" ] || [ "$os" == "macos-universal" ]; then SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name" fi + + |