.ci/build-mac-arm64.sh

@@ -14,7 +14,7 @@ brew_arm64_install_packages() {
         fi
 
         echo "Installing $pkg (arm64)..."
-        "$BREW_ARM64_PATH/bin/brew" install --force --force-bottle --ignore-dependencies "$bottle_path" || true
+        "$BREW_ARM64_PATH/bin/brew" install --force --ignore-dependencies "$bottle_path" || true
     done
 }
 
@@ -41,6 +41,12 @@ curl -L https://github.com/Homebrew/brew/tarball/master | tar xz --strip 1 -C "$
 "$BREW_ARM64_PATH/bin/brew" update
 brew_arm64_install_packages 0mq aom aribb24 ca-certificates cjson curl dav1d ffmpeg@5 fontconfig freetype freetype2 gettext glew gmp gnutls lame libbluray libidn2 libnettle libogg libpng librist libsodium libsoxr libtasn libtasn1 libunistring libvmaf libvorbis libvpx libx11 libxau libxcb libxdmcp llvm@$LLVM_COMPILER_VER mbedtls molten-vk nettle opencore-amr openjpeg openssl opus p11-kit pkg-config pkgconfig pzstd rav1e sdl2 snappy speex srt svt-av1 theora vulkan-headers webp x264 x265 xz z3 zeromq zmq zstd
 "$BREW_ARM64_PATH/bin/brew" link -f ffmpeg@5
+/usr/local/bin/brew remove --ignore-dependencies openssl || true
+"$BREW_ARM64_PATH/bin/brew" link --overwrite -f openssl
+/usr/local/bin/brew remove --ignore-dependencies zstd || true
+"$BREW_ARM64_PATH/bin/brew" link --overwrite -f zstd
+/usr/local/bin/brew remove --ignore-dependencies xz || true
+"$BREW_ARM64_PATH/bin/brew" link --overwrite -f xz
 
 # moltenvk based on commit for 1.2.10 release
 wget https://raw.githubusercontent.com/Homebrew/homebrew-core/0d9f25fbd1658e975d00bd0e8cccd20a0c2cb74b/Formula/m/molten-vk.rb
@@ -129,7 +135,6 @@ export MACOSX_DEPLOYMENT_TARGET=13.0
     -DLLVM_TARGET_ARCH=arm64 \
     -DCMAKE_OSX_ARCHITECTURES=arm64 \
     -DCMAKE_IGNORE_PATH="$BREW_X64_PATH/lib" \
-    -DCMAKE_IGNORE_PREFIX_PATH=/usr/local/opt \
     -DCMAKE_SYSTEM_PROCESSOR=arm64 \
     -DCMAKE_TOOLCHAIN_FILE=buildfiles/cmake/TCDarwinARM64.cmake \
     -DCMAKE_CXX_FLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=130000" \