From 245be4cd63cb9f83623d809d290199a28a2d69b1 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Tue, 1 Jun 2021 20:36:36 +0300 Subject: [PATCH] Fixed Github CI macOS build. --- .github/workflows/mac.yml | 14 ++++++++++++-- docs/building-xcode.md | 4 ++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index defaa11c32..621b1dc137 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -205,6 +205,16 @@ jobs: cd $LibrariesPath sudo cp -R opus-cache/. / + - name: Rnnoise. + run: | + cd $LibrariesPath + + git clone $GIT/desktop-app/rnnoise.git + mkdir -p rnnoise/out/Debug + cd rnnoise/out/Debug + cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug ../.. + ninja + - name: Libiconv cache. id: cache-libiconv uses: actions/cache@v2 @@ -240,7 +250,7 @@ jobs: git clone $GIT/FFmpeg/FFmpeg.git ffmpeg cd ffmpeg - git checkout release/4.2 + git checkout release/4.4 CFLAGS=`freetype-config --cflags` LDFLAGS=`freetype-config --libs` PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/X11/lib/pkgconfig @@ -317,7 +327,6 @@ jobs: --enable-decoder=pcm_u32be \ --enable-decoder=pcm_u32le \ --enable-decoder=pcm_u8 \ - --enable-decoder=pcm_zork \ --enable-decoder=vorbis \ --enable-decoder=wavpack \ --enable-decoder=wmalossless \ @@ -490,6 +499,7 @@ jobs: cmake -G Ninja \ -DCMAKE_BUILD_TYPE=Debug \ -DTG_OWT_SPECIAL_TARGET=mac \ + -DTG_OWT_BUILD_AUDIO_BACKENDS=OFF \ -DTG_OWT_LIBJPEG_INCLUDE_PATH=$PREFIX/include \ -DTG_OWT_OPENSSL_INCLUDE_PATH=`pwd`/../../../openssl_$OPENSSL_VER/include \ -DTG_OWT_OPUS_INCLUDE_PATH=$PREFIX/include/opus \ diff --git a/docs/building-xcode.md b/docs/building-xcode.md index a22bf97bb1..d1458c884d 100644 --- a/docs/building-xcode.md +++ b/docs/building-xcode.md @@ -112,12 +112,12 @@ Go to ***BuildPath*** and run cd out mkdir Debug cd Debug - cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug ../.. + cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug ../.. ninja cd .. mkdir Release cd Release - cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ../.. + cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ../.. ninja cd ../../..