build-aux: Replace Flatpak modules with pre-compiled dependencies#10934
build-aux: Replace Flatpak modules with pre-compiled dependencies#10934RytoEX merged 2 commits intoobsproject:masterfrom
Conversation
9ad337f to
40bd675
Compare
4f766ad to
f94c313
Compare
2b5208b to
aa6a037
Compare
fcdf081 to
5de190d
Compare
5de190d to
e602888
Compare
|
@GeorgesStavracas Thoughts on this approach? |
GeorgesStavracas
left a comment
There was a problem hiding this comment.
I concur with this approach, with 2 conditions:
- Since we're very close to FDO 25.08, might be better to use it when it's released? Thoughts?
- The
obs-deps-bstrepository has to be moved to theobsprojectgroup first
(Interestingly, last week I talked to the new Fedora project leader Jef Spaleta and we agreed that moving to FDO-SDK and vendoring our dependencies is a decision that the Fedora project supports)
I think certainty on when 25.08 releases before when OBS Studio next beta is needed to be able to do the switch. Edit: If we want to try to switch to Freedesktop SDK 25.08, we need:
|
|
The changes in this PR look fine to me. Would it be possible to integrate the BuildStream code into |
|
Because of GHA caching limits, the Buildstream project needs it's own repo.
Le 7 août 2025 22:00:37 GMT+02:00, Patrick Heyer ***@***.***> a écrit :
…PatTheMav left a comment (obsproject/obs-studio#10934)
The changes in this PR look fine to me. Would it be possible to integrate the BuildStream code into `obs-deps` itself, bringing the actions over and adding the Linux-specific workflow jobs? The BuildStream-specific files could easily all live in its own `deps.flatpak` directory and we'd have all our dependency-building code in one place (and thus would also have all PRs and issues associated with them in a single place) which would help with visibility.
--
Reply to this email directly or view it on GitHub:
#10934 (comment)
You are receiving this because you authored the thread.
Message ID: ***@***.***>
|
Got it. I think I can give it a simple review pass for any obvious gotchas, particularly with an eye towards project data etc., but otherwise I'd probably defer to you and @GeorgesStavracas when it comes to the repo itself, so you can maintain it as independently as |
|
Gave the buildstream repo a quick glance, seems to be fine, couldn't spot any (ab)use of secrets or GitHub tokens (not that I expected any). Personally I'd probable prefer to call it |
|
"bst" is a common abbreviation but going for "buildstream" is fine too (
It isn't, it can be used to build OCI images, entire Linux distribution and in our case dependencies for our Flatpak (even stuff on macOS or WSL). |
e602888 to
afa3926
Compare
afa3926 to
df6320c
Compare
|
Due to libobs now depending on SIMDe, the devel tarball is no longer cleaned up (devtools still is). |
|
Personally I'd probable prefer to call it I'd personally prefer the less ambiguous "obs-deps-buildstream" name. |
df6320c to
94b124d
Compare
94b124d to
649d347
Compare
|
The buildstream repository was moved to the |
|
Catching up here.
Have these conditions been met? Are there any benchmarks of the CI build times for obs-studio with these changes? |
RytoEX
left a comment
There was a problem hiding this comment.
Looks okay, but would like previous questions addressed before I approve.
It was for having 25.08 on 32, 25.08 wasn't out and this PR got pushed back for the next release.
Besides this PR CI, not much. |
Is there any concept/solution in the Flatpak ecosystem to fulfil the CI need to just figure out whether it compiles successfully? Because for any given push to the master branch or a simple CI push that's the information we're interested in, as there is no expectation that CI generates builds that can actually run on an actual system. That changes when the "Seeking Testers" label is added, a nightly build runs, or we create a version tag. So the question that swirls in my mind is: Is the Ubuntu build meaningfully different from the Flatpak build or could compilation of the Ubuntu build (with the appropriate preprocessor macros set) simulate compilation for Flatpak? The way I see it, the difference between Flatpak and Ubuntu is largely only important for builds that will be pushed to Flathub or that are intended to be actually downloaded and used by users (see above). And if we could thus omit Flatpak compilation runs for "simple" PRs, that would cut down on CI time a lot. |
Ubuntu and Freedesktop SDK (Flatpak) are two separate Linux distribution and must not be seen as equal. If we want to ensure proper Flatpak support, we need Flatpak CI to ensure that a PR still builds properly in Flatpak environment. This is not really something we should try to "make savings" on. Can CI time usage can be improved even more ? The answer is maybe, but the main focus of this PR is improving deps compilation and openning the road towards aarch64 builds. |
RytoEX
left a comment
There was a problem hiding this comment.
Seems fine. This should land for 32.1.
To reduce compile time and prepare for aarch64 support, dependencies compilation except CEF is moved to a BuildStream project junctionned with Freedesktop SDK. The BuildStream project is configured to build dependencies in a Flatpak-like environment.
The Qt components are from the same repo as other dependencies. The KDE Platform was never a good fit for OBS Studio for multiple reasons: - Life cycle too short and misaligned with OBS Studio causing users to get EOL notification too often. - Third-party Qt plugins were allowed which could change Qt's behavior. - KDE exclusives sandboxed holes were inherited.
649d347 to
6fe7e91
Compare
Description
Important
This PR relies on https://github.com/tytan652/obs-deps-bst, the PR is also meant to discuss including the BuildStream-based project under the obsproject org.
This PR is x86_64 only, if it gets approved, #9979 will be refactored with aarch64 tarballs and I will try to work on documenting obs-deps-bst.
To reduce compile time and prepare for aarch64 support, dependencies compilation except CEF is moved to a BuildStream project junctionned with Freedesktop SDK.
The BuildStream project is configured to build dependencies in a Flatpak-like environment.
Motivation and Context
Move away dependency compile time, in an aarch64 context it moves away 6 hours of build time to another repo with ~3 hours of build time* without cache.
So only the CEF wrapper and OBS have to be built on this repo CI, so ~1h IIRC for aarch64 without cache.
*Build time is reduced since BuildStream tries to build elements in parallel when possible even with QEMU emulation.
Also on obs-deps-bst side, sources are cached so outage of independent git remote is not an issue if cached.
How Has This Been Tested?
Types of changes
Checklist: