Skip to content
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

deps.ffmpeg: Remove MbedTLS CMake files from macOS FFmpeg package #261

Merged
merged 1 commit into from
Sep 4, 2024

Conversation

PatTheMav
Copy link
Member

Description

Removes MbedTLS CMake package files for macOS FFmpeg builds.

Motivation and Context

Once the project switches MbedTLS 3.6+, there needs to be a way to distinguish between older and newer versions on the obs-studio side.

The path of least resistance is to use CMake package-based discovery for versions 3.6+ and find module-based discovery for older versions, which requires the older (current as of time of the commit) versions to not provide a CMake package as part of obs-deps.

Note

Once MbedTLS is updated to version 3.6+, this removal will need to be removed again.

How Has This Been Tested?

Tested removal on current obs-deps with an updated obs-studio to opportunistically use package discovery mode and observe automatic fallback to find module to discover MbedTLS as provided by current dependencies.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)

Checklist:

  • My code has been run through clang-format.
  • I have read the contributing document.
  • My code is not on the master branch.
  • The code has been tested.
  • All commit messages are properly formatted and commits squashed where appropriate.
  • I have included updates to all appropriate documentation.

Once the project switches MbedTLS 3.6+, there needs to be a way to
distinguish between older and newer versions on the obs-studio side.

The path of least resistance is to use CMake package-based discovery
for versions 3.6+ and find module-based discovery for older versions,
which requires the older (current as of time of the commit) versions
to not provide a CMake package as part of obs-deps.
Copy link
Member

@RytoEX RytoEX left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems fine, though we'll have to remember to remove this when eventually updating mbedTLS.

@RytoEX RytoEX merged commit ab17571 into obsproject:master Sep 4, 2024
17 checks passed
@PatTheMav PatTheMav deleted the mbedtls-cmake-removal branch September 4, 2024 20:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants