lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-21 04:16:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

iOS, FFmpeg: Improve variable naming in FFmpeg provisioning

Browse Source 
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.

Pick-to: 6.8
Change-Id: Ifa1904482f498d9b380d1ed19ab6b0104afda19b
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit c4315452cb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Nils Petter Skålerud
2025-03-25 13:03:01 +01:00
committed by Qt Cherry-pick Bot
parent 5df9315b1f
commit 68b4ef5b4e
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
coin/provisioning/common/unix/install-ffmpeg-ios.sh
View File

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