Merge pull request #919 from obs-ndi/develop

Preparing for 4.12.0 release

.github/actions/setup-macos-codesigning/action.yaml

@@ -75,7 +75,7 @@ runs:
 
           print -n "${MACOS_SIGNING_CERT}" | base64 --decode --output="${certificate_path}"
 
-          : "${MACOS_KEYCHAIN_PASSWORD:="$(print ${RANDOM} | sha1sum | head -c 32)"}"
+          : "${MACOS_KEYCHAIN_PASSWORD:="$(print ${RANDOM} | shasum | head -c 32)"}"
 
           print '::group::Keychain setup'
           security create-keychain -p "${MACOS_KEYCHAIN_PASSWORD}" ${keychain_path}

.github/scripts/.build.zsh

@@ -242,6 +242,7 @@ ${_usage_host:-}"
           -G "${generator}"
           -DQT_VERSION=${QT_VERSION:-6}
           -DCMAKE_BUILD_TYPE=${config}
+          -DCMAKE_INSTALL_PREFIX=/usr
         )
 
         local cmake_version

.github/workflows/build-project.yaml

@@ -3,7 +3,7 @@ on:
   workflow_call:
 jobs:
   check-event:
-    name: Check GitHub Event Data 📡
+    name: Check GitHub Event Data 🔎
     runs-on: ubuntu-22.04
     defaults:
       run:
@@ -29,7 +29,7 @@ jobs:
           case "${GITHUB_EVENT_NAME}" in
             pull_request)
               config_data=('codesign:false' 'notarize:false' 'package:false' 'config:RelWithDebInfo')
-              if gh pr view --json labels \
+              if gh pr view ${{ github.event.number }} --json labels \
                 | jq -e -r '.labels[] | select(.name == "Seeking Testers")' > /dev/null; then
                 config_data[0]='codesign:true'
                 config_data[2]='package:true'
@@ -77,9 +77,9 @@ jobs:
           if (( ${+RUNNER_DEBUG} )) setopt XTRACE
 
           print '::group::Clean Homebrew Environment'
-          typeset -a to_remove=()
+          local -a to_remove=()
 
-          if (( #to_remove > 0 )) brew uninstall --ignore-dependencies ${to_remove}
+          if (( #to_remove )) brew uninstall --ignore-dependencies ${to_remove}
           print '::endgroup::'
 
           local product_name
@@ -100,7 +100,7 @@ jobs:
 
       - name: Set Up Codesigning 🔑
         uses: ./.github/actions/setup-macos-codesigning
-        if: ${{ fromJSON(needs.check-event.outputs.codesign) }}
+        if: fromJSON(needs.check-event.outputs.codesign)
         id: codesign
         with:
           codesignIdentity: ${{ secrets.MACOS_SIGNING_APPLICATION_IDENTITY }}

CI/libndi-create-deb.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+
+# This script is called by CI/libndi-package.sh
+
 set -ex
 
 SDK_ROOT="/tmp/ndisdk"

CI/libndi-create-dev-deb.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+
+# This script is called by CI/libndi-package.sh
+
 set -ex
 
 SDK_ROOT="/tmp/ndisdk"

CI/libndi-get.sh

@@ -1,25 +1,25 @@
 #!/bin/bash
-
 set -e
 
 LIBNDI_INSTALLER_NAME="Install_NDI_SDK_v5_Linux"
 LIBNDI_INSTALLER="$LIBNDI_INSTALLER_NAME.tar.gz"
-LIBNDI_INSTALLER_SHA256="00d0bedc2c72736d82883fc0fd6bc1a544e7958c7e46db79f326633d44e15153"
 
 #sudo apt-get install curl
 
 pushd /tmp
+
 curl -L -o $LIBNDI_INSTALLER https://downloads.ndi.tv/SDK/NDI_SDK_Linux/$LIBNDI_INSTALLER -f --retry 5
-echo "$LIBNDI_INSTALLER_SHA256 $LIBNDI_INSTALLER" | sha256sum -c
 tar -xf $LIBNDI_INSTALLER
 yes | PAGER="cat" sh $LIBNDI_INSTALLER_NAME.sh
 
 rm -rf /tmp/ndisdk
 mv "/tmp/NDI SDK for Linux" /tmp/ndisdk
 ls /tmp/ndisdk
 
-# NOTE: This does an actual local install...
-#sudo cp -P ndisdk/lib/x86_64-linux-gnu/* /usr/local/lib/
-#sudo ldconfig
+if [ $1 == "install" ]; then
+    # NOTE: This should do an actual local install...
+    sudo cp -P /tmp/ndisdk/lib/x86_64-linux-gnu/* /usr/local/lib/
+    sudo ldconfig
+fi
 
 popd

CI/libndi-package.sh

@@ -1,8 +1,12 @@
 #!/bin/bash
 
+#
+# This script calls libndi-get.sh and then libndi-create-deb.sh and libndi-create-dev-deb.sh
+#
+
 set -e
 
-LIBNDI_VERSION="5.5.3"
+LIBNDI_VERSION="5.6.0"
 
 SCRIPT_DIR=$(dirname "$0")
 

CMakeLists.txt

@@ -4,9 +4,6 @@ include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/common/bootstrap.cmake" NO_POLICY_SCO
 
 project(${_name} VERSION ${_version})
 
-option(ENABLE_FRONTEND_API "Use obs-frontend-api for UI functionality" ON)
-option(ENABLE_QT "Use Qt functionality" ON)
-
 include(compilerconfig)
 include(defaults)
 include(helpers)
@@ -34,9 +31,13 @@ if(ENABLE_QT)
                AUTORCC ON)
 endif()
 
-# Add your custom source files here - header files are optional and only required for visibility
+# cmake-format: off
+# Add your custom source files here Header files are optional and only required for visibility.
 # e.g. in Xcode or Visual Studio
-target_sources(${CMAKE_PROJECT_NAME} PRIVATE src/plugin-main.cpp
+# cmake-format: on
+target_sources(
+  ${CMAKE_PROJECT_NAME}
+  PRIVATE src/plugin-main.cpp
           src/plugin-main.h
           src/obs-ndi-source.cpp
           src/obs-ndi-output.cpp