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.

Sign up for GitHub

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

Jump to bottom

flatpak: Update deps with obs-deps, Qt and allow some headers to be kept #6847

Merged
merged 3 commits into from
Jul 31, 2022
Merged

flatpak: Update deps with obs-deps, Qt and allow some headers to be kept #6847

merged 3 commits into from
Jul 31, 2022

Conversation

tytan652
Copy link
Collaborator

Description

  • Update KDE Runtime to 6.3 (Qt 6.3)
  • x264: Use same commit as obs-deps
  • srt: Updated to 1.5.0
  • mbedtls: Updated to 3.2.1
  • librist: Updated to the same commit as obs-deps
  • aom: Updated to 3.4.0
  • svt-av1: Updated to 1.1.0
  • ffmpeg: Updated to the same commit and patches as obs-deps
  • luajit: Updated to the same commit as obs-deps

Also avoid cleaning up PipeWire and FFmpeg headers, plugins could happen to build against them.

Motivation and Context

Update the Flatpak

How Has This Been Tested?

Build and run the Flatpak locally.

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.

@RytoEX RytoEX added Seeking Testers Build artifacts on CI Enhancement Improvement to existing functionality labels Jul 28, 2022
@RytoEX RytoEX added this to the OBS Studio 28.0 milestone Jul 28, 2022
@tytan652 tytan652 force-pushed the flatpak_2022-07-28 branch 4 times, most recently from 4414e7f to 58b29bf Compare July 30, 2022 14:05
tytan652 added 3 commits July 30, 2022 22:53
@tytan652
flatpak: Update KDE Runtime to version 6.3
4230f75
@tytan652
flatpak: Update deps based on obs-deps 2022-07-28
81fdfb0 
* x264: Updated to the same commit as obs-deps
* srt: Updated to 1.5.0
* mbedtls: Updated to 3.2.1
* librist: Updated to the same commit as obs-deps
* aom: Updated to 3.4.0
* svt-av1: Updated to 1.1.0
* ffmpeg: Updated to the same commit and patches as obs-deps
* luajit: Updated to the same commit as obs-deps
@tytan652
flatpak: Avoid cleaning PipeWire and FFmpeg headers
5e3d2e4 
Plugins could happen to build against them.
@tytan652 tytan652 force-pushed the flatpak_2022-07-28 branch from 58b29bf to 5e3d2e4 Compare July 30, 2022 20:53
@RytoEX RytoEX mentioned this pull request Jul 31, 2022
Merged
6 tasks
@GeorgesStavracas GeorgesStavracas merged commit 056bd1a into obsproject:master Jul 31, 2022
@tytan652 tytan652 deleted the flatpak_2022-07-28 branch July 31, 2022 14:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GeorgesStavracas GeorgesStavracas GeorgesStavracas approved these changes

Assignees
No one assigned
Labels
Enhancement Improvement to existing functionality Seeking Testers Build artifacts on CI
Projects
None yet
Milestone
OBS Studio 28.0
Development

Successfully merging this pull request may close these issues.
3 participants
@tytan652 @GeorgesStavracas @RytoEX