From df82dc7de28ae62a5da624bd94ce33a82bd17ec0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Petter=20Ska=CC=8Alerud?= Date: Tue, 4 Nov 2025 10:41:19 +0100 Subject: [PATCH] FFmpeg, iOS: Store final .xcframework files in 'lib' folder Currently, the iOS FFmpeg provisioning script will install .xcframework files into a subfolder 'frameworks'. The .xcframework files fulfill a similar purpose to ordinary .dylib files and should be placed in a 'lib' subfolder, to make provisioning more similar to how we deploy FFmpeg for other platforms. This patch makes us install .xcframework files in a 'lib' subfolder instead. Task-number: QTBUG-136480 Pick-to: 6.11 6.10 Change-Id: I91f9938b595ecff5b04d49a71e9872f5d7278cda Reviewed-by: Artem Dyomin --- coin/provisioning/common/unix/install-ffmpeg-ios.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/coin/provisioning/common/unix/install-ffmpeg-ios.sh b/coin/provisioning/common/unix/install-ffmpeg-ios.sh index f1360942..d6e24e1f 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-ios.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-ios.sh @@ -158,8 +158,8 @@ create_xcframework() { local fw_a="$ffmpeg_source_dir/build_ios/${target_platform_a}/installed$prefix/framework/${framework_name}.framework" local fw_b="$ffmpeg_source_dir/build_ios/${target_platform_b}/installed$prefix/framework/${framework_name}.framework" - sudo mkdir -p "$prefix/framework/" - sudo xcodebuild -create-xcframework -framework $fw_a -framework $fw_b -output "${prefix}/framework/${framework_name}.xcframework" + sudo mkdir -p "$prefix/lib/" + sudo xcodebuild -create-xcframework -framework $fw_a -framework $fw_b -output "${prefix}/lib/${framework_name}.xcframework" } build_ffmpeg_ios "x86_64-simulator" @@ -180,9 +180,5 @@ done # xcframeworks are already installed directly into the target output directory. # We need to install headers sudo cp -r "$ffmpeg_source_dir/build_ios/arm64-iphoneos/installed$prefix/include" $prefix -# The set_ffmpeg_dir_env_var requires the presence of the "lib" subfolder in order to validate -# our FFmpeg install. On iOS we don't use this subfolder, we only rely on the "framework" subfolder. -# So we create a dummy "lib" folder to pass the check. -sudo mkdir -p "${prefix}/lib" set_ffmpeg_dir_env_var "FFMPEG_DIR_IOS" $prefix