diff options
| author | Nils Petter Skålerud <nils.petter.skalerud@qt.io> | 2025-03-25 13:06:37 +0100 |
|---|---|---|
| committer | Nils Petter Skålerud <nils.petter.skalerud@qt.io> | 2025-04-04 16:57:51 +0000 |
| commit | d39ac6a4ec08bcf4b53acf53c603c715cfd595b8 (patch) | |
| tree | 8520caf6b9576544f21a08c20e9f74ee88b9ee45 | |
| parent | 02efff7fa1d549b10a30da826f80a805db8bf005 (diff) | |
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.
Pick-to: 6.9 6.8
Change-Id: I12bddeb53f0fe3388ea55c841a9864722a1d5f82
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| -rwxr-xr-x | coin/provisioning/common/unix/install-ffmpeg-ios.sh | 13 |
1 files 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 153e4194e..abdfbc1a6 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 @@ -89,7 +93,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 @@ -117,7 +120,7 @@ build_info_plist() { <key>CFBundleSignature</key> <string>????</string> <key>${minimum_version_key}</key> - <string>${minimum_os_version}</string> + <string>${MINIMUM_IOS_VERSION}</string> <key>CFBundleSupportedPlatforms</key> <array> <string>${supported_platforms}</string> |