diff --git a/.github/scripts/macOS/prepare.sh b/.github/scripts/macOS/prepare.sh index e10440e89..b1861ffc2 100755 --- a/.github/scripts/macOS/prepare.sh +++ b/.github/scripts/macOS/prepare.sh @@ -3,10 +3,12 @@ AJA_INST=/var/tmp/ntv2sdk # AJA installation directory TEMP_INST=/tmp/install +CPATH=/usr/local/include:/usr/local/opt/qt/include +LIBRARY_PATH=/usr/local/lib:/usr/local/opt/qt/lib echo "::set-env name=AJA_DIRECTORY::$AJA_INST" echo "::set-env name=UG_SKIP_NET_TESTS::1" -echo "::set-env name=CPATH::/usr/local/include:/usr/local/opt/qt/include" -echo "::set-env name=LIBRARY_PATH::/usr/local/lib:/usr/local/opt/qt/lib" +echo "::set-env name=CPATH::$CPATH" +echo "::set-env name=LIBRARY_PATH::$LIBRARY_PATH" # libcrypto.pc (and other libcrypto files) is not linked to /usr/local/{lib,include} because conflicting with system libcrypto echo "::set-env name=PKG_CONFIG_PATH::/usr/local/lib/pkgconfig:/usr/local/opt/qt/lib/pkgconfig:/usr/local/opt/openssl/lib/pkgconfig" echo "::add-path::/usr/local/opt/qt/bin" @@ -42,6 +44,23 @@ if [ -n "$sdk_pass" ]; then cd $TEMP_INST fi +# Install NDI +if [ -n "$sdk_pass" -a "$GITHUB_REF" = refs/heads/ndi-build ]; then + curl --netrc-file <(cat <<<"machine frakira.fi.muni.cz login sdk password $sdk_pass") https://frakira.fi.muni.cz/~xpulec/sdks/NDISDK_Apple.pkg -O + sudo installer -pkg NDISDK_Apple.pkg -target / + rm NDISDK_Apple.pkg + sudo ln -s "/Library/NDI SDK for Apple/" /Library/NDI + cd /Library/NDI/lib/x64 + sudo ln -s libndi.?.dylib libndi.dylib + export CPATH=${CPATH:+"$CPATH:"}/Library/NDI/include + export LIBRARY_PATH=${LIBRARY_PATH:+"$LIBRARY_PATH:"}/Library/NDI/lib/x64 + export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+"$DYLD_LIBRARY_PATH:"}/Library/NDI/lib/x64 + echo "::set-env name=CPATH::$CPATH" + echo "::set-env name=LIBRARY_PATH::$LIBRARY_PATH" + echo "::set-env name=DYLD_LIBRARY_PATH::$DYLD_LIBRARY_PATH" + cd $TEMP_INST +fi + # Install live555 git clone https://github.com/xanview/live555/ cd live555 diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 5e60fdbbf..3f67e8aaa 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -118,7 +118,7 @@ jobs: - name: bootstrap run: .github/scripts/macOS/prepare.sh - name: configure - run: ARCH=-msse4.2 ./autogen.sh --enable-qt --with-live555=/usr/local + run: "export ARCH=-msse4.2; [ ${{ github.ref }} != refs/heads/ndi-build ] && NDI=-disable-ndi; ./autogen.sh --enable-qt --with-live555=/usr/local $NDI" - name: make bundle run: make -j4 gui-bundle - name: sign+notarize