Update expected NDI SDK locations for v5

Author: WalkerKnapp

.github/workflows/gradle.yml

@@ -23,7 +23,7 @@ jobs:
       id: cacheNDI
       with:
         path: 'NDI SDK*'
-        key: ${{ runner.os }}-ndi5
+        key: ${{ runner.os }}-ndiv5
 
     - name: Setup the NDI SDK
       if: steps.cacheNDI.outputs.cache-hit != 'true'
@@ -33,12 +33,14 @@ jobs:
         rm Install_NDI_SDK_v5_Linux.tar.gz && rm Install_NDI_SDK_v5_Linux.sh
         wget https://downloads.ndi.tv/SDK/NDI_SDK_Android/Install_NDI_Advanced_SDK_v5_Android.tar.gz && tar -xvf Install_NDI_Advanced_SDK_v5_Android.tar.gz
         yes | ./Install_NDI_Advanced_SDK_v5_Android.sh > /dev/null
+        mv "NDI Advanced SDK for Android" "NDI SDK for Android"
         rm Install_NDI_Advanced_SDK_v5_Android.tar.gz && rm Install_NDI_Advanced_SDK_v5_Android.sh
         wget https://downloads.ndi.tv/SDK/NDI_SDK/NDI%205%20SDK.exe && /opt/innoextract-1.9-linux/innoextract "NDI 5 SDK.exe"
         mkdir "NDI SDK for Windows" && mv app/* "NDI SDK for Windows"
         rm -r app && rm "NDI 5 SDK.exe"
         wget https://downloads.ndi.tv/SDK/NDI_SDK_Mac/Install_NDI_SDK_v5_macOS.pkg && 7z x Install_NDI_SDK_v5_macOS.pkg
         7z x Payload~
+        mv "NDI SDK for macOS" "NDI SDK for Apple"
         rm Install_NDI_SDK_v5_macOS.pkg && rm Payload~
 
     - uses: actions/cache@v2

.github/workflows/release.yml

@@ -27,7 +27,7 @@ jobs:
         id: cacheNDI
         with:
           path: 'NDI SDK*'
-          key: ${{ runner.os }}-ndi5
+          key: ${{ runner.os }}-ndiv5
 
       - name: Setup the NDI SDK
         if: steps.cacheNDI.outputs.cache-hit != 'true'
@@ -37,12 +37,14 @@ jobs:
           rm Install_NDI_SDK_v5_Linux.tar.gz && rm Install_NDI_SDK_v5_Linux.sh
           wget https://downloads.ndi.tv/SDK/NDI_SDK_Android/Install_NDI_Advanced_SDK_v5_Android.tar.gz && tar -xvf Install_NDI_Advanced_SDK_v5_Android.tar.gz
           yes | ./Install_NDI_Advanced_SDK_v5_Android.sh > /dev/null
+          mv "NDI Advanced SDK for Android" "NDI SDK for Android"
           rm Install_NDI_Advanced_SDK_v5_Android.tar.gz && rm Install_NDI_Advanced_SDK_v5_Android.sh
           wget https://downloads.ndi.tv/SDK/NDI_SDK/NDI%205%20SDK.exe && /opt/innoextract-1.9-linux/innoextract "NDI 5 SDK.exe"
           mkdir "NDI SDK for Windows" && mv app/* "NDI SDK for Windows"
           rm -r app && rm "NDI 5 SDK.exe"
           wget https://downloads.ndi.tv/SDK/NDI_SDK_Mac/Install_NDI_SDK_v5_macOS.pkg && 7z x Install_NDI_SDK_v5_macOS.pkg
           7z x Payload~
+          mv "NDI SDK for macOS" "NDI SDK for Apple"
           rm Install_NDI_SDK_v5_macOS.pkg && rm Payload~
 
       - uses: actions/cache@v2

devolay-natives/build.gradle.kts

@@ -231,7 +231,7 @@ val assembleIntegratedNDIArtifacts by tasks.registering(Jar::class) {
                     nativeLicensePaths.add(file("../NDI SDK for Apple/licenses/libndi_licenses.txt").toPath())
                     when (machine.architecture.name) {
                         "x86-64" -> {
-                            nativeLibPath = file("../NDI SDK for Apple/lib/x64/libndi.4.dylib").toPath()
+                            nativeLibPath = file("../NDI SDK for Apple/lib/macOS/libndi.dylib").toPath()
                         }
                     }
                 } else if (machine.operatingSystemFamily.name == "linux") {