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

CI: Update deps to 2024-01-11 release #10115

Merged
merged 1 commit into from
Jan 22, 2024

Conversation

RytoEX
Copy link
Member

@RytoEX RytoEX commented Jan 19, 2024

Description

CI: Update deps to 2024-01-11 release

Notable changes:

  • deps.qt: Fix library naming for macOS debug builds
  • deps.ffmpeg: Fix local universal architecture builds of aom for macOS
  • deps: Update Windows build script with explicit package names
  • deps.ffmpeg: Switch Windows builds to native build toolchain

The most important item here is "deps.ffmpeg: Switch Windows builds to native build toolchain", which switched from cross-compiling FFmpeg and various other dependencies on Linux for Windows to compiling those dependencies natively on Windows.

Motivation and Context

See:

This PR is being made to provide a distinct point for easily bisecting deps changes. A separate PR with the actual updates to dependency versions will happen later.

As noted on the obs-deps PR, some files now have different names and some have been removed entirely. These will need to be accounted for in our update manifest.

For posterity, these files are renamed:

  • bin/libsrt.dll -> bin/srt.dll
  • lib/libsrt.lib -> lib/srt.lib
  • lib/libmbedcrypto.lib -> lib/mbedcrypto.lib
  • lib/libmbedtls.lib -> lib/mbedtls.lib
  • lib/libmbedx509.lib -> lib/mbedx509.lib

These files have been removed:

  • bin/libmbedcrypto.dll
  • bin/libmbedtls.dll
  • bin/libmbedx509.dll
  • lib/zlibstatic.lib

How Has This Been Tested?

Testing occurred as part of the obs-deps PR.

Types of changes

  • Tweak (non-breaking change to improve existing functionality)

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.

Notable changes:
 * deps.qt: Fix library naming for macOS debug builds
 * deps.ffmpeg: Fix local universal architecture builds of aom for macOS
 * deps: Update Windows build script with explicit package names
 * deps.ffmpeg: Switch Windows builds to native build toolchain
@RytoEX RytoEX added Enhancement Improvement to existing functionality Seeking Testers Build artifacts on CI Windows Affects Windows macOS Affects macOS CI labels Jan 19, 2024
@RytoEX RytoEX added this to the OBS Studio (Next Version) milestone Jan 19, 2024
@RytoEX RytoEX requested a review from PatTheMav January 19, 2024 02:22
@RytoEX RytoEX self-assigned this Jan 19, 2024
@RytoEX RytoEX merged commit 185fe36 into obsproject:master Jan 22, 2024
14 checks passed
@RytoEX RytoEX deleted the update-deps-winffmpeg branch January 22, 2024 16:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI Enhancement Improvement to existing functionality macOS Affects macOS Seeking Testers Build artifacts on CI Windows Affects Windows
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants