Merge pull request #22 from PatTheMav/post-merge-fixes

Fix issues reported post merge of rework changes

.github/actions/build-plugin/action.yml

@@ -39,6 +39,7 @@ runs:
         )
 
         if [[ '${{ inputs.codesign }}' == 'true' ]] build_args+=(-s)
+        if (( ${+CI} && ${+RUNNER_DEBUG} )) build_args+=(--debug)
 
         ${{ inputs.workingDirectory }}/.github/scripts/build-macos.zsh ${build_args}
 
@@ -51,7 +52,11 @@ runs:
           -t linux-${{ inputs.target }}
         )
 
-        ${{ inputs.workingDirectory }}/.github/scripts/build-linux.sh ${build_args[@]}
+        if [[ -n "${CI}" && -n "${RUNNER_DEBUG}" ]]; then
+          build_args+=(--debug)
+        fi
+
+        ${{ inputs.workingDirectory }}/.github/scripts/build-linux.sh "${build_args[@]}"
 
     - name: Run Windows Build
       if: ${{ runner.os == 'Windows' }}
@@ -63,4 +68,10 @@ runs:
           CMakeGenerator = '${{ inputs.visualStudio }}'
         }
 
+        if ( ( Test-Path env:CI ) -and ( Test-Path env:RUNNER_DEBUG ) ) {
+          $BuildArgs += @{
+            Debug = $true
+          }
+        }
+
         ${{ inputs.workingDirectory }}/.github/scripts/Build-Windows.ps1 @BuildArgs

.github/actions/package-plugin/action.yml

@@ -59,6 +59,7 @@ runs:
 
         if [[ '${{ inputs.codesign }}' == 'true' ]] package_args+=(-s)
         if [[ '${{ inputs.notarize }}' == 'true' ]] package_args+=(-n)
+        if (( ${+CI} && ${+RUNNER_DEBUG} )) build_args+=(--debug)
 
         ${{ inputs.workingDirectory }}/.github/scripts/package-macos.zsh ${package_args}
 
@@ -70,8 +71,11 @@ runs:
           -c ${{ inputs.config }}
           -t linux-${{ inputs.target }}
         )
+        if [[ -n "${CI}" && -n "${RUNNER_DEBUG}" ]]; then
+          build_args+=(--debug)
+        fi
 
-        ${{ inputs.workingDirectory }}/.github/scripts/package-linux.sh ${package_args[@]}
+        ${{ inputs.workingDirectory }}/.github/scripts/package-linux.sh "${package_args[@]}"
 
     - name: Run Windows packaging
       if: ${{ runner.os == 'Windows' }}
@@ -86,4 +90,10 @@ runs:
           $PackageArgs += @{BuildInstaller = $true}
         }
 
+        if ( ( Test-Path env:CI ) -and ( Test-Path env:RUNNER_DEBUG ) ) {
+          $BuildArgs += @{
+            Debug = $true
+          }
+        }
+
         ${{ inputs.workingDirectory }}/.github/scripts/Package-Windows.ps1 @PackageArgs

.github/scripts/.build.zsh

@@ -39,7 +39,7 @@ build() {
   trap '_trap_error' ZERR
 
   fpath=("${SCRIPT_HOME}/utils.zsh" ${fpath})
-  autoload -Uz log_info log_error log_output set_loglevel check_${host_os} setup_${host_os} setup_obs
+  autoload -Uz log_info log_error log_output set_loglevel check_${host_os} setup_${host_os} setup_obs setup_ccache
 
   local -i _verbosity=1
   local -r _version='0.0.1'
@@ -111,6 +111,7 @@ Usage: %B${functrace[1]%:*}%b <option> [<options>]
       -v|--verbose) (( _verbosity += 1 )); shift ;;
       -h|--help) log_output ${_usage}; exit 0 ;;
       -V|--version) print -Pr "${_version}"; exit 0 ;;
+      --debug) _verbosity=3; shift ;;
       *) log_error "Unknown option: %B${1}%b"; log_output ${_usage}; exit 2 ;;
     }
   }
@@ -137,6 +138,7 @@ Usage: %B${functrace[1]%:*}%b <option> [<options>]
       ;;
   }
 
+  setup_ccache
   setup_obs
 
   pushd ${project_root}
@@ -179,4 +181,4 @@ Usage: %B${functrace[1]%:*}%b <option> [<options>]
   popd
 }
 
-build "${@}"
+build ${@}

.github/scripts/.package.zsh

@@ -113,6 +113,7 @@ Usage: %B${functrace[1]%:*}%b <option> [<options>]
       -v|--verbose) (( _verbosity += 1 )); shift ;;
       -h|--help) log_output ${_usage}; exit 0 ;;
       -V|--version) print -Pr "${_version}"; exit 0 ;;
+      --debug) _verbosity=3; shift ;;
       *) log_error "Unknown option: %B${1}%b"; log_output ${_usage}; exit 2 ;;
     }
   }
@@ -193,4 +194,4 @@ Usage: %B${functrace[1]%:*}%b <option> [<options>]
   }
 }
 
-package "${@}"
+package ${@}

.github/scripts/build-linux.sh

@@ -10,4 +10,4 @@ fi
 SCRIPT=$(readlink -f "${0}")
 SCRIPT_DIR=$(dirname "${SCRIPT}")
 
-zsh ${SCRIPT_DIR}/build-linux.zsh ${@}
+zsh ${SCRIPT_DIR}/build-linux.zsh "${@}"

.github/scripts/package-linux.sh

@@ -10,4 +10,4 @@ fi
 SCRIPT=$(readlink -f "${0}")
 SCRIPT_DIR=$(dirname "${SCRIPT}")
 
-zsh ${SCRIPT_DIR}/package-linux.zsh ${@}
+zsh ${SCRIPT_DIR}/package-linux.zsh "${@}"

.github/scripts/utils.pwsh/Invoke-External.ps1

@@ -14,7 +14,7 @@ function Invoke-External {
     }
 
     if ( ! ( Test-Path function:Log-Information ) ) {
-        . $PSScriptRoot/Utils-Logger.ps1
+        . $PSScriptRoot/Logger.ps1
     }
 
     $Command = $args[0]

.github/scripts/utils.zsh/check_macos

@@ -16,3 +16,4 @@ if (( ! ${+commands[brew]} )) {
   return 2
 }
 brew bundle --file "${SCRIPT_HOME}/.Brewfile"
+rehash

.github/scripts/utils.zsh/setup_ccache

@@ -0,0 +1,14 @@
+autoload -Uz log_debug log_warning
+
+if (( ${+commands[ccache]} )) {
+  log_debug "Found ccache at ${commands[ccache]}"
+
+  if (( ${+CI} )) {
+    ccache --set-config=cache_dir="${GITHUB_WORKSPACE:-${HOME}}/.ccache"
+    ccache --set-config=max_size="${CCACHE_SIZE:-500M}"
+    ccache --set-config=compression=true
+    ccache -z > /dev/null
+  }
+} else {
+  log_warning "No ccache found on the system"
+}

.github/scripts/utils.zsh/setup_linux

@@ -11,6 +11,7 @@ sudo apt-get -qq update
 sudo apt-get install -y \
     build-essential \
     ninja-build \
+    ccache \
     clang \
     clang-format \
     git \

.github/workflows/main.yml

@@ -1,13 +1,18 @@
-name: 'Build on Push and Tag'
+name: Plugin Build
 
 on:
   push:
-    paths-ignore: ['**.md']
-    branches: [master]
-    tags: ['*']
+    paths-ignore:
+      - '**.md'
+    branches:
+      - master
+    tags:
+      - '*'
   pull_request:
-    paths-ignore: ['**.md']
-    branches: [master]
+    paths-ignore:
+      - '**.md'
+    branches:
+      - master
 
 env:
   PLUGIN_NAME: 'obs-plugintemplate'
@@ -20,7 +25,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
         with:
-          submodules: 'recursive'
+          submodules: recursive
 
       - name: Install clang-format
         run: sudo apt-get install -y clang-format-12
@@ -38,8 +43,9 @@ jobs:
     name: 02 - macOS
     runs-on: macos-11
     strategy:
+      fail-fast: true
       matrix:
-        arch: ['x86_64', 'arm64', 'universal']
+        arch: [x86_64, arm64, universal]
     if: always()
     needs: [clang_check]
     outputs:
@@ -55,21 +61,23 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
         with:
-          path: 'plugin'
-          submodules: 'recursive'
+          path: plugin
+          submodules: recursive
 
       - name: Checkout obs-studio
         uses: actions/checkout@v3
         with:
           repository: 'obsproject/obs-studio'
-          path: 'obs-studio'
+          path: obs-studio
           fetch-depth: 0
-          submodules: 'recursive'
+          submodules: recursive
 
       - name: Setup Environment
         id: setup
         working-directory: ${{ github.workspace }}/plugin
         run: |
+          ## SETUP ENVIRONMENT SCRIPT
+          print '::group::Clean Homebrew Environment'
           typeset -a to_remove=()
 
           for formula (speexdsp curl php) {
@@ -77,7 +85,9 @@ jobs:
           }
 
           if (( #to_remove > 0 )) brew uninstall --ignore-dependencies ${to_remove}
+          print '::endgroup::'
 
+          print '::group::Set up code signing'
           if [[ '${{ secrets.MACOS_SIGNING_APPLICATION_IDENTITY }}' != '' && \
                 '${{ secrets.MACOS_SIGNING_INSTALLER_IDENTITY }}' != '' && \
                 '${{ secrets.MACOS_SIGNING_CERT }}' != '' ]] {
@@ -92,9 +102,10 @@ jobs:
           } else {
             print '::set-output name=haveNotarizationUser::false'
           }
+          print '::endgroup::'
 
           print "::set-output name=ccacheDate::$(date +"%Y-%m-%d")"
-          print "::set-output name=commitHash::$(git rev-parse --short HEAD)"
+          print "::set-output name=commitHash::${"$(git rev-parse HEAD)"[0,9]}"
 
       - name: Restore Compilation Cache
         id: ccache-cache
@@ -119,6 +130,7 @@ jobs:
         if: ${{ github.event_name != 'pull_request' && steps.setup.outputs.haveCodesignIdent == 'true' }}
         uses: apple-actions/import-codesign-certs@253ddeeac23f2bdad1646faac5c8c2832e800071
         with:
+          keychain-password: ${{ github.run_id }}
           p12-file-base64: ${{ secrets.MACOS_SIGNING_CERT }}
           p12-password: ${{ secrets.MACOS_SIGNING_CERT_PASSWORD }}
 
@@ -161,8 +173,9 @@ jobs:
     name: 02 - Linux
     runs-on: ubuntu-20.04
     strategy:
+      fail-fast: true
       matrix:
-        arch: ['x86_64']
+        arch: [x86_64]
     if: always()
     needs: [clang_check]
     outputs:
@@ -174,37 +187,39 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
         with:
-          path: 'plugin'
-          submodules: 'recursive'
+          path: plugin
+          submodules: recursive
 
       - name: Checkout obs-studio
         uses: actions/checkout@v3
         with:
           repository: 'obsproject/obs-studio'
-          path: 'obs-studio'
+          path: obs-studio
           fetch-depth: 0
-          submodules: 'recursive'
+          submodules: recursive
 
       - name: Setup Environment
         working-directory: ${{ github.workspace }}/plugin
         id: setup
         run: |
+          ## SETUP ENVIRONMENT SCRIPT
           echo "::set-output name=ccacheDate::$(date +"%Y-%m-%d")"
-          echo "::set-output name=commitHash::$(git rev-parse --short HEAD)"
+          echo "::set-output name=commitHash::$(git rev-parse HEAD | cut -c1-9)"
 
       - name: Restore Compilation Cache
         id: ccache-cache
         uses: actions/cache@v2.1.7
         with:
           path: ${{ github.workspace }}/.ccache
-          key: macos-${{ matrix.arch }}-ccache-plugin-${{ steps.setup.outputs.ccacheDate }}
+          key: linux-${{ matrix.arch }}-ccache-plugin-${{ steps.setup.outputs.ccacheDate }}
           restore-keys: |
-            macos-${{ matrix.arch }}-ccache-plugin-
+            linux-${{ matrix.arch }}-ccache-plugin-
 
       - name: Check for GitHub Labels
         id: seekingTesters
         if: ${{ github.event_name == 'pull_request' }}
         run: |
+          ## GITHUB LABEL SCRIPT
           if [[ -n "$(curl -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" -s "${{ github.event.pull_request.url }}" | jq -e '.labels[] | select(.name == "Seeking Testers")')" ]]; then
             echo '::set-output name=found::true'
           else
@@ -212,12 +227,11 @@ jobs:
           fi
 
       - name: Build Plugin
-        uses: ././plugin/.github/actions/build-plugin
+        uses: ./plugin/.github/actions/build-plugin
         with:
           workingDirectory: ${{ github.workspace }}/plugin
           target: ${{ matrix.arch }}
           config: RelWithDebInfo
-          codesign: ${{ env.HAVE_CODESIGN_IDENTITY }}
 
       - name: Package Plugin
         uses: ./plugin/.github/actions/package-plugin
@@ -231,14 +245,15 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: ${{ env.PLUGIN_NAME }}-linux-${{ matrix.arch }}-${{ steps.setup.outputs.commitHash }}
-          path: ${{ github.workspace }}/plugin/release/${{ env.PLUGIN_NAME }}-*-Linux.*
+          path: ${{ github.workspace }}/plugin/release/${{ env.PLUGIN_NAME }}-*-linux.*
 
   windows_build:
     name: 02 - Windows
     runs-on: windows-2022
     strategy:
+      fail-fast: true
       matrix:
-        arch: ['x86', 'x64']
+        arch: [x86, x64]
     if: always()
     needs: [clang_check]
     outputs:
@@ -250,22 +265,23 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
         with:
-          path: 'plugin'
-          submodules: 'recursive'
+          path: plugin
+          submodules: recursive
 
       - name: Checkout obs-studio
         uses: actions/checkout@v3
         with:
           repository: 'obsproject/obs-studio'
-          path: 'obs-studio'
+          path: obs-studio
           fetch-depth: 0
-          submodules: 'recursive'
+          submodules: recursive
 
       - name: Setup Environment
         working-directory: ${{ github.workspace }}/plugin
         id: setup
         run: |
-          $CommitHash = git rev-parse --short HEAD
+          ## SETUP ENVIRONMENT SCRIPT
+          $CommitHash = (git rev-parse HEAD)[0..8] -join ''
           Write-Output "::set-output name=commitHash::${CommitHash}"
 
       - name: Check for GitHub Labels
@@ -273,6 +289,7 @@ jobs:
         working-directory: ${{ github.workspace }}/plugin
         if: ${{ github.event_name == 'pull_request' }}
         run: |
+          ## GITHUB LABEL SCRIPT
           $LabelFound = try {
             $Params = @{
               Authentication = 'Bearer'
@@ -281,7 +298,7 @@ jobs:
               UseBasicParsing = $true
             }
 
-            (Invoke-RestMethod @Params).labels.name.contains("Seeking Testers")
+            (Invoke-RestMethod @Params).labels.name.contains('Seeking Testers')
           } catch {
             $false
           }
@@ -289,7 +306,7 @@ jobs:
           Write-Output "::set-output name=found::$(([string]${LabelFound}).ToLower())"
 
       - name: Build Plugin
-        uses: ././plugin/.github/actions/build-plugin
+        uses: ./plugin/.github/actions/build-plugin
         with:
           workingDirectory: ${{ github.workspace }}/plugin
           target: ${{ matrix.arch }}
@@ -312,12 +329,12 @@ jobs:
 
       - name: Package Plugin Installer
         if: ${{ startsWith(github.ref, 'refs/tags/') && github.event_name != 'pull_request' }}
-        uses: ././plugin/.github/actions/package-plugin
+        uses: ./plugin/.github/actions/package-plugin
         with:
           workingDirectory: ${{ github.workspace }}/plugin
           target: ${{ matrix.arch }}
           config: RelWithDebInfo
-          createInstaller: 'true'
+          createInstaller: true
 
       - name: Upload Installer Artifact
         if: ${{ startsWith(github.ref, 'refs/tags/') && github.event_name != 'pull_request' }}
@@ -339,6 +356,7 @@ jobs:
       - name: Get Metadata
         id: metadata
         run: |
+          ## METADATA SCRIPT
           echo "::set-output name=version::${GITHUB_REF/refs\/tags\//}"
           echo "::set-output name=date::$(date +"%Y-%m-%d")"
           echo '::set-output name=commitHash::${{ needs.macos_build.outputs.commitHash }}'
@@ -348,6 +366,7 @@ jobs:
 
       - name: Generate Checksums
         run: |
+          ## CHECKSUM GENERATION SCRIPT
           shopt -s extglob
           echo "### Checksums" > ${{ github.workspace }}/CHECKSUMS.txt
           for file in ${{ github.workspace }}/**/@(*.pkg|*.exe|*.deb|*.zip); do
@@ -365,9 +384,9 @@ jobs:
           body_path: ${{ github.workspace }}/CHECKSUMS.txt
           files: |
             ${{ github.workspace }}/${{ env.PLUGIN_NAME }}-windows-x64-${{ steps.metadata.outputs.commitHash }}/*.zip
-            ${{ github.workspace }}/${{ env.PLUGIN_NAME }}-windows-x64-${{ steps.metadata.outputs.commitHash }}/*.exe
+            ${{ github.workspace }}/${{ env.PLUGIN_NAME }}-windows-x64-${{ steps.metadata.outputs.commitHash }}-installer/*.exe
             ${{ github.workspace }}/${{ env.PLUGIN_NAME }}-windows-x86-${{ steps.metadata.outputs.commitHash }}/*.zip
-            ${{ github.workspace }}/${{ env.PLUGIN_NAME }}-windows-x86-${{ steps.metadata.outputs.commitHash }}/*.exe
+            ${{ github.workspace }}/${{ env.PLUGIN_NAME }}-windows-x86-${{ steps.metadata.outputs.commitHash }}-installer/*.exe
             ${{ github.workspace }}/${{ env.PLUGIN_NAME }}-linux-x86_64-${{ steps.metadata.outputs.commitHash }}/*.deb
             ${{ github.workspace }}/${{ env.PLUGIN_NAME }}-macos-x86_64-${{ steps.metadata.outputs.commitHash }}/*.pkg
             ${{ github.workspace }}/${{ env.PLUGIN_NAME }}-macos-arm64-${{ steps.metadata.outputs.commitHash }}/*.pkg

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16)
 
 # Change obs-plugintemplate to your plugin's name in a machine-readable format
 # (e.g.: obs-myawesomeplugin) and set
-project(obs-plugintemplate VERSION 1.0.5)
+project(obs-plugintemplate VERSION 1.0.0)
 add_library(${CMAKE_PROJECT_NAME} MODULE)
 
 # Replace `Your Name Here` with the name (yours or your organization's) you want
@@ -28,6 +28,7 @@ target_sources(${CMAKE_PROJECT_NAME} PRIVATE src/plugin-main.c)
 find_package(libobs REQUIRED)
 find_package(obs-frontend-api REQUIRED)
 include(cmake/ObsPluginHelpers.cmake)
+find_qt(VERSION ${QT_VERSION} COMPONENTS Widgets Core)
 
 configure_file(src/plugin-macros.h.in
                ${CMAKE_SOURCE_DIR}/src/plugin-macros.generated.h)
@@ -40,8 +41,8 @@ target_include_directories(${CMAKE_PROJECT_NAME}
                            PRIVATE ${CMAKE_SOURCE_DIR}/src)
 
 target_link_libraries(
-  ${CMAKE_PROJECT_NAME} PRIVATE OBS::libobs OBS::obs-frontend-api Qt5::Core
-                                Qt5::Widgets)
+  ${CMAKE_PROJECT_NAME} PRIVATE OBS::libobs OBS::obs-frontend-api Qt::Core
+                                Qt::Widgets)
 
 set_target_properties(
   ${CMAKE_PROJECT_NAME}

buildspec.json

@@ -4,7 +4,7 @@
             "version": "27.2.3",
             "repository": "https://github.com/obsproject/obs-studio.git",
             "branch": "master",
-            "hash": "13f2d7925ff49938e3b286a3b9a65d50c1491ec1"
+            "hash": "2ac9f83cb662692d34874ee1fd17ad7675597215"
         },
         "obs-deps": {
             "macos-x86_64": {

cmake/ObsPluginHelpers.cmake

@@ -95,27 +95,37 @@ macro(find_qt)
   endforeach()
 endmacro()
 
-find_qt(VERSION ${QT_VERSION} COMPONENTS Widgets Core)
-
 file(RELATIVE_PATH RELATIVE_INSTALL_PATH ${CMAKE_SOURCE_DIR}
      ${CMAKE_INSTALL_PREFIX})
 file(RELATIVE_PATH RELATIVE_BUILD_PATH ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
 
 # Set up OS-specific environment and helper functions
-if(OS_MACOS)
+if(OS_POSIX)
   find_program(CCACHE_PROGRAM "ccache")
   set(CCACHE_SUPPORT
       ON
       CACHE BOOL "Enable ccache support")
   mark_as_advanced(CCACHE_PROGRAM)
   if(CCACHE_PROGRAM AND CCACHE_SUPPORT)
-    set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE_PROGRAM})
-    set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE_PROGRAM})
-    set(CMAKE_OBJC_COMPILER_LAUNCHER ${CCACHE_PROGRAM})
-    set(CMAKE_OBJCXX_COMPILER_LAUNCHER ${CCACHE_PROGRAM})
-    set(CMAKE_CUDA_COMPILER_LAUNCHER ${CCACHE_PROGRAM}) # CMake 3.9+
+    set(CMAKE_CXX_COMPILER_LAUNCHER
+        ${CCACHE_PROGRAM}
+        CACHE INTERNAL "")
+    set(CMAKE_C_COMPILER_LAUNCHER
+        ${CCACHE_PROGRAM}
+        CACHE INTERNAL "")
+    set(CMAKE_OBJC_COMPILER_LAUNCHER
+        ${CCACHE_PROGRAM}
+        CACHE INTERNAL "")
+    set(CMAKE_OBJCXX_COMPILER_LAUNCHER
+        ${CCACHE_PROGRAM}
+        CACHE INTERNAL "")
+    set(CMAKE_CUDA_COMPILER_LAUNCHER
+        ${CCACHE_PROGRAM}
+        CACHE INTERNAL "") # CMake 3.9+
   endif()
+endif()
 
+if(OS_MACOS)
   set(CMAKE_OSX_ARCHITECTURES
       "x86_64"
       CACHE STRING
@@ -274,20 +284,7 @@ else()
   set(OBS_OUTPUT_DIR ${CMAKE_BINARY_DIR}/rundir)
 
   if(OS_POSIX)
-    find_program(CCACHE_PROGRAM "ccache")
-    set(CCACHE_SUPPORT
-        ON
-        CACHE BOOL "Enable ccache support")
-    mark_as_advanced(CCACHE_PROGRAM)
-    if(CCACHE_PROGRAM AND CCACHE_SUPPORT)
-      set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE_PROGRAM})
-      set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE_PROGRAM})
-      set(CMAKE_OBJC_COMPILER_LAUNCHER ${CCACHE_PROGRAM})
-      set(CMAKE_OBJCXX_COMPILER_LAUNCHER ${CCACHE_PROGRAM})
-      set(CMAKE_CUDA_COMPILER_LAUNCHER ${CCACHE_PROGRAM}) # CMake 3.9+
-    endif()
-
-    option(LINUX_PORTABLE "Build portable version (Linux)" OFF)
+    option(LINUX_PORTABLE "Build portable version (Linux)" ON)
     if(NOT LINUX_PORTABLE)
       set(OBS_LIBRARY_DESTINATION ${CMAKE_INSTALL_LIBDIR})
       set(OBS_PLUGIN_DESTINATION ${OBS_LIBRARY_DESTINATION}/obs-plugins)
@@ -305,6 +302,8 @@ else()
       set(CPACK_PACKAGE_NAME "${CMAKE_PROJECT_NAME}")
       set(CPACK_DEBIAN_PACKAGE_MAINTAINER "${LINUX_MAINTAINER_EMAIL}")
       set(CPACK_PACKAGE_VERSION "${CMAKE_PROJECT_VERSION}")
+      set(CPACK_PACKAGE_FILE_NAME
+          "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-linux-x86_64")
 
       set(CPACK_GENERATOR "DEB")
       set(CPACK_DEBIAN_PACKAGE_DEPENDS

cmake/bundle/macos/installer-macOS.pkgproj.in

@@ -691,33 +691,6 @@
 		<dict>
 			<key>LIST</key>
 			<array>
-				<dict>
-					<key>BEHAVIOR</key>
-					<integer>3</integer>
-					<key>DICTIONARY</key>
-					<dict>
-						<key>IC_REQUIREMENT_FILES_CONDITION</key>
-						<integer>0</integer>
-						<key>IC_REQUIREMENT_FILES_DISK_TYPE</key>
-						<integer>0</integer>
-						<key>IC_REQUIREMENT_FILES_LIST</key>
-						<array>
-							<string>/Applications/OBS.app</string>
-						</array>
-						<key>IC_REQUIREMENT_FILES_SELECTOR</key>
-						<integer>0</integer>
-					</dict>
-					<key>IC_REQUIREMENT_CHECK_TYPE</key>
-					<integer>1</integer>
-					<key>IDENTIFIER</key>
-					<string>fr.whitebox.Packages.requirement.files</string>
-					<key>MESSAGE</key>
-					<array/>
-					<key>NAME</key>
-					<string>Files</string>
-					<key>STATE</key>
-					<true/>
-				</dict>
 				<dict>
 					<key>BEHAVIOR</key>
 					<integer>3</integer>