From 3b9fea63941a42eafa6c410cc99a3fa717049555 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 11 Sep 2024 14:57:40 +0200 Subject: [PATCH] coin: Remove ffmpeg workaround for broken Xcode 15 linker Recent versions of Xcode (15.3 at least) no longer have this issue. Change-Id: Iafba08094c3a52c9fd005f0d236fcb945ac43ed4 Reviewed-by: Ville-Pekka Karhu --- coin/provisioning/common/unix/install-ffmpeg.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/coin/provisioning/common/unix/install-ffmpeg.sh b/coin/provisioning/common/unix/install-ffmpeg.sh index 44198bfc..aa7d2f41 100755 --- a/coin/provisioning/common/unix/install-ffmpeg.sh +++ b/coin/provisioning/common/unix/install-ffmpeg.sh @@ -100,12 +100,6 @@ elif [ "$os" == "macos" ] || [ "$os" == "macos-universal" ]; then export MACOSX_DEPLOYMENT_TARGET=12 fix_relative_dependencies="${BASH_SOURCE%/*}/../macos/fix_relative_dependencies.sh" - xcode_major_version=$(xcodebuild -version | awk 'NR==1 {split($2, a, "."); print a[1]}') - if [ "$xcode_major_version" -ge 15 ]; then - # fix the error: duplicate symbol '_av_ac3_parse_header' - ffmpeg_config_options+=" --extra-ldflags=-Wl,-ld_classic" - fi - if [ "$os" == "macos" ]; then build_ffmpeg install_dir="$ffmpeg_source_dir/build/installed"