From 642c707dc17eaa77900866d658331bb26fc314cb Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Wed, 4 Mar 2026 12:23:51 +0100 Subject: [PATCH] install-common-deps.sh: rm MACOSX_DEPLOYMENT_TARGET Seems no longer being needed and it is unclear why it was actually needed. Run download_build_aja() in subshell (not added when the fn split to download/install in 2024 with the commit 0ed7d449) to avoid leaking exactly such variables that can influence further workflow. --- .github/scripts/install-common-deps.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/scripts/install-common-deps.sh b/.github/scripts/install-common-deps.sh index 8746259e1..243436894 100755 --- a/.github/scripts/install-common-deps.sh +++ b/.github/scripts/install-common-deps.sh @@ -35,7 +35,7 @@ cineform-0001-CMakeList.txt-remove-output-lib-name-force-UNIX.patch sudo cmake --install build )} -download_build_aja() { +download_build_aja() {( aja_url=https://github.com/aja-video/libajantv2.git git clone -b release --depth 1 $aja_url # TODO TOREMOVE this workarounds when not needed @@ -43,14 +43,13 @@ download_build_aja() { mv ver-fix-no-NL$$.txt libajantv2/VERSION.txt sed -i -e '/MACOS_SDK_VERSION/d' libajantv2/cmake/CMakeOptions.cmake && SDKROOT=$(xcrun --sdk macosx --show-sdk-path) && export SDKROOT - export MACOSX_DEPLOYMENT_TARGET=10.13 # needed for arm64 mac cmake -DAJANTV2_DISABLE_DEMOS=ON -DAJANTV2_DISABLE_DRIVER=ON \ -DAJANTV2_DISABLE_TOOLS=ON -DAJANTV2_DISABLE_TESTS=ON \ -DAJANTV2_DISABLE_PLUGIN_LOAD=ON -DAJANTV2_BUILD_SHARED=ON \ -DCMAKE_BUILD_TYPE=Release -Blibajantv2/build -Slibajantv2 cmake --build libajantv2/build --config Release -j "$(nproc)" -} +)} install_aja() {( if [ "$(uname -s)" = Linux ]; then