From 4977da090b5368ac4bc326bfdfd655ad05270e9a Mon Sep 17 00:00:00 2001
From: Martin Pulec <martin.pulec@cesnet.cz>
Date: Thu, 24 Oct 2024 14:27:28 +0200
Subject: [PATCH] CI macos: re-enable DELTACAST

The file name has changed and --enable-deltacast was used just if the
download succeeded (which didn't).

Fixes the commit 98d4969b (2024-05-24) that disabled deltacast, because
the archive was not downloaded due to wrong name.
---
 .github/scripts/environment.sh          | 2 ++
 .github/scripts/macOS/install_others.sh | 8 ++++----
 .github/workflows/README.md             | 2 +-
 .github/workflows/ccpp.yml              | 6 +++---
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/scripts/environment.sh b/.github/scripts/environment.sh
index a6455408d..6f3510190 100644
--- a/.github/scripts/environment.sh
+++ b/.github/scripts/environment.sh
@@ -133,3 +133,5 @@ import_signing_key() {
 }
 import_signing_key
 
+printf '%b' 'DELTA_MAC_ARCHIVE=videomaster-macos-dev.tar.gz\n' >> "$GITHUB_ENV"
+
diff --git a/.github/scripts/macOS/install_others.sh b/.github/scripts/macOS/install_others.sh
index f2e3c3541..7414ea269 100755
--- a/.github/scripts/macOS/install_others.sh
+++ b/.github/scripts/macOS/install_others.sh
@@ -31,12 +31,12 @@ install_ximea() {(
 )}
 
 install_deltacast() {
-        filename=videomaster-macos-dev.zip
-        if [ ! -f "$SDK_NONFREE_PATH/$filename" ]; then
+        if [ ! -f "$SDK_NONFREE_PATH/$DELTA_MAC_ARCHIVE" ]; then
                 return
         fi
-        unzip "$SDK_NONFREE_PATH/$filename"
-        sudo cp -a Frameworks/VideoMasterHD* /Library/Frameworks/
+        tar xzf "$SDK_NONFREE_PATH/$DELTA_MAC_ARCHIVE"
+        sudo cp -a Deltacast/Library/Frameworks/VideoMasterHD* \
+                /Library/Frameworks/
         export FEATURES="${FEATURES+$FEATURES }--enable-deltacast"
         echo "FEATURES=$FEATURES" >> "$GITHUB_ENV"
         export COMMON_OSX_FLAGS="${COMMON_OSX_FLAGS+$COMMON_OSX_FLAGS }\
diff --git a/.github/workflows/README.md b/.github/workflows/README.md
index b807b8bb4..330627f5e 100644
--- a/.github/workflows/README.md
+++ b/.github/workflows/README.md
@@ -26,7 +26,7 @@ Further subsection briefly describe individual assets and how to obtain them.  A
 are unmodified files downloaded from vendor website. However, rename may be required.
 
 ### macOS
-- **videomaster-macos-dev.zip** - VideoMaster SDK for Mac from
+- **videomaster-macos-dev.tar.gz** - VideoMaster SDK for Mac from
   [DELTACAST](https://www.deltacast.tv/support/download-center)
 
 ### Windows
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 0eeaef3fc..acb7fbc66 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -149,7 +149,7 @@ jobs:
     - name: Fetch SDKs ETags
       id: etags
       run: |
-        echo "nonfree=$($GITHUB_WORKSPACE/.github/scripts/get-etags.sh $SDK_URL/VideoMaster_SDK_MacOSX.zip)" >> $GITHUB_OUTPUT
+        echo "nonfree=$($GITHUB_WORKSPACE/.github/scripts/get-etags.sh "$SDK_URL/$DELTA_MAC_ARCHIVE")" >> $GITHUB_OUTPUT
         echo "ndi=$($GITHUB_WORKSPACE/.github/scripts/get-etags.sh https://downloads.ndi.tv/SDK/NDI_SDK_Mac/Install_NDI_SDK_v6_Apple.pkg)" >> $GITHUB_OUTPUT
         echo "ximea=$($GITHUB_WORKSPACE/.github/scripts/get-etags.sh https://www.ximea.com/downloads/recent/XIMEA_OSX_SP.dmg)" >> $GITHUB_OUTPUT
     - name: Set environment
@@ -159,14 +159,14 @@ jobs:
       uses: actions/cache@main
       with:
         path: ${{ env.SDK_NONFREE_PATH }}
-        key: cache-nonfree-sdks-${{ runner.os }}-${{ hashFiles('.github/scripts/macOS/prepare_nonfree_sdks.sh') }}-${{ steps.etags.outputs.nonfree }}
+        key: cache-nonfree-sdks-${{ runner.os }}-${{ steps.etags.outputs.nonfree }}
     - name: Download Non-Free SDKs
       if: steps.cache-macos-nonfree-sdks.outputs.cache-hit != 'true' && env.SDK_URL != null
       run: |
         rm -rf ${{ env.SDK_NONFREE_PATH }}
         mkdir -p ${{ env.SDK_NONFREE_PATH }}
         cd ${{ env.SDK_NONFREE_PATH }}
-        curl -S -f -O $SDK_URL/VideoMaster_SDK_MacOSX.zip || true
+        curl -S -f -O "$SDK_URL/$DELTA_MAC_ARCHIVE" || true
     - name: Cache XIMEA
       id: cache-macos-ximea
       uses: actions/cache@main