Skip to content
This repository has been archived by the owner on Jul 1, 2024. It is now read-only.

Update to support OBS Studio 29.1.x and 29.0.x fully #1042

Merged
merged 46 commits into from
May 14, 2023
Merged

Update to support OBS Studio 29.1.x and 29.0.x fully #1042

merged 46 commits into from
May 14, 2023

Conversation

Xaymar
Copy link
Owner

@Xaymar Xaymar commented May 14, 2023

Explain the Pull Request

  • Updates obs-studio to 29.1.0, then updates obs-studio to 29.1.1.
  • Enables LTO on the entire project, instead of leaving it up to an internal flag.
  • Adds patching support for obs-studio to get rid of some annoying (and/or invalid) defaults.
  • Splits each CI workflow by platform, instead of merging them into one.
  • Changes CI to rely on buildspec.json instead of DEPS_VERSION_WIN/DEPS_VERSION_MAC, which appears to be the way forward for obs-studio.
  • Fixed a bug in the copyright header generation when there was no prior header in the file.
  • Fixed compatibility with newer FFmpeg versions, as a define has been removed.
  • Features are now disabled based on their stability to improve release stability, and make releases available earlier. See this post for more information.
  • Fixed various issues with clang-format and clang-tidy by updating the submodule.
  • Fixed various issues with version() by updating the submodule and adapting to CMake's poor parameter parsing.
  • Updated the clang-format file to remove some useless styling.
  • Fixed obs-studio version not being written to the environment in CI, resulting in stale caches being re-used. All prior versions of StreamFX were technically built for obs-studio 28.0.0-rc1, instead of the expected version.

Completion Checklist

  • This has been tested on the following platforms:
    • MacOS 10.15
    • MacOS 11
    • MacOS 12
    • Ubuntu 20.04
    • Ubuntu 22.04
    • Windows 10
    • Windows 11
  • The copyright headers and license files have been updated.
  • I will maintain this for the forseeable future, and have added myself to CODEOWNERS.

Xaymar added 30 commits May 3, 2023 19:50
@Xaymar
third-party: Update to OBS Studio 29.1
5495078 
The underlying build system has changed. This only hotfixes the issue, but a proper fix must be implemented eventually.
@Xaymar
ci: Create RelWithDebInfo builds instead of Debug
a0a2850
@Xaymar
cmake: Improve bootstrapping and versioning code
9662bbb 
Should fix the "'u': undeclared identifier" problem when code is generated from a shallow clone. Also fixes the issue where the clang submodule is required instead of optional.
@Xaymar
cmake: Disable features by default based on their stability
5a3c262
@Xaymar
cmake, code: Remove Displacement Filter completely
fc4f714
@Xaymar
cmake: Update clang integration to 1.0
cc1494e
@Xaymar
code: Fix support for libAVCodec 59.x and beyond
1a952b8
@Xaymar
ci: Remove libOBS cache
1fffa27 
Might fix the weird issue with additional compiler flags being set.
@Xaymar
cmake: Require CMake 3.26 configuration
0b8aaa4
@Xaymar
cmake: Fix version(REQUIRE) statement
4a7ed3a
@Xaymar
code: Disable useless alignment styling and update standard
a8da1ea
@Xaymar
ci, tools: Use new buildspec.json for depedendencies
be3f54a
@Xaymar
tools: Fix header generation for new files
22c5bb4
@Xaymar
ci: Remove additional $ from command
d311150
@Xaymar
ci: Attempt to fix env issues
75d7873
@Xaymar
ci: Another attempt at fixing GITHUB_ENV issues
f95b738 
Why has the previous code worked? Did it ever work?
@Xaymar
ci: Mixed up URL and Hash
a664f99
@Xaymar
ci: Update to LLVM/Clang 16.0.3
e18a4c3
@Xaymar
ci: More attempts at fixing whatever breaks XCode
425302f
@Xaymar
ci: Just disable the warning/error mess
49a0f61
@Xaymar
ci: Split workflows by platform
20c8fc8 
This splits the whole thing by the supported platforms to hopefully aid with future problem searching. While the combined script was nice, and allowed reducing the working overhead significantly, it also had collisions in what should have been defined.
@Xaymar
ci: Fix some workflow errors introduced by the split
ccae118
@Xaymar
ci: Fix another error introduced by the split
765738a
@Xaymar
ci: Fix naming of workflows on Ubuntu
7d93842
@Xaymar
ci: Fix missing matrix.qt and fix libobs path on Ubuntu
a03fcba
@Xaymar
ci: Actually write obs-studio version to environment
227ccab
@Xaymar
ci: Don't use libobs-dev on Ubuntu
ff84303 
The provided libobs-dev does not match CMake standards (LibObs instead of libobs like on all other platforms). It also does not provide the obs-frontend-api, or any other required files.
@Xaymar
ci: Prefer RelWithDebInfo over Release
77d58bd
@Xaymar
ci: Add more compilers to Ubuntu
9206988 
May help us figure out unexpected incompatibilities in the future. While we still require C++14 or later, and may even upgrade to C++17 eventually, this should address some concerns about compatibility.

Plus it makes it easier to support things like Flatpak
@Xaymar
ci: Fix last commit
b7a1c86
Xaymar added 16 commits May 14, 2023 01:25
@Xaymar
ci: Potentially fix ambiguous redirect and fix clang on Ubuntu
44c9860
@Xaymar
ci: Enable LTO project-wide
bd505d7
@Xaymar
ci: Purge unwanted compilers
3162e2e
@Xaymar
ci: Shrink the purge a bit
fc5a975
@Xaymar
tools: Remove additional / in header
cabb952
@Xaymar
ci: Reduce the number of compilers, and remove some purge statements
95bb78b
@Xaymar
ci: Add some messaging for better log debugging
a2c4e7e
@Xaymar
ci: Ignore GCC-11 on Ubuntu 22, and fix some missing CMake flags
ad1e4ac
@Xaymar
project: Add guideline for patches
65fa7d4
@Xaymar
patches: Add patch to disable invalid flags
29bcf09 
The affected file checks for the host system, instead of the target system. This is incorrect on every platform, and invalid CMake behavior.
@Xaymar
third-party: Update obs-studio to 29.1.1
74b6af8
@Xaymar
ci: Apply patches to obs-studio
5e98905
@Xaymar
patches: Add patch to disable treating warnings as errors
88b23fd
@Xaymar
ci: Let compiler figure out what linker to use
c1a5615 
This is broken somehow. Can't be bothered to fix it - works without it anyway!
@Xaymar
ci: StreamFX's CMake requires ..._DIR not CMAKE_PREFIX_PATH
1004844
@Xaymar
ci: Fix CI failure
1b85617
@Xaymar Xaymar marked this pull request as ready for review May 14, 2023 01:15
@Xaymar Xaymar merged commit b5a4adb into root May 14, 2023
7 of 8 checks passed
@Xaymar Xaymar deleted the patch/obs branch May 14, 2023 01:25
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@Xaymar