diff --git a/.github/scripts/Linux/prepare.sh b/.github/scripts/Linux/prepare.sh index ec3a685a4..e0a877748 100755 --- a/.github/scripts/Linux/prepare.sh +++ b/.github/scripts/Linux/prepare.sh @@ -29,10 +29,11 @@ cd package sudo ./install # Install AJA -if [ -z "$sdk_pass" ]; then exit 0; fi -curl --netrc-file <(cat <<<"machine frakira.fi.muni.cz login sdk password $sdk_pass") https://frakira.fi.muni.cz/~xpulec/sdks/ntv2sdklinux.zip -O -unzip ntv2sdklinux.zip -d /var/tmp -mv /var/tmp/ntv2sdk* /var/tmp/ntv2sdk -cd /var/tmp/ntv2sdk/ajalibraries/ajantv2 -make +if [ -n "$sdk_pass" ]; then + curl --netrc-file <(cat <<<"machine frakira.fi.muni.cz login sdk password $sdk_pass") https://frakira.fi.muni.cz/~xpulec/sdks/ntv2sdklinux.zip -O + unzip ntv2sdklinux.zip -d /var/tmp + mv /var/tmp/ntv2sdk* /var/tmp/ntv2sdk + cd /var/tmp/ntv2sdk/ajalibraries/ajantv2 + make +fi diff --git a/.github/scripts/macOS/prepare.sh b/.github/scripts/macOS/prepare.sh index 7a6335429..a7cf49048 100755 --- a/.github/scripts/macOS/prepare.sh +++ b/.github/scripts/macOS/prepare.sh @@ -19,18 +19,20 @@ brew install ossp-uuid # for cineform ( cd cineform-sdk/ && cmake . && make CFHDCodecStatic ) # Install XIMEA -if [ -z "$sdk_pass" ]; then exit 0; fi -curl --netrc-file <(cat <<<"machine frakira.fi.muni.cz login sdk password $sdk_pass") https://frakira.fi.muni.cz/~xpulec/sdks/m3api.tar.xz -O -sudo tar xJf m3api.tar.xz -C $(xcrun --show-sdk-path)/$SDKPATH/System/Library/Frameworks +if [ -n "$sdk_pass" ]; then + curl --netrc-file <(cat <<<"machine frakira.fi.muni.cz login sdk password $sdk_pass") https://frakira.fi.muni.cz/~xpulec/sdks/m3api.tar.xz -O + sudo tar xJf m3api.tar.xz -C $(xcrun --show-sdk-path)/$SDKPATH/System/Library/Frameworks +fi # Install AJA -if [ -z "$sdk_pass" ]; then exit 0; fi -curl --netrc-file <(cat <<<"machine frakira.fi.muni.cz login sdk password $sdk_pass") https://frakira.fi.muni.cz/~xpulec/sdks/ntv2sdkmac.zip -O -unzip ntv2sdkmac.zip -d /var/tmp -mv /var/tmp/ntv2sdk* /var/tmp/ntv2sdk -cd /var/tmp/ntv2sdk/ajalibraries/ajantv2/build -xcodebuild -project ajantv2.xcodeproj -sudo rm -f /usr/local/lib/libajantv2.dylib -sudo cp ../../../bin/ajantv2.dylib /usr/local/lib/libajantv2.dylib -sudo ln -fs /usr/local/lib/libajantv2.dylib /usr/local/lib/ajantv2.dylib +if [ -n "$sdk_pass" ]; then + curl --netrc-file <(cat <<<"machine frakira.fi.muni.cz login sdk password $sdk_pass") https://frakira.fi.muni.cz/~xpulec/sdks/ntv2sdkmac.zip -O + unzip ntv2sdkmac.zip -d /var/tmp + mv /var/tmp/ntv2sdk* /var/tmp/ntv2sdk + cd /var/tmp/ntv2sdk/ajalibraries/ajantv2/build + xcodebuild -project ajantv2.xcodeproj + sudo rm -f /usr/local/lib/libajantv2.dylib + sudo cp ../../../bin/ajantv2.dylib /usr/local/lib/libajantv2.dylib + sudo ln -fs /usr/local/lib/libajantv2.dylib /usr/local/lib/ajantv2.dylib +fi diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 0367f3fec..313df815a 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -114,7 +114,7 @@ jobs: - name: bootsrap MSYS2 run: C:\msys64\usr\bin\bash -lc '$GITHUB_WORKSPACE/.github/scripts/Windows/prepare_msys.sh' - name: configure - run: C:\msys64\usr\bin\bash -lc "./autogen.sh --enable-aja --enable-qt" + run: C:\msys64\usr\bin\bash -lc "./autogen.sh --enable-qt" - name: make run: C:\msys64\usr\bin\bash -lc "make" - name: make check