From 20fb235b8fe86284fcd0de7848a76056b0771228 Mon Sep 17 00:00:00 2001 From: PatTheMav Date: Sun, 20 Dec 2020 16:56:31 +0100 Subject: [PATCH] CI: Remove jack, speex and fdk-aac from default builds for macOS --- .github/workflows/main.yml | 16 +++++++++------- CI/full-build-macos.sh | 2 -- CI/scripts/macos/Brewfile | 3 --- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7c697dd6c..7d5c33123 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,7 +24,7 @@ jobs: runs-on: [macos-latest] env: MIN_MACOS_VERSION: '10.13' - MACOS_DEPS_VERSION: '2020-12-19' + MACOS_DEPS_VERSION: '2020-12-22' VLC_VERSION: '3.0.8' SPARKLE_VERSION: '1.23.0' QT_VERSION: '5.15.2' @@ -54,13 +54,17 @@ jobs: shell: bash run: | if [ -d /usr/local/opt/openssl@1.0.2t ]; then - brew uninstall openssl@1.0.2t - brew untap local/openssl + brew uninstall openssl@1.0.2t + brew untap local/openssl fi if [ -d /usr/local/opt/python@2.7.17 ]; then - brew uninstall python@2.7.17 - brew untap local/python2 + brew uninstall python@2.7.17 + brew untap local/python2 + fi + + if [ -d /usr/local/opt/speexdsp ]; then + brew unlink speexdsp fi brew bundle --file ./CI/scripts/macos/Brewfile - name: 'Restore Chromium Embedded Framework from cache' @@ -199,7 +203,6 @@ jobs: ./OBS.app/Contents/PlugIns/decklink-captions.so ./OBS.app/Contents/PlugIns/frontend-tools.so ./OBS.app/Contents/PlugIns/image-source.so - ./OBS.app/Contents/PlugIns/linux-jack.so ./OBS.app/Contents/PlugIns/mac-avcapture.so ./OBS.app/Contents/PlugIns/mac-capture.so ./OBS.app/Contents/PlugIns/mac-decklink.so @@ -216,7 +219,6 @@ jobs: ./OBS.app/Contents/MacOS/obslua.so ./OBS.app/Contents/PlugIns/obs-x264.so ./OBS.app/Contents/PlugIns/text-freetype2.so - ./OBS.app/Contents/PlugIns/obs-libfdk.so ./OBS.app/Contents/PlugIns/obs-outputs.so ) diff --git a/CI/full-build-macos.sh b/CI/full-build-macos.sh index 62d8a214a..6efc4345f 100755 --- a/CI/full-build-macos.sh +++ b/CI/full-build-macos.sh @@ -311,7 +311,6 @@ bundle_dylibs() { ./OBS.app/Contents/PlugIns/decklink-captions.so ./OBS.app/Contents/PlugIns/frontend-tools.so ./OBS.app/Contents/PlugIns/image-source.so - ./OBS.app/Contents/PlugIns/linux-jack.so ./OBS.app/Contents/PlugIns/mac-avcapture.so ./OBS.app/Contents/PlugIns/mac-capture.so ./OBS.app/Contents/PlugIns/mac-decklink.so @@ -328,7 +327,6 @@ bundle_dylibs() { ./OBS.app/Contents/MacOS/obslua.so ./OBS.app/Contents/PlugIns/obs-x264.so ./OBS.app/Contents/PlugIns/text-freetype2.so - ./OBS.app/Contents/PlugIns/obs-libfdk.so ./OBS.app/Contents/PlugIns/obs-outputs.so ) if ! [ "${CEF_BUILD_VERSION:-${CI_CEF_VERSION}}" -le 3770 ]; then diff --git a/CI/scripts/macos/Brewfile b/CI/scripts/macos/Brewfile index 9ecb45dbe..eff533552 100644 --- a/CI/scripts/macos/Brewfile +++ b/CI/scripts/macos/Brewfile @@ -1,8 +1,5 @@ tap "akeru-inc/tap" -brew "jack" -brew "speexdsp" brew "cmake" brew "freetype" -brew "fdk-aac" brew "cmocka" brew "akeru-inc/tap/xcnotary" \ No newline at end of file -- GitLab