-
-
Notifications
You must be signed in to change notification settings - Fork 7.9k
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
cmake: Update use of MbedTLS to support versions 3.6.0 and beyond #11056
Conversation
3.6.0 caused a breakage (which break RTMPS), until MbedTLS fix their mess with a bugfix release. |
It is, and also it needs to be merged before we update MbedTLS in Thus we need to merge a forward-compatible change that will work with the current release of |
I, at least, think we should not advertise any support of version |
This needs to be rebased and get CI to pass. IIRC, building SRT 1.5.x against mbedTLS 3.5.0+ fails because of changes in mbedTLS that needed addressed in libsrt, but there is no new libsrt tag with the needed changes. That being the case, we currently cannot update to mbedTLS 3.5+, but we can attempt to lay the foundation to allow building against newer versions so we don't have to juggle those changes in the future. |
4693b53
to
7efc3a4
Compare
Requires a new |
7efc3a4
to
274bfd0
Compare
MbedTLS changed a lot of internals with their LTS version 3.6.0, which are incompatible with the find module currently shipped with OBS Studio. The solution requires several changes to be applied at once: * Rename the generated target name to MbedTLS::mbedtls to match the name used by MbedTLS' own CMake package * Update find module to use the updated target name(s) * Set CMAKE_FIND_PACKAGE_PREFER_CONFIG to TRUE before trying to find MbedTLS to ensure that CMake package files are used with priority (Those are shipped only with MbedTLS 3.6.0 in obs-deps). * A deprecation warning is emitted if the find module is used with MbedTLS 3.6.0 available
274bfd0
to
169cfcb
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems fine. We can merge this to unblock ourselves for future updates when it's possible for us to update libsrt and MbedTLS without declaring explicit support for MbedTLS 3.6.0+.
Description
Update MbedTLS find module and usage in CMake files to prepare codebase for later update to CMake version 3.6.0 and beyond.
Motivation and Context
MbedTLS changed a lot of internals with their LTS version 3.6.0, which are incompatible with the find module currently shipped with OBS Studio.
The solution requires several changes to be applied at once:
How Has This Been Tested?
Tested on macOS with either current MbedTLS version provided by
obs-deps
as well as MbedTLS 3.6.0 provided via its own CMake package.Types of changes
Checklist: