From ebe3124831a386b986b462fbd500edc22533e401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Petter=20Sk=C3=A5lerud?= Date: Mon, 9 Feb 2026 13:35:34 +0100 Subject: [PATCH] Move install-ffmpeg-ios.sh into macos folder Currently this script is stored under unix, but it's only ever going to be used on macos. This patch moves the script. No functional changes. Pick-to: 6.11 6.10 6.8 Change-Id: Iba3d101d360e90ffaa3478689bb002b4e5f65bc1 Reviewed-by: Artem Dyomin --- coin/provisioning/common/{unix => macos}/install-ffmpeg-ios.sh | 0 coin/provisioning/qtci-macos-12-arm/90-install-ffmpeg.sh | 2 +- coin/provisioning/qtci-macos-12-x86_64/90-install-ffmpeg.sh | 2 +- coin/provisioning/qtci-macos-13-arm/90-install-ffmpeg.sh | 2 +- coin/provisioning/qtci-macos-13-x86_64/90-install-ffmpeg.sh | 2 +- coin/provisioning/qtci-macos-14-arm/90-install-ffmpeg.sh | 2 +- coin/provisioning/qtci-macos-14-x86_64/90-install-ffmpeg.sh | 2 +- coin/provisioning/qtci-macos-15-arm/90-install-ffmpeg.sh | 2 +- coin/provisioning/qtci-macos-15-x86_64/90-install-ffmpeg.sh | 2 +- coin/provisioning/qtci-macos-26-arm/90-install-ffmpeg.sh | 2 +- coin/provisioning/qtci-macos-26-x86_64/90-install-ffmpeg.sh | 2 +- 11 files changed, 10 insertions(+), 10 deletions(-) rename coin/provisioning/common/{unix => macos}/install-ffmpeg-ios.sh (100%) diff --git a/coin/provisioning/common/unix/install-ffmpeg-ios.sh b/coin/provisioning/common/macos/install-ffmpeg-ios.sh similarity index 100% rename from coin/provisioning/common/unix/install-ffmpeg-ios.sh rename to coin/provisioning/common/macos/install-ffmpeg-ios.sh diff --git a/coin/provisioning/qtci-macos-12-arm/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-12-arm/90-install-ffmpeg.sh index d0c4db0b..5023fefc 100755 --- a/coin/provisioning/qtci-macos-12-arm/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-macos-12-arm/90-install-ffmpeg.sh @@ -6,4 +6,4 @@ set -ex source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal" #source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" "use_16kb_page_size" -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh" +source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-ios.sh" diff --git a/coin/provisioning/qtci-macos-12-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-12-x86_64/90-install-ffmpeg.sh index d0c4db0b..5023fefc 100755 --- a/coin/provisioning/qtci-macos-12-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-macos-12-x86_64/90-install-ffmpeg.sh @@ -6,4 +6,4 @@ set -ex source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal" #source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" "use_16kb_page_size" -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh" +source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-ios.sh" diff --git a/coin/provisioning/qtci-macos-13-arm/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-13-arm/90-install-ffmpeg.sh index d0c4db0b..5023fefc 100755 --- a/coin/provisioning/qtci-macos-13-arm/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-macos-13-arm/90-install-ffmpeg.sh @@ -6,4 +6,4 @@ set -ex source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal" #source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" "use_16kb_page_size" -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh" +source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-ios.sh" diff --git a/coin/provisioning/qtci-macos-13-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-13-x86_64/90-install-ffmpeg.sh index d0c4db0b..5023fefc 100755 --- a/coin/provisioning/qtci-macos-13-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-macos-13-x86_64/90-install-ffmpeg.sh @@ -6,4 +6,4 @@ set -ex source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal" #source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" "use_16kb_page_size" -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh" +source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-ios.sh" diff --git a/coin/provisioning/qtci-macos-14-arm/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-14-arm/90-install-ffmpeg.sh index 7bb560cd..eaf2e469 100755 --- a/coin/provisioning/qtci-macos-14-arm/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-macos-14-arm/90-install-ffmpeg.sh @@ -6,4 +6,4 @@ set -ex source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal" source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" "use_16kb_page_size" -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh" +source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-ios.sh" diff --git a/coin/provisioning/qtci-macos-14-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-14-x86_64/90-install-ffmpeg.sh index 70dee095..230c5016 100755 --- a/coin/provisioning/qtci-macos-14-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-macos-14-x86_64/90-install-ffmpeg.sh @@ -6,4 +6,4 @@ set -ex source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal" source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" "use_16kb_page_size" -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh" +source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-ios.sh" diff --git a/coin/provisioning/qtci-macos-15-arm/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-15-arm/90-install-ffmpeg.sh index d0c4db0b..5023fefc 100755 --- a/coin/provisioning/qtci-macos-15-arm/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-macos-15-arm/90-install-ffmpeg.sh @@ -6,4 +6,4 @@ set -ex source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal" #source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" "use_16kb_page_size" -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh" +source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-ios.sh" diff --git a/coin/provisioning/qtci-macos-15-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-15-x86_64/90-install-ffmpeg.sh index 70dee095..230c5016 100755 --- a/coin/provisioning/qtci-macos-15-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-macos-15-x86_64/90-install-ffmpeg.sh @@ -6,4 +6,4 @@ set -ex source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal" source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" "use_16kb_page_size" -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh" +source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-ios.sh" diff --git a/coin/provisioning/qtci-macos-26-arm/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-26-arm/90-install-ffmpeg.sh index d0c4db0b..5023fefc 100755 --- a/coin/provisioning/qtci-macos-26-arm/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-macos-26-arm/90-install-ffmpeg.sh @@ -6,4 +6,4 @@ set -ex source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal" #source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" "use_16kb_page_size" -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh" +source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-ios.sh" diff --git a/coin/provisioning/qtci-macos-26-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-26-x86_64/90-install-ffmpeg.sh index 70dee095..230c5016 100755 --- a/coin/provisioning/qtci-macos-26-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-macos-26-x86_64/90-install-ffmpeg.sh @@ -6,4 +6,4 @@ set -ex source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal" source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" "use_16kb_page_size" -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh" +source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-ios.sh"