From 6ad42048b0b8a1ffc51d4b206334c8755c60020b Mon Sep 17 00:00:00 2001 From: Markus Perl Date: Tue, 26 Nov 2024 08:34:25 +0100 Subject: [PATCH] MacOS System detection --- .github/workflows/build.yml | 2 +- build-ffmpeg | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ce057e9..3f37676 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: build-macos: name: build in native macOS - runs-on: macos-latest + runs-on: macos-15 steps: - name: Checkout code uses: actions/checkout@v4 diff --git a/build-ffmpeg b/build-ffmpeg index 43d59fa..b36b8e0 100755 --- a/build-ffmpeg +++ b/build-ffmpeg @@ -21,6 +21,15 @@ LATEST=false MANPAGES=1 CURRENT_PACKAGE_VERSION=0 + +command_exists() { + if ! [[ -x $(command -v "$1") ]]; then + return 1 + fi + + return 0 +} + # Check for Apple Silicon if [[ ("$(uname -m)" == "arm64") && ("$OSTYPE" == "darwin"*) ]]; then # If arm64 AND darwin (macOS) @@ -179,14 +188,6 @@ build() { return 0 } -command_exists() { - if ! [[ -x $(command -v "$1") ]]; then - return 1 - fi - - return 0 -} - library_exists() { if ! [[ -x $(pkg-config --exists --print-errors "$1" 2>&1 >/dev/null) ]]; then return 1