diff --git a/.ci/build-mac.sh b/.ci/build-mac.sh index 131063dec3..fea4ce5e5e 100755 --- a/.ci/build-mac.sh +++ b/.ci/build-mac.sh @@ -8,10 +8,10 @@ arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebr arch -x86_64 /usr/local/bin/brew install -f --overwrite python@3.12 || arch -x86_64 /usr/local/bin/brew link --overwrite python@3.12 arch -x86_64 /usr/local/bin/brew update arch -x86_64 /usr/local/bin/brew uninstall -f --ignore-dependencies ffmpeg -arch -x86_64 /usr/local/bin/brew install -f --build-from-source ffmpeg -arch -x86_64 /usr/local/bin/brew reinstall -f --build-from-source gnutls freetype jpeg-xl +arch -x86_64 /usr/local/bin/brew install -f --build-from-source ffmpeg@5 +arch -x86_64 /usr/local/bin/brew reinstall -f --build-from-source gnutls freetype arch -x86_64 /usr/local/bin/brew install llvm@16 glew cmake sdl2 vulkan-headers coreutils -arch -x86_64 /usr/local/bin/brew link -f llvm@16 ffmpeg +arch -x86_64 /usr/local/bin/brew link -f llvm@16 ffmpeg@5 # moltenvk based on commit for 1.2.6 release wget https://raw.githubusercontent.com/Homebrew/homebrew-core/4ac0cfaca4c2505abe2fcbcc0ce5816572103a6c/Formula/m/molten-vk.rb diff --git a/.ci/deploy-mac.sh b/.ci/deploy-mac.sh index 3d65ec1fbb..20de7023ea 100755 --- a/.ci/deploy-mac.sh +++ b/.ci/deploy-mac.sh @@ -18,7 +18,6 @@ mkdir "rpcs3.app/Contents/lib/" cp "/usr/local/opt/llvm@16/lib/c++/libc++abi.1.0.dylib" "rpcs3.app/Contents/lib/libc++abi.1.dylib" cp "$(realpath /usr/local/lib/libsharpyuv.0.dylib)" "rpcs3.app/Contents/lib/libsharpyuv.0.dylib" cp "$(realpath /usr/local/lib/libintl.8.dylib)" "rpcs3.app/Contents/lib/libintl.8.dylib" -cp "$(realpath /usr/local/lib/libjxl_cms.0.9.dylib)" "rpcs3.app/Contents/lib/libjxl_cms.0.9.dylib" rm -rf "rpcs3.app/Contents/Frameworks/QtPdf.framework" \ "rpcs3.app/Contents/Frameworks/QtQml.framework" \