From bb989e322b8eb0468cd0d24d411260118e210c96 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Wed, 24 Mar 2021 10:54:21 +0100 Subject: [PATCH] GitHub CI [Mac]: install DELTA directly from SDK --- .github/scripts/macOS/prepare.sh | 15 +++++++++++++-- .github/workflows/ccpp.yml | 4 ++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.github/scripts/macOS/prepare.sh b/.github/scripts/macOS/prepare.sh index 527568e74..a3006e0cc 100755 --- a/.github/scripts/macOS/prepare.sh +++ b/.github/scripts/macOS/prepare.sh @@ -47,8 +47,19 @@ if [ -f /var/tmp/sdks/ntv2sdkmac.zip ]; then fi # DELTACAST -if [ -f /var/tmp/sdks/VideoMasterHD_mac.tar.xz ]; then - sudo tar xJf /var/tmp/sdks/VideoMasterHD_mac.tar.xz -C $(xcrun --show-sdk-path)/System/Library/Frameworks +if [ -f /var/tmp/sdks/VideoMaster_SDK_MacOSX.zip ]; then + unzip /var/tmp/sdks/VideoMaster_SDK_MacOSX.zip + sudo installer -pkg VideoMaster_SDK.pkg -target / + cd /Library/Frameworks + sudo install_name_tool -change /Library/Frameworks/VideoMasterHD.framework/Versions/A/VideoMasterHD @executable_path/../Frameworks/VideoMasterHD.framework/Versions/A/VideoMasterHD /Library/Frameworks/VideoMasterHD.framework/VideoMasterHD + sudo install_name_tool -id @executable_path/../Frameworks/VideoMasterHD.framework/Versions/A/VideoMasterHD /Library/Frameworks/VideoMasterHD.framework/VideoMasterHD + sudo install_name_tool -change /Library/Frameworks/libVideoMasterHD_SP.dylib @executable_path/../Frameworks/libVideoMasterHD_SP.dylib /Library/Frameworks/VideoMasterHD.framework/VideoMasterHD + sudo install_name_tool -id @executable_path/../Frameworks/libVideoMasterHD_SP.dylib /Library/Frameworks/libVideoMasterHD_SP.dylib + sudo install_name_tool -id @executable_path/../Frameworks/VideoMasterHD_Audio.framework/Versions/A/VideoMasterHD_Audio /Library/Frameworks/VideoMasterHD_Audio.framework/Versions/A/VideoMasterHD_Audio + sudo install_name_tool -change /Library/Frameworks/VideoMasterHD.framework/Versions/A/VideoMasterHD @executable_path/../Frameworks/VideoMasterHD.framework/Versions/A/VideoMasterHD /Library/Frameworks/VideoMasterHD_Audio.framework/Versions/A/VideoMasterHD_Audio + sudo cp -a VideoMasterHD.framework VideoMasterHD_Audio.framework libVideoMasterHD_SP.dylib $(xcrun --show-sdk-path)/System/Library/Frameworks + cd - + sudo rm -rf /Library/Frameworks/VideoMasterHD* # ensure that only the copy above is used fi # Install NDI diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 4e954aad7..e8796dbac 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -143,12 +143,12 @@ jobs: uses: actions/cache@v1 with: path: '/var/tmp/sdks' - key: cache-macos-sdks + key: cache-macos-sdks-2 - name: Download SDKs if: steps.cache-macos-sdk.outputs.cache-hit != 'true' && env.SDK_URL != null run: | mkdir /var/tmp/sdks && cd /var/tmp/sdks - curl -S -O $SDK_URL/ntv2sdkmac.zip -O $SDK_URL/VideoMasterHD_mac.tar.xz -O $SDK_URL/NDISDK_Apple.pkg + curl -S -O $SDK_URL/ntv2sdkmac.zip -O $SDK_URL/VideoMaster_SDK_MacOSX.zip -O $SDK_URL/NDISDK_Apple.pkg - name: Cache Free SDKs id: cache-macos-free-sdks uses: actions/cache@v1