0
0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 13:08:50 +02:00
Commit Graph

16 Commits

Author SHA1 Message Date
Georges Basile Stavracas Neto
1392ea5ca6 CI: Enable services on Flatpak builds
The flatpak-builder tool now supports passing secrets options to the
build system. These options are not printed during the build, nor
added to the resolved manifest after build, so they don't leak env
vars from CI.

Make secret variables part of the Flatpak workflow environment, like
the main workflow. Pass the various services hashes and clientids to
the build system using the new "secret-opts" key.
2021-11-03 13:17:03 -03:00
Artem Polishchuk
8a1d74688c CI: Update modules for Flatpak build
* CI: Update mbedtls to v2.27.0
  * CI: Update srt to v1.4.4

Mandatory update for org.kde.Platform 5.15-21.08 runtime.
2021-10-16 15:55:10 -07:00
Artem Polishchuk
2f636ab2da CI: Update KDE Platform to 5.15-21.08 (Flatpak) 2021-10-16 15:55:10 -07:00
Georges Basile Stavracas Neto
21a9c5b7d9 flatpak: Remove D-Bus permissions to talk to session managers
They were used to implement session inhibition, but with the new
portal-based implementation in place, they aren't necessary anymore.
2021-07-18 14:04:44 -07:00
Georges Basile Stavracas Neto
2b1eda69e7 flatpak: Cleanup unwanted static libraries
The CEF static library in special is gigantic (50MB+) and
was significantly increasing the bundle size.
2021-05-08 18:53:02 -07:00
Georges Basile Stavracas Neto
834b03f489 Revert "flatpak: Disable obs-browser build"
This reverts commit c370692773.

The PR that introduced this commit was opened before the browser plugin
was enabled, and when the browser was effectively enabled, this change
was already in place and didn't conflict, leaving us with both a
-DBUILD_BROWSER=ON *and* -DBUILD_BROWSER=OFF in place.
2021-05-08 18:53:02 -07:00
Georges Basile Stavracas Neto
7a87777225 linux-v4l2: Use flatpak-spawn when inside a Flatpak sandbox
It is not possible to run host system executables like modinfo, pkexec,
and modprobe inside a Flatpak sandbox. However, Flatpak provides a way
to run command on the host system: the flatpak-spawn executable.

flatpak-spawn is a tiny helper that, when executed with the '--host'
parameter, talks to the org.freedesktop.Flatpak D-Bus interface to run
and retrieve the return value of the executable. This provides OBS Studio
a way to escape this sandbox limitation without opening large holes in
the sandbox.

Make v4l2's implementation of VirtualCam run system commands using
flatpak-spawn when inside a Flatpak sandbox. The detection of the sandbox
is done by checking the existence of the /.flatpak-info file, which is
created by Flatpak itself, and only exists inside the sandbox. If OBS
Studio is not running inside a Flatpak sandbox, run the exact same command
it used to run before this commit.

Add the permission to talk to the org.freedesktop.Flatpak D-Bus interface
to the Flatpak manifest, so we can run flatpak-spawn with the '--host'
parameter.

Notice that the same constraints apply with and without Flatpak: the host
system needs to have the v4l2loopback kernel module available for the v4l2
implementation of VirtualCam to work.
2021-04-18 17:27:33 -07:00
Georges Basile Stavracas Neto
495687294b flatpak: Reenable browser source
It seems that the browser source works inside a Flatpak sandbox and/or
Wayland with CEF 4280, so let's try and reenable it.

This reverts commit e64c61710f.
2021-04-16 13:21:59 +10:00
tytan652
c370692773 flatpak: Disable obs-browser build 2021-04-09 08:29:25 -07:00
Bilal Elmoussaoui
916d6d4bf2 flatpak: Use current tree for building OBS
We always want to build the current build tree, not the upstream
repository.
2021-04-03 00:30:15 +11:00
Georges Basile Stavracas Neto
706192b551 flatpak: Expose PipeWire socket
So that it can be talked to from the sandbox.
2021-03-29 17:00:31 -03:00
Georges Basile Stavracas Neto
b98bad1f30 flatpak: Don't specify luajit commit
luajit developers ask people to use branches instead of tarballs, however,
Flatpak interprets having both 'commit' and 'branch' fields as 'use this
branch, and this commit should be at the top of the branch', which is not
really what we want.

Remove the specified commit from the Flatpak manifest.
2021-03-24 11:17:50 +11:00
Georges Basile Stavracas Neto
1a05c4f48e flatpak: Update dependencies
- Update LuaJIT according to upstream recommendations (maintainers of
   this project prefer that distributors use the git repository directly,
   instead of archives. Do that, and also update the Lua path for swig.)

 - Update ffmpeg and drop patch which is included in this updated release
   now.

 - Update x264

 - Update nv-codec-headers

 - Update mbedtls
2021-03-16 01:48:51 -07:00
Georges Basile Stavracas Neto
ce50020414 flatpak: Enable Wayland
Expose the Wayland socket to the sandbox, and enable Wayland at build
time using the new ENABLE_WAYLAND define for CMake.
2021-02-14 12:36:23 +11:00
Georges Basile Stavracas Neto
e64c61710f flatpak: Disable browser for now
The Chromium sandbox is conflicting with the Flatpak sandbox in a non-trivial,
non-workaroundable way. Until Chromium / CEF provides a way to unconditionally
disable the entire sandbox, let's not degrade the Flatpak experience.
2021-02-12 04:59:30 -08:00
Georges Basile Stavracas Neto
036012d329 build-aux: Add Flatpak manifest
Add a new com.obsproject.Studio.json file containing the
dependencies and permissions required by OBS Studio.

RFC: https://github.com/obsproject/rfcs/pull/21
2021-01-18 15:33:54 -08:00