diff --git a/.github/workflows/macos_build.yml b/.github/workflows/macos_build.yml index 9b505103b81c2f..2d39a9370062c3 100644 --- a/.github/workflows/macos_build.yml +++ b/.github/workflows/macos_build.yml @@ -64,8 +64,6 @@ jobs: HOMEBREW_NO_INSTALL_CLEANUP: 1 HOMEBREW_NO_ANALYTICS: 1 run: | - brew unlink libjpeg || true # Conflicts with our self-built dependencies - brew unlink libpng || true # Unlike other packages, brew's MoltenVK build uses MoltenVK's minimum macOS version of 10.13 so we can use it if ! brew install molten-vk ccache nasm; then brew update diff --git a/.github/workflows/scripts/macos/build-dependencies.sh b/.github/workflows/scripts/macos/build-dependencies.sh index c4369c7a2315a3..590629817d41ea 100755 --- a/.github/workflows/scripts/macos/build-dependencies.sh +++ b/.github/workflows/scripts/macos/build-dependencies.sh @@ -35,7 +35,6 @@ EOF curl -L \ -O "https://libsdl.org/release/$SDL.tar.gz" \ -O "https://downloads.sourceforge.net/project/libpng/libpng16/$PNG/libpng-$PNG.tar.xz" \ - -O "https://www.ijg.org/files/jpegsrc.v$JPG.tar.gz" \ -O "https://ffmpeg.org/releases/ffmpeg-$FFMPEG.tar.xz" \ -O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtbase-everywhere-src-$QT.tar.xz" \ -O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtimageformats-everywhere-src-$QT.tar.xz" \ @@ -79,14 +78,6 @@ make "-j$NPROCS" make install cd .. -echo "Installing libjpeg..." -tar xf "jpegsrc.v$JPG.tar.gz" -cd "jpeg-$JPG" -./configure --prefix "$INSTALLDIR" --disable-dependency-tracking -make "-j$NPROCS" -make install -cd .. - echo "Installing FFmpeg..." tar xf "ffmpeg-$FFMPEG.tar.xz" cd "ffmpeg-$FFMPEG"