From bafac952668aed66e9019e4feb8fb4c4e0646e94 Mon Sep 17 00:00:00 2001 From: nastys <7950891+nastys@users.noreply.github.com> Date: Tue, 28 Nov 2023 18:56:39 +0100 Subject: [PATCH] macOS CI: link ffmpeg after building it from source (#14843) --- .ci/build-mac.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.ci/build-mac.sh b/.ci/build-mac.sh index 210d2595cb..af1390044e 100755 --- a/.ci/build-mac.sh +++ b/.ci/build-mac.sh @@ -6,10 +6,12 @@ brew install -f --overwrite nasm ninja git p7zip create-dmg ccache pipenv #/usr/sbin/softwareupdate --install-rosetta --agree-to-license arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" arch -x86_64 /usr/local/bin/brew update -arch -x86_64 /usr/local/bin/brew install -f --overwrite python@3.11 -arch -x86_64 /usr/local/bin/brew reinstall -f --build-from-source ffmpeg gnutls freetype jpeg-xl +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 install -f --overwrite python@3.11 || arch -x86_64 /usr/local/bin/brew link --overwrite python@3.11 +arch -x86_64 /usr/local/bin/brew reinstall -f --build-from-source gnutls freetype jpeg-xl 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 +arch -x86_64 /usr/local/bin/brew link -f llvm@16 ffmpeg # moltenvk based on commit for 1.2.6 release wget https://raw.githubusercontent.com/Homebrew/homebrew-core/4ac0cfaca4c2505abe2fcbcc0ce5816572103a6c/Formula/m/molten-vk.rb