From d35d6de21252f8b060ea354c4bb1fba294767f16 Mon Sep 17 00:00:00 2001 From: Bartlomiej Moskal Date: Tue, 28 May 2024 19:52:00 +0200 Subject: [PATCH] Coin: Move fix_ffmpeg_dependencies.sh to shared directory Move fix_ffmpeg_dependencies.sh script from "linux" to "shared" directory. The script will be used on macOS but also on Windows (using MSYS2) Task-number: QTBUG-122010 Change-Id: If63d5e3ba7562b230cce26c7bfba728a2ae0a382 Reviewed-by: Artem Dyomin (cherry picked from commit b6c681279853bdb79e5dcb3232928f3d6b365837) Reviewed-by: Qt Cherry-pick Bot --- .../common/{linux => shared}/fix_ffmpeg_dependencies.sh | 0 coin/provisioning/common/unix/install-ffmpeg-android.sh | 2 +- coin/provisioning/common/unix/install-ffmpeg.sh | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename coin/provisioning/common/{linux => shared}/fix_ffmpeg_dependencies.sh (100%) diff --git a/coin/provisioning/common/linux/fix_ffmpeg_dependencies.sh b/coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh similarity index 100% rename from coin/provisioning/common/linux/fix_ffmpeg_dependencies.sh rename to coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh diff --git a/coin/provisioning/common/unix/install-ffmpeg-android.sh b/coin/provisioning/common/unix/install-ffmpeg-android.sh index 8a35d1ed..43308b07 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-android.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-android.sh @@ -99,7 +99,7 @@ build_ffmpeg_android() { rm -f "${openssl_libs}/libssl.so" if [[ "$shared" == "yes" ]]; then - fix_dependencies="${BASH_SOURCE%/*}/../linux/fix_ffmpeg_dependencies.sh" + fix_dependencies="${BASH_SOURCE%/*}/../shared/fix_ffmpeg_dependencies.sh" sudo "${fix_dependencies}" "${target_dir}" "${libs_prefix}" "no" fi diff --git a/coin/provisioning/common/unix/install-ffmpeg.sh b/coin/provisioning/common/unix/install-ffmpeg.sh index cda63786..67255e3c 100755 --- a/coin/provisioning/common/unix/install-ffmpeg.sh +++ b/coin/provisioning/common/unix/install-ffmpeg.sh @@ -86,7 +86,7 @@ if [ "$os" == "linux" ]; then output_dir="$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name" if [ "$build_type" != "static" ]; then - fix_dependencies="${BASH_SOURCE%/*}/../linux/fix_ffmpeg_dependencies.sh" + fix_dependencies="${BASH_SOURCE%/*}/../shared/fix_ffmpeg_dependencies.sh" "$fix_dependencies" "$output_dir" fi