diff --git a/.ci/build-mac-arm64.sh b/.ci/build-mac-arm64.sh index 1535c16bb1..fee1d8c9f1 100644 --- a/.ci/build-mac-arm64.sh +++ b/.ci/build-mac-arm64.sh @@ -41,12 +41,6 @@ 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 @@ -104,6 +98,14 @@ git submodule -q update --init --depth=1 --jobs=8 $(awk '/path/ && !/ffmpeg/ && # 3rdparty fixes sed -i '' "s/extern const double NSAppKitVersionNumber;/const double NSAppKitVersionNumber = 1343;/g" 3rdparty/hidapi/hidapi/mac/hid.c +# remove conflicting x64 dylibs +/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 + rm -rf build mkdir build && cd build || exit 1