From 998814c9e3e3f3bb3575baf378dcbc95d14590c0 Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Wed, 19 Feb 2025 11:42:06 +0100 Subject: [PATCH] FFmpeg: reduce the number of frameworks we create to the same libraries we build e.g. on macOS. Also, clean up the script a bit removing a duplicate configure option. Pick-to: 6.8 Task-number: QTBUG-133502 Change-Id: If06aad102783bc3025155d3427aa68d87ad4d179 Reviewed-by: Artem Dyomin (cherry picked from commit a4110ed94fcdd82328dfbda466cf2bcbc1c72b72) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/unix/install-ffmpeg-ios.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/coin/provisioning/common/unix/install-ffmpeg-ios.sh b/coin/provisioning/common/unix/install-ffmpeg-ios.sh index dbcc6c4b..e30b5af4 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-ios.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-ios.sh @@ -62,7 +62,6 @@ build_ffmpeg_ios() { --nm="$(xcrun --sdk ${target_sdk} --find nm)" \ --target-os=darwin \ --extra-ldflags="$minos" \ - --enable-cross-compile \ --enable-shared \ --disable-static \ --install-name-dir='@rpath' \ @@ -188,7 +187,7 @@ create_xcframework() { build_ffmpeg_ios "arm64-simulator" build_ffmpeg_ios "arm64" -ffmpeg_libs="libavcodec libavdevice libavfilter libavformat libavutil libswresample libswscale" +ffmpeg_libs="libavcodec libavformat libavutil libswresample libswscale" for name in $ffmpeg_libs; do create_framework $name "arm64"