From 767f9677b84e197f5f4642990617af410d347bbc Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Thu, 17 Apr 2025 22:26:38 +0200 Subject: [PATCH] iOS, FFmpeg: Add variable for controlling minimum iOS version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently this script relies on hard-coded values specify minimum iOS version to link against. This patch unifies the hard-coded values into a single variable. No functional changes. There was some trivial merge conflict resolution due to there being a tiny mismatch between how external sources are included. Pick-to: 6.8 Change-Id: I12bddeb53f0fe3388ea55c841a9864722a1d5f82 Reviewed-by: Timur Pocheptsov (cherry picked from commit d39ac6a4ec08bcf4b53acf53c603c715cfd595b8) Reviewed-by: Volker Hilsheimer Reviewed-by: Nils Petter Skålerud --- coin/provisioning/common/unix/install-ffmpeg-ios.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/coin/provisioning/common/unix/install-ffmpeg-ios.sh b/coin/provisioning/common/unix/install-ffmpeg-ios.sh index d9ee4c5e..2f6fbab4 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-ios.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-ios.sh @@ -5,6 +5,10 @@ # This script will build and install FFmpeg static libs set -ex +# Must match or be lower than the minimum iOS version supported by the version of Qt that is +# is currently being built. +readonly MINIMUM_IOS_VERSION="16.0" + source "${BASH_SOURCE%/*}/../unix/ffmpeg-installation-utils.sh" ffmpeg_source_dir=$(download_ffmpeg) @@ -18,15 +22,15 @@ build_ffmpeg_ios() { if [ "$target_platform" == "arm64-simulator" ]; then target_sdk="iphonesimulator" target_cpu_arch="arm64" - minos="-mios-simulator-version-min=16.0" + minos="-mios-simulator-version-min=$MINIMUM_IOS_VERSION" elif [ "$target_platform" == "x86_64-simulator" ]; then target_sdk="iphonesimulator" target_cpu_arch="x86_64" - minos="-mios-simulator-version-min=16.0" + minos="-mios-simulator-version-min=$MINIMUM_IOS_VERSION" elif [ "$target_platform" == "arm64-iphoneos" ]; then target_sdk="iphoneos" target_cpu_arch="arm64" - minos="-miphoneos-version-min=16.0" + minos="-miphoneos-version-min=$MINIMUM_IOS_VERSION" else echo "Error when building FFmpeg for iOS. Unknown parameter given for target_platform: '${target_platform}'" exit 1 @@ -62,7 +66,6 @@ build_info_plist() { local framework_id="$3" local minimum_version_key="MinimumOSVersion" - local minimum_os_version="16.0" local supported_platforms="iPhoneOS" # TODO: This should be filled out with the actual version of FFmpeg that we are @@ -90,7 +93,7 @@ build_info_plist() { CFBundleSignature ???? ${minimum_version_key} - ${minimum_os_version} + ${MINIMUM_IOS_VERSION} CFBundleSupportedPlatforms ${supported_platforms}