From d7d7c522b65d7dd53b66efdf02eb5dfa1576261b Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Wed, 5 Mar 2025 13:02:53 +0100 Subject: [PATCH] install-ffmpeg-ios.sh: remove redundant configure options While writing a documentation for FFmpeg build on iOS it was found that many options are redundant. Remove them to simplify the provisioning script and to reduce the amount of cargo cult code. Pick-to: 6.8 6.9 Fixes: QTBUG-133502 Change-Id: I26aab49365eaca83bcdbfeb86de0638ac701bb80 Reviewed-by: Artem Dyomin Reviewed-by: Jukka Jokiniva --- coin/provisioning/common/unix/install-ffmpeg-ios.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/coin/provisioning/common/unix/install-ffmpeg-ios.sh b/coin/provisioning/common/unix/install-ffmpeg-ios.sh index 492ee810..f7c25d6a 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-ios.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-ios.sh @@ -40,17 +40,11 @@ build_ffmpeg_ios() { --arch=$target_platform \ --cc="xcrun --sdk ${target_sdk} clang -arch $target_platform" \ --cxx="xcrun --sdk ${target_sdk} clang++ -arch $target_platform" \ - --ar="$(xcrun --sdk ${target_sdk} --find ar)" \ - --ranlib="$(xcrun --sdk ${target_sdk} --find ranlib)" \ - --strip="$(xcrun --sdk ${target_sdk} --find strip)" \ - --nm="$(xcrun --sdk ${target_sdk} --find nm)" \ --target-os=darwin \ --extra-ldflags="$minos" \ --enable-shared \ --disable-static \ --install-name-dir='@rpath' \ - --enable-swscale \ - --enable-pthreads \ --disable-audiotoolbox sudo make install DESTDIR="$build_dir/installed" -j4