From b213c3580115d9d8e465b5821db2db71bbbe6382 Mon Sep 17 00:00:00 2001 From: ejurgensen Date: Thu, 24 Aug 2023 23:30:51 +0200 Subject: [PATCH] Revert "[gh-actions] Remove build of sqlite from MacOS workflow mk2" This reverts commit 07a95dce96e6a1bcda2282abc34442aa54401e61. --- .github/workflows/macos.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 1dee5da308..b72a2c10e0 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -43,13 +43,16 @@ jobs: cd .. - name: Install sqlite - # MacOS package does not have unlock-notify, but brew 3.42.0_1+ does, so - # install that and make sure it's used + # Brew package does not have unlock-notify run: | - brew install sqlite - export LD_LIBRARY_PATH=$(brew --prefix sqlite)/lib - export CPATH=$(brew --prefix sqlite)/include - export PKG_CONFIG_PATH=$(brew --prefix sqlite)/lib/pkgconfig + wget https://www.sqlite.org/2020/sqlite-autoconf-3310100.tar.gz + tar xzf sqlite-autoconf-3310100.tar.gz + cd sqlite-autoconf-3310100 + export CFLAGS='-DSQLITE_ENABLE_UNLOCK_NOTIFY=1' + ./configure + make + sudo make install + cd .. - name: Install ffmpeg # The libbluray ffmpeg dependency fails without the chown (source: stackoverflow) @@ -58,7 +61,7 @@ jobs: brew install ffmpeg - name: Install other dependencies - run: brew install libunistring libmxml confuse libplist libwebsockets libevent libgcrypt json-c protobuf-c libsodium gnutls pulseaudio openssl + run: brew install libunistring libmxml confuse libplist sqlite libwebsockets libevent libgcrypt json-c protobuf-c libsodium gnutls pulseaudio openssl - name: Configure run: |