Commit Graph

237 Commits (d64adb67840b274d2661d6270b0d7d050d9ab3a9)

Author SHA1 Message Date
tytan652 b04626f72d flatpak: Deduplicate CEF from the bundle
CEF is installed in /app/cef. After OBS is built, it no longer needs
/app/cef because everything that OBS needs is copied elsewhere.

So removing /app/cef at the cleanup stage will not cause issue
and will also reduce bundle size.
2021-12-22 15:10:15 -03:00
tytan652 6ad54f5252 flatpak: Add AJA NTV2 library
This enable AJA plugins on flatpak builds
2021-12-22 15:10:15 -03:00
columbarius 01ac816a33 CI: Add PipeWire 0.3.40 to Flatpak
We require PipeWire 0.3.40 or later in preparation for proper
DMA-BUF handling, which includes negotiation of modifier lists and
dropping of single modifiers.

This commit should be reverted as soon as the Freedesktop Flatpak SDK
contains this or a newer PipeWire version.
2021-12-22 14:27:53 -03:00
Matt Gajownik 5646981ce5 CI: Update CEF hash for Flatpak to Release 4638
Tested on Ubuntu 18.04 CI and Ubuntu 20.04 desktop, built with sysroot
and is_official_build. Ensures this build of CEF will run on a variety
of system configurations.
2021-12-22 09:44:00 +11:00
Matt Gajownik adff02a6b7 Revert "CI: Update CEF hash for Flatpak to fix crash"
This reverts commit 7bf7c01ff1.

The f639d8923 CEF wrapper fails to build on Ubuntu 18.04 due to
outdated glibc, and Jim's recent commits seem to solve the shutdown
assert. For now, revert to the known functional build.
2021-12-21 22:14:54 +11:00
Matt Gajownik 7bf7c01ff1 CI: Update CEF hash for Flatpak to fix crash
This fixes a crash/assert on shutdown caused by Chromium debug mode.
2021-12-20 21:58:27 +11:00
PatTheMav 0072629ceb CI: Fix build issues introduced by updates obs-deps 2021-12-19 10:47:40 -06:00
Matt Gajownik 9c12a9ac98 CI: Update Linux CEF version to 4638 (Chromium 95) 2021-12-17 12:24:01 -08:00
Matt Gajownik 0c26becd80 CI: Update macOS CEF version to 4638 (Chromium 95) 2021-12-17 12:24:01 -08:00
Kurt Kartaltepe 0729007f19 libobs: Add Wayland hotkey infrastructure
Users on Wayland are displeased that they cannot see their hotkey
bindings. This enables key reporting like X11, and has the infrastructure
in place in case Wayland ever decides to allow for capturing input.
2021-12-16 10:54:29 -03:00
Georges Basile Stavracas Neto 0d3ce3dfe6 CI: Allow Flatpak audio plugins be found
Add an extension point for org.freedesktop.LinuxAudio.Plugins,
and create the corresponding folder at post-install time.

Commit originally made by @hfiguiere for Flathub.
2021-11-25 09:20:05 -03:00
Georges Basile Stavracas Neto baead91374 CI: Add extension point to Flatpak plugins
This is what the Flathub manifest does, which allows for plugins
distributed through Flatpak extension points.

Add extension point for Flatpak-distributed plugins.
2021-11-25 09:20:05 -03:00
Georges Basile Stavracas Neto 4453cca6a7 CI: Update Flatpak's v4l-utils to 1.22
No functional changes.
2021-11-25 09:20:05 -03:00
Georges Basile Stavracas Neto b36b204eed CI: Update Flatpak's x264
In the future, a full FFMPEG build with x264 and nvenc will be
provided as an extension to the org.freedesktop.Platform runtime,
but for now we have to manually build it.

Update x264 to the latest git commit.
2021-11-25 09:20:05 -03:00
Paul Hindt ce3ae8e423
aja: Capture and Output plugin for AJA Video Systems IO devices
* aja: Initial commit of AJA capture/output plugin

* aja: Fix clang-format on aja-output-ui code

* aja: Remove script used during dev/testing

* aja: Address pull request feedback from @RytoEX

* aja: Remove the SDK sources and update CMakeLists to point to new headers-only/static libs dependency distribution.

* aja: Only build AJA plugin on x64 on macOS for now

* aja: Remove the non-English placeholder locale files. The english strings/files will be produced via crowdin, according to @ddrboxman.

* aja: Add FindLibAJANTV2.cmake script to locate the ajantv2 headers and static libs in the OBS external deps package(s). Tested on Windows x64. macOS and Linux x64 TBD.

* aja: Add ajantv2/includes to FindLibAJANTV2 include search paths

* aja: Remove commented code from aja CMakeLists

* aja: Remove debug code and comments that are no longer needed.

* aja: Fix indentation

* aja: Remove disablement of clang-format in routing table and SDIWireFormat map

* aja: Use spaces for all indentation in widget crosspoint arrays where we disable clang-format

* aja: Address code style comments made by @RytoEX

* aja: Fix uneven indentation

* aja: More fixes to if/else placement and remove superfluous comments.

* aja: Rename 'dwns' to 'deactivateWhileNotShowing' for clarity. The DeckLink plugin still uses the variable name 'dwns' and should be changed, if desired, in a separate PR.

* aja: Remove X11Extras dependency from AJA Output frontend plugin

* aja: Add patch from Jim to find AJA release/debug libs

* aja: Improve AV sync of queued video/audio sent to the AJA card in the AJA Output plugin.
2021-11-23 20:31:11 -06:00
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
gxalpha 16906e7290 CI: Add copyright information to macOS bundle plist 2021-10-24 02:29:12 -07: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
gxalpha 0d755c3691 mac-virtualcam: Move DAL plugin to plugin data directory
Moves the DAL plugin to the data directory of the mac-virtualcam. Until
now, it was just lying in the top-level data directory
2021-08-17 08:21:32 -07:00
Yuriy Chumak eb6ba44c8a UI: Include QtNetwork as a direct dependency
(Jim note: Rather than copy the QtNetwork library manually like we were
doing before, this makes it so that QtNetwork is used as a dependency of
the UI. The cmake used to copy the library manually thus us no longer
necessary.)
2021-07-24 15:50:59 -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
Kurt Kartaltepe 0f172a0bc7 CI: Remove unneeded runtime deps
Removes kernel headers and dkms packages from the CI pipeline. These are
only needed when running obs and not when building. This avoids crashing
and burning in CI when secureboot is enabled. see: https://github.com/obsproject/obs-studio/pull/4560/checks?check_run_id=2403303957
2021-04-30 18:44:01 -07:00
gxalpha 3efc3dbb0f CI,cmake: Fix macOS version information
Fixes an issue where on macOS the app’s Info window in Finder would say
"Version: OBS - Free and Open Source Streaming/Recording Software"
instead of the version set in CFBundleShortVersionString.

Since CFBundleGetInfoString is deprecated anyways, it can safely be
removed.
2021-04-18 17:30:31 -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
Colin Edwards 1274943a0b CI: Specify arch for prebuilt deps 2021-04-11 20:28:04 -05: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
SCG82 7225d248c3 CI: Quote all bash variables containing paths 2021-03-30 03:51:00 -07:00
Georges Basile Stavracas Neto d0681b6db8 CI: Disable PipeWire on Ubuntu
Unfortunately, neither Ubuntu 20.04 nor 18.04 have a recent enough
PipeWire package. Disable the PipeWire bits of linux-capture there.
The Flatpak workflow is still able to build it, so keep it enabled
there.
2021-03-29 17:00:32 -03: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
PatTheMav 9da6fc67c4 CI: Fix missing entitlements on CEF components for obs-browser 2021-03-01 08:27:16 -08: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 586767ab12 ci: Install qtbase5-private-dev on Linux
List this dependency both under CI/install-dependencies-linux.sh, and
.github/workflows/main.yml.
2021-02-01 19:03:43 -03:00
PatTheMav d2ca8b5d90 CI: Re-enable Python scripting support on CI for macOS
Closes obsproject/obs-studio#3689
2021-01-27 11:33:53 -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
Matt Gajownik 95c4db3bc6 CI: Fix CEF version for both Linux & macOS 2021-01-17 23:55:18 +11:00
Colin Edwards 410c60e799 CI: Fix cef version in full build 2021-01-08 23:00:17 -06:00
PatTheMav ac2e7a4ef2 CI: Force use of system-provided binaries for build script 2021-01-08 22:40:51 -06:00
Ryan Foster 1b215e463c CI: Update Windows dependencies to VS2019 versions 2021-01-08 15:11:15 -05:00
Ryan Foster 5e29ca30e4 CI: Update Windows Qt from 5.10.1 to 5.15.2 2021-01-08 15:11:09 -05:00
Colin Edwards 0fa5dfcd30
Merge pull request #3933 from PatTheMav/macos-cef-texture-sharing
libobs: Add texture sharing support for macOS/OpenGL
2021-01-07 23:03:08 -06:00
PatTheMav 20fb235b8f CI: Remove jack, speex and fdk-aac from default builds for macOS 2020-12-22 04:36:12 -08:00
PatTheMav 61ea6e0247
libobs: Add texture sharing support for macOS/OpenGL 2020-12-18 17:44:03 +01:00