Skip to content

Commit dc6ad9a

Browse files
authored
Bump base plugin template files & OBS 31.1.1 requirement (DistroAV#1406)
1 parent 283b2e4 commit dc6ad9a

14 files changed

Lines changed: 48 additions & 52 deletions

File tree

.clang-format

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ PenaltyReturnTypeOnItsOwnLine: 60
8181

8282
PointerAlignment: Right
8383
ReflowComments: false
84+
SkipMacroDefinitionBody: true
8485
SortIncludes: false
8586
SortUsingDeclarations: false
8687
SpaceAfterCStyleCast: false
@@ -181,7 +182,7 @@ ReferenceAlignment: Right
181182
RemoveSemicolon: false
182183
RequiresClausePosition: WithPreceding
183184
RequiresExpressionIndentation: OuterScope
184-
SeparateDefinitionBlocks: Always
185+
SeparateDefinitionBlocks: Leave
185186
ShortNamespaceLines: 1
186187
SortIncludes: false
187188
#SortUsingDeclarations: LexicographicNumeric

.gersemirc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
# yaml-language-server: $schema=https://raw.githubusercontent.com/BlankSpruce/gersemi/master/gersemi/configuration.schema.json
22

3-
#color: false
43
definitions: []
54
line_length: 120
65
indent: 2
76
list_expansion: favour-inlining
8-
#quiet: false
97
unsafe: false
10-
#workers: 10
118
warn_about_unknown_commands: false

.github/ISSUE_TEMPLATE/1_bug.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ body:
1717
label: "This bug exists on the latest available release of DistroAV and supported environment?"
1818
description: "Please fill the environment area as well."
1919
options:
20-
- label: "I have checked this bug still exist on the latest available version of DistroAV"
21-
required: false
22-
- label: "I have checked that my OS / OBS / NDI versions are supported"
23-
required: false
20+
- label: "I have checked this bug still exists on the latest available version of DistroAV."
21+
required: true
22+
- label: "I have checked that my OS / OBS / NDI versions are supported & up-to-date."
23+
required: true
2424
- type: input
2525
id: obs-log
2626
attributes:
@@ -62,7 +62,7 @@ body:
6262
description: |
6363
examples:
6464
- **OS**: [Ubuntu 22.04, MacOS 15.1, Windows 10 22H2, Win 11 24H2, ...]
65-
- **OBS**: [28.0, 29.0.2, 30.2.3 ...] installed from [.exe, .dep, apt, brew, PPA, Flatpak, Snap, winget, ...]
65+
- **OBS**: [30.2.3, 31.1, 32.0 ...] installed from [.exe, .dep, apt, brew, PPA, Flatpak, Snap, winget, ...]
6666
- **DistroAV**: [6.0.0, 6.1 ...] installed from [.exe, .pkg, brew, Flatpak, winget, ...]
6767
- **NDI**: [5.60, 6.0.1 ...]
6868
value: |
@@ -86,3 +86,6 @@ body:
8686
required: false
8787
- label: "I have tested on a 'clean' OBS installation (aka with no other scripts or plugin installed)"
8888
required: false
89+
- label: "I am filing this bug report as a Human and have reviewed its content to the best of my ability to ensure it's accurate."
90+
required: false
91+

.github/ISSUE_TEMPLATE/3_support.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ body:
3131
options:
3232
- label: "I have checked this is not an existing active bug/feature request"
3333
required: true
34-
- label: "I have checked that my OS / OBS / NDI versions are supported"
35-
required: true
3634
- label: "I have followed the NDI Runtime installation steps as described in the Wiki"
3735
required: true
3836
- label: "I have followed the DistroAV installation steps as described in the Wiki"
@@ -43,7 +41,7 @@ body:
4341
required: true
4442
- label: "My version of OBS is up-to-date"
4543
required: true
46-
- label: "My version of NDI Runtime is up-to date"
44+
- label: "My version of NDI Runtime is up-to-date"
4745
required: true
4846
- label: "OBS launch without error message (User Interface/popup)"
4947
required: false
@@ -63,6 +61,10 @@ body:
6361
required: false
6462
- label: "A working NDI feed can be received in OBS"
6563
required: false
64+
- label: "A human has reviewed this support request to the best of my ability to ensure it's accurate."
65+
required: true
66+
- label: "This support request is submitted by an AI/Agent"
67+
required: false
6668
- type: input
6769
id: obs-log
6870
attributes:

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ inputs:
1616
description: Developer ID for application codesigning (macOS only)
1717
required: false
1818
default: '-'
19+
codesignTeam:
20+
description: Team ID for application codesigning (macOS only)
21+
required: false
22+
default: ''
1923
workingDirectory:
2024
description: Working directory for packaging
2125
required: false

.github/actions/run-clang-format/action.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ runs:
3535
echo ::group::Install Dependencies
3636
eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
3737
echo "/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin" >> $GITHUB_PATH
38-
echo "/home/linuxbrew/.linuxbrew/opt/clang-format@17/bin" >> $GITHUB_PATH
38+
echo "/home/linuxbrew/.linuxbrew/opt/clang-format@19/bin" >> $GITHUB_PATH
3939
brew install --quiet zsh
4040
echo ::endgroup::
4141
@@ -50,11 +50,11 @@ runs:
5050
: Run clang-format 🐉
5151
if (( ${+RUNNER_DEBUG} )) setopt XTRACE
5252
53-
print ::group::Install clang-format-17
54-
brew install --quiet obsproject/tools/clang-format@17
53+
print ::group::Install clang-format-19
54+
brew install --quiet obsproject/tools/clang-format@19
5555
print ::endgroup::
5656
57-
print ::group::Run clang-format-17
57+
print ::group::Run clang-format-19
5858
local -a changes=(${(s:,:)CHANGED_FILES//[\[\]\'\"]/})
5959
./build-aux/run-clang-format --fail-${{ inputs.failCondition }} --check ${changes}
6060
print ::endgroup::

.github/scripts/utils.zsh/check_macos

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
autoload -Uz is-at-least log_group log_info log_error log_status
22

3-
local macos_version=$(sw_vers -productVersion)
4-
5-
log_group 'Install macOS build requirements'
6-
log_info 'Checking macOS version...'
7-
if ! is-at-least 11.0 ${macos_version}; then
8-
log_error "Minimum required macOS version is 11.0, but running on macOS ${macos_version}"
9-
return 2
10-
else
11-
log_status "macOS ${macos_version} is recent"
12-
fi
13-
143
log_info 'Checking for Homebrew...'
154
if (( ! ${+commands[brew]} )) {
165
log_error 'No Homebrew command found. Please install Homebrew (https://brew.sh)'

.github/scripts/utils.zsh/setup_ubuntu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ if (( ! (${skips[(Ie)all]} + ${skips[(Ie)deps]}) )) {
3939
sudo apt update
4040

4141
sudo apt-get install ${apt_args} \
42-
libsimde-dev \
4342
build-essential \
4443
libgles2-mesa-dev \
44+
libsimde-dev \
4545
libcurl4-openssl-dev \
4646
obs-studio
4747

CMakePresets.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
{
1818
"name": "macos",
1919
"displayName": "macOS Universal",
20-
"description": "Build for macOS 11.0+ (Universal binary)",
20+
"description": "Build for macOS 12.0+ (Universal binary)",
2121
"inherits": ["template"],
2222
"binaryDir": "${sourceDir}/build_macos",
2323
"condition": {
@@ -28,7 +28,7 @@
2828
"generator": "Xcode",
2929
"warnings": {"dev": true, "deprecated": true},
3030
"cacheVariables": {
31-
"CMAKE_OSX_DEPLOYMENT_TARGET": "11.0",
31+
"CMAKE_OSX_DEPLOYMENT_TARGET": "12.0",
3232
"CMAKE_OSX_ARCHITECTURES": "arm64;x86_64",
3333
"CODESIGN_IDENTITY": "$penv{CODESIGN_IDENT}",
3434
"CODESIGN_TEAM": "$penv{CODESIGN_TEAM}"
@@ -38,7 +38,7 @@
3838
"name": "macos-ci",
3939
"inherits": ["macos"],
4040
"displayName": "macOS Universal CI build",
41-
"description": "Build for macOS 11.0+ (Universal binary) for CI",
41+
"description": "Build for macOS 12.0+ (Universal binary) for CI",
4242
"generator": "Xcode",
4343
"cacheVariables": {
4444
"CMAKE_COMPILE_WARNING_AS_ERROR": true,

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Any other options, or errors: See [release page](https://distroav.org/download)
6060

6161
## Requirements
6262

63-
* [OBS v31.0 or higher](https://github.com/obsproject/obs-studio/releases) (Qt6, x64/ARM64/AppleSilicon)
63+
* [OBS v31.1.1 or higher](https://github.com/obsproject/obs-studio/releases) (Qt6, x64/ARM64/AppleSilicon)
6464
* [NDI Runtime v6.3 or higher](https://github.com/DistroAV/DistroAV/wiki/1.-Installation#required---ndi-runtime)
6565

6666
# Troubleshooting

0 commit comments

Comments
 (0)