forked from obsproject/obs-deps
-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
OBS merge 30.2.3 #5
Open
avoitenko-logitech
wants to merge
196
commits into
streamlabs
Choose a base branch
from
obs_merge_30.2.3
base: streamlabs
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Adds support for SRTP Protection profiles to be negotiated during DTLS handshake. Needed for libdatachannel/WebRTC support.
Allows POSIX toolchain to be selectively used by some targets
Co-authored-by: pkv <[email protected]>
Correct an oversight from the PR that added libdatachannel. The license files for libdatachannel and its deps were not added then, so let's add them now.
* Adds typing to CMake variables * Fixes LuaJIT placing import library in wrong directory * Fixes Swig placing its binary and support files in wrong directory * Switches PowerShell variable scopes to lowercase
This confuses CMake's ZLIB finder, making it prefer the mingw variants of ZLIB over the generated windows variant.
* Fixes erroneous `continue` call to skip anonymous script blocks * Add version file to generated obs-deps output package
We avoid shipping the Qt binary tool PDBs because we haven't had a need for them. Qt 6.5 added the tracepointgen tool. Let's exclude that. Somewhere between Qt 6.5.3 and 6.6.1, the syncqt tool started building PDBs even in Release configuration. Let's just exclude it for now. We can unravel that mystery another day.
We no longer build, ship, or support Qt 5.
After checking the Qt docs, it seems that some of the options we attempted to set were being set incorrectly. https://github.com/qt/qtbase/blob/v6.6.3/cmake/configure-cmake-mapping.md
This was already disabled on Windows.
This is normally autodetected, but we can explicitly enable or disable it. To prevent unwanted surprises, it's probably safer to disable it.
These were apparently incorrect. qt/qtbase@3bc39a6 https://bugreports.qt.io/browse/QTBUG-120036
Remove unused CMake variables to prevent this warning: Manually-specified variables were not used by the project FEATURE_printsupport gates: FEATURE_cups FEATURE_printdialog FEATURE_printer FEATURE_printpreviewdialog FEATURE_printpreviewwidget FEATURE_testlib gates: FEATURE_itemmodeltester
Use latest 17.0.1 release tag of libajantv2. The previous AJA ntv2 repo is deprecated.
Use latest 17.0.1 release tag of libajantv2. The previous AJA ntv2 repo is deprecated.
The original ntv2 library has been deprecated and replaced by libajantv2. The license is still MIT.
* deps.qt: Add Qt Designer Co-authored-by: Ryan Foster <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.