jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,769 Commits 1 Branch 0 Tags
Commit Graph

259 Commits

Author SHA1 Message Date
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
Jim
ddc5af2e08
Merge pull request #3805 from PatTheMav/macos-cef-4183 
CI: Add necessary changes for CEF 4183
 2020-12-18 00:10:17 -08:00
Theodore Dubois
fb938c186f CI: Run make with -j$(nproc) 
Moar threads for moar cores
 2020-12-17 23:58:21 -08:00
Ryan Foster
2ca1521f72 CI: Remove obsolete and unused files 
All of these files have been relocated or replaced, so they should be
safe to remove now.
 2020-12-17 02:05:49 -05:00
PatTheMav
c85bf0fcba
libobs: Add texture sharing support for macOS/OpenGL 2020-12-16 12:56:43 +01:00
PatTheMav
ad1b98351c
CI: Add necessary changes for CEF 4183 2020-12-16 12:56:42 +01:00
PatTheMav
eafab7d5e9
CI: Add decklink-captions to dylibbundler fixups 2020-11-27 20:56:47 +01:00
PatTheMav
84b2558995
UI: Update macOS app icon 2020-11-13 17:00:05 +01:00
Colin Edwards
7b0d7c6357 Remove BUILD_CAPTIONS build flag 2020-11-02 22:46:55 -06:00
John Boiles
2700db9ff9 Add virtualcam plugin to OBS codebase 
Co-authored-by: lvsti <lvsti@users.noreply.github.com>
Co-authored-by: Sebastian Beckmann <beckmann.sebastian@outlook.de>
Co-authored-by: Stefan Huber <sh@signalwerk.ch>
Co-authored-by: Ryohei Ikegami <iofg2100@gmail.com>
Co-authored-by: Colin Dean <colin.dean@target.com>
Co-authored-by: Wolfgang Ladermann <extern.ladermann_wolfgang@allianz.de>
Co-authored-by: Simon Eves <simon.eves@omnisci.com>
Co-authored-by: Colin Nelson <colnnelson@google.com>
Co-authored-by: Yoshimasa Niwa <niw@niw.at>
Co-authored-by: Michael Karliner <mike@modern-industry.com>
Co-authored-by: Jason Grout <jgrout6@bloomberg.net>
Co-authored-by: Alfredo Inostroza <jadenguy@gmail.com>
Co-authored-by: Daniel Kennett <daniel@cascable.se>
Co-authored-by: Gary Ewan Park <gep13@gep13.co.uk>
Co-authored-by: José Carlos Cieni Júnior <cienijr@outlook.com>
 2020-10-30 23:36:57 -07:00
Clayton Groeneveld
6af8726c74 linux-v4l2: Add virtual camera output 2020-10-30 02:00:14 -07:00
PatTheMav
c16517ca83 CI: Update macOS build script to support alternative build configs 
Also adds a tweak to the brew update which _might_ fix Azure CI.
 2020-10-23 23:36:07 -07:00
PatTheMav
f190a9f7fb CI: Fix Windows artifact issues and housekeeping 2020-10-18 20:12:56 -07:00
pkv
a1c3fbee64 CI: Add virtualcam GUID to win builds 
Adds the virtualcam GUID to win builds on GH actions and azure.

Co-authored-by: PatTheMav <patthemav+github@gmail.com>
 2020-10-10 17:28:22 -07:00
PatTheMav
13c79618aa
CI: Update notarisation process for Github CI 2020-09-10 23:58:46 +02:00
Colin Edwards
7b4f615ff5 CI: Sign and notarize macOS builds on new tags 2020-09-09 21:11:29 -05:00
PatTheMav
4bcfe5e12c
CI: Fix Azure macOS pipeline to use new build script 2020-09-09 18:38:34 +02:00
PatTheMav
6895ffc8fa
CI: Update macOS CLI build script 2020-08-25 12:58:22 +02:00
PatTheMav
12c3d92345
CI: Add QtNetwork to bundle to restore Streamdeck support 2020-08-12 11:20:50 +02:00
PatTheMav
07a899413a
CI: Fix Brew Bundler breaking without prior brew update 2020-07-29 20:30:57 +02:00
Rodney
dc0af42f1b
Merge pull request #3091 from derrod/remove-mixer 
UI/CI/rtmp-services: Remove Mixer
 2020-07-24 20:17:38 +02:00
Ryan Foster
85d58dfefd CI: Disable Python on macOS 
Follow-up to 63373a8fd713b94d63940e7f131beee5d4963d3a
and 2c60aa2abe27d3fdb01d01edde508f57ca26a82f (PR #3203).
 2020-07-23 01:10:29 -04:00
jpark37
2c60aa2abe CI: Disable Python for Mac PR automation 2020-07-22 20:31:59 -07:00
derrod
b67a238b7c CI: Remove Mixer cmake variables 2020-07-22 07:47:12 +02:00
PatTheMav
68d4df9180
CI: Disable building OBS with Python scripting support on macOS 2020-07-16 19:23:20 +02:00
PatTheMav
28d8ca3323
CI: Add fix for macOS builds failing on push for Azure CI 2020-07-15 15:25:36 +02:00
PatTheMav
d94709d945
CI: Update build script to use pre-built SWIG and QT dependencies 2020-07-10 01:01:32 +02:00
Colin Edwards
35088e0d9e libobs: Add sample unit tests leveraging cmocka 2020-06-25 15:21:58 -07:00
PatTheMav
e9bc9e6995
CI: Quick fix to cover pre-installed Homebrew dependencies for macOS 2020-06-25 00:42:21 +02:00