From 9f532fab921f6b81d3c5d5b467021b87bef2a2e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nils=20Petter=20Ska=CC=8Alerud?=
 <nils.petter.skalerud@qt.io>
Date: Tue, 25 Mar 2025 13:03:01 +0100
Subject: [PATCH] iOS, FFmpeg: Improve variable naming in FFmpeg provisioning

Currently this script overwrites a local variables and reuses it for
a (slightly) different purpose. This makes the code a bit hard to
follow.

This patch introduces a separate local variable to improve readability.

No functional changes.

Change-Id: Ifa1904482f498d9b380d1ed19ab6b0104afda19b
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit c4315452cb376e3c6b4878bc98206529271da89b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 68b4ef5b4efe8acf0637c0ca49bc708b5e39abfa)
---
 .../common/unix/install-ffmpeg-ios.sh           | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/coin/provisioning/common/unix/install-ffmpeg-ios.sh b/coin/provisioning/common/unix/install-ffmpeg-ios.sh
index 41521086..7eacb5c9 100755
--- a/coin/provisioning/common/unix/install-ffmpeg-ios.sh
+++ b/coin/provisioning/common/unix/install-ffmpeg-ios.sh
@@ -29,26 +29,25 @@ ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.t
 
 build_ffmpeg_ios() {
     local target_platform=$1
+    local target_cpu_arch=""
     if [ "$target_platform" == "arm64-simulator" ]; then
         target_sdk="iphonesimulator"
-        target_platform="arm64"
+        target_cpu_arch="arm64"
         minos="-mios-simulator-version-min=16.0"
     elif [ "$target_platform" == "x86_64-simulator" ]; then
         target_sdk="iphonesimulator"
-        target_platform="x86_64"
+        target_cpu_arch="x86_64"
         minos="-mios-simulator-version-min=16.0"
     elif [ "$target_platform" == "arm64-iphoneos" ]; then
         target_sdk="iphoneos"
-        target_platform="arm64"
+        target_cpu_arch="arm64"
         minos="-miphoneos-version-min=16.0"
     else
         echo "Error when building FFmpeg for iOS. Unknown parameter given for target_platform: '${target_platform}'"
         exit 1
     fi
 
-    # Note: unlike similar install-ffmpeg scripts, not $target_platform,
-    # but $1 (which can be arm64-simulator with arm64 target_platform).
-    local build_dir="$ffmpeg_source_dir/build_ios/$1"
+    local build_dir="$ffmpeg_source_dir/build_ios/$target_platform"
     sudo mkdir -p "$build_dir"
     pushd "$build_dir"
 
@@ -58,9 +57,9 @@ build_ffmpeg_ios() {
     --enable-cross-compile \
     --enable-optimizations \
     --prefix=$prefix \
-    --arch=$target_platform \
-    --cc="xcrun --sdk ${target_sdk} clang -arch $target_platform" \
-    --cxx="xcrun --sdk ${target_sdk} clang++ -arch $target_platform" \
+    --arch=$target_cpu_arch \
+    --cc="xcrun --sdk ${target_sdk} clang -arch $target_cpu_arch" \
+    --cxx="xcrun --sdk ${target_sdk} clang++ -arch $target_cpu_arch" \
     --target-os=darwin \
     --extra-ldflags="$minos" \
     --enable-cross-compile \