From d2bc5fdeae27d01755b93a72d1fe84c91fd1b914 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Petter=20Sk=C3=A5lerud?= Date: Mon, 23 Mar 2026 11:21:51 +0100 Subject: [PATCH] FFmpeg, iOS: Automatically grab version string from source code This patch allows us to automatically grab the FFmpeg version string from the source code directly, rather than having to explicitly specify a version string inside ffmpeg-installation-utils. Pick-to: 6.11 Change-Id: I657302ab8566592390a51c6f5c3ee989d66efaaa Reviewed-by: Artem Dyomin --- coin/provisioning/common/macos/install-ffmpeg-ios.sh | 6 +++++- coin/provisioning/common/unix/ffmpeg-installation-utils.sh | 6 +----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/coin/provisioning/common/macos/install-ffmpeg-ios.sh b/coin/provisioning/common/macos/install-ffmpeg-ios.sh index acefc2d1..68af516f 100755 --- a/coin/provisioning/common/macos/install-ffmpeg-ios.sh +++ b/coin/provisioning/common/macos/install-ffmpeg-ios.sh @@ -26,8 +26,12 @@ readonly MINIMUM_IOS_VERSION="16.0" source "${BASH_SOURCE%/*}/../unix/ffmpeg-installation-utils.sh" -ffmpeg_version=$(ffmpeg_version_default) ffmpeg_source_dir=$(download_ffmpeg) +ffmpeg_version="n$(<"${ffmpeg_source_dir}/RELEASE")" +if [ ! -n "$ffmpeg_version" ]; then + echo "Error. Unable to determine FFmpeg version." + exit 1 +fi ffmpeg_config_options=$(get_ffmpeg_config_options "shared") default_prefix="/usr/local/ios/ffmpeg" prefix="${1:-$default_prefix}" diff --git a/coin/provisioning/common/unix/ffmpeg-installation-utils.sh b/coin/provisioning/common/unix/ffmpeg-installation-utils.sh index 38d91d87..5f7621dd 100755 --- a/coin/provisioning/common/unix/ffmpeg-installation-utils.sh +++ b/coin/provisioning/common/unix/ffmpeg-installation-utils.sh @@ -2,12 +2,8 @@ # Copyright (C) 2024 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -ffmpeg_version_default() { - echo "n7.1.3" -} - download_ffmpeg() { - local version="${1:-$(ffmpeg_version_default)}" + local version="${1:-"n7.1.3"}" local sha1="${2:-27051817deec88bed3b9652d49f9127d22268d83}" local ffmpeg_name="FFmpeg-$version"