5e29ca30e4
CI: Update Windows Qt from 5.10.1 to 5.15.2
2021-01-08 15:11:09 -05:00
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
20fb235b8f
CI: Remove jack, speex and fdk-aac from default builds for macOS
2020-12-22 04:36:12 -08:00
61ea6e0247
libobs: Add texture sharing support for macOS/OpenGL
2020-12-18 17:44:03 +01:00
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
fb938c186f
CI: Run make with -j$(nproc)
...
Moar threads for moar cores
2020-12-17 23:58:21 -08:00
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
c85bf0fcba
libobs: Add texture sharing support for macOS/OpenGL
2020-12-16 12:56:43 +01:00
ad1b98351c
CI: Add necessary changes for CEF 4183
2020-12-16 12:56:42 +01:00
eafab7d5e9
CI: Add decklink-captions to dylibbundler fixups
2020-11-27 20:56:47 +01:00
84b2558995
UI: Update macOS app icon
2020-11-13 17:00:05 +01:00
7b0d7c6357
Remove BUILD_CAPTIONS build flag
2020-11-02 22:46:55 -06:00
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
6af8726c74
linux-v4l2: Add virtual camera output
2020-10-30 02:00:14 -07:00
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
f190a9f7fb
CI: Fix Windows artifact issues and housekeeping
2020-10-18 20:12:56 -07:00
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
13c79618aa
CI: Update notarisation process for Github CI
2020-09-10 23:58:46 +02:00
7b4f615ff5
CI: Sign and notarize macOS builds on new tags
2020-09-09 21:11:29 -05:00
4bcfe5e12c
CI: Fix Azure macOS pipeline to use new build script
2020-09-09 18:38:34 +02:00
6895ffc8fa
CI: Update macOS CLI build script
2020-08-25 12:58:22 +02:00
12c3d92345
CI: Add QtNetwork to bundle to restore Streamdeck support
2020-08-12 11:20:50 +02:00
07a899413a
CI: Fix Brew Bundler breaking without prior brew update
2020-07-29 20:30:57 +02:00
dc0af42f1b
Merge pull request #3091 from derrod/remove-mixer
...
UI/CI/rtmp-services: Remove Mixer
2020-07-24 20:17:38 +02:00
85d58dfefd
CI: Disable Python on macOS
...
Follow-up to 63373a8fd72c60aa2abe#3203 ).
2020-07-23 01:10:29 -04:00
2c60aa2abe
CI: Disable Python for Mac PR automation
2020-07-22 20:31:59 -07:00
b67a238b7c
CI: Remove Mixer cmake variables
2020-07-22 07:47:12 +02:00
68d4df9180
CI: Disable building OBS with Python scripting support on macOS
2020-07-16 19:23:20 +02:00
28d8ca3323
CI: Add fix for macOS builds failing on push for Azure CI
2020-07-15 15:25:36 +02:00
d94709d945
CI: Update build script to use pre-built SWIG and QT dependencies
2020-07-10 01:01:32 +02:00
35088e0d9e
libobs: Add sample unit tests leveraging cmocka
2020-06-25 15:21:58 -07:00
e9bc9e6995
CI: Quick fix to cover pre-installed Homebrew dependencies for macOS
2020-06-25 00:42:21 +02:00
b1d03ae367
Merge pull request #2890 from PatTheMav/macos-build-scripts
...
CI: Add all-in-one macOS build script
2020-06-21 07:09:30 -07:00
de74ea8ad9
CI: Require VLC in CI builds, Fix VLC
...
Previously VLC was downloaded but was skipped since it could not be
found. This sets the VLCPath to ensure it is found.
2020-05-21 19:32:39 -07:00
6df8dcd960
CI: Add all-in-one macOS build script
2020-05-08 23:43:12 +02:00
78db95049a
CI: Update Github Actions with caching and macOS improvements
2020-05-06 18:27:53 +02:00
1ea9943a09
CI: Update macOS deps to fix lua
2020-04-26 18:30:53 -05:00
1bada2d8e7
CI: Fix Azure Pipelines macOS runs
2020-04-24 03:43:51 +02:00
24e4a256f7
CI: Add main Github Actions workflow for branch pushes and PRs
2020-04-19 04:07:28 +02:00
7247a80b3c
CI: Add freetype dep on osx
2020-04-15 23:37:07 -05:00
7366b45392
CI: Rewrite new deps paths in obs-ouputs.so
2020-04-09 22:29:41 -05:00
8b6f6d1c85
CI: Move clang format check into a seperate github workflow
2020-04-09 21:26:41 -05:00
921a742966
Merge pull request #2617 from RytoEX/update-macos-deps
...
CI: Update macOS dependencies
2020-04-07 14:51:16 -05:00
de6643b8ea
CI: Update dependencies on macOS
2020-04-07 14:06:54 -05:00
00c1513890
CI: Update macOS dependencies
...
* Update VLC from 3.0.4 to 3.0.8
* Update Sparkle from 1.20.0 to 1.23.0
2020-04-02 04:00:51 -04:00
f0fe107515
CI: macOS use qt 5.14.1
2020-03-04 21:48:26 -06:00
91d5a9c895
CI: Fix some macOS build settings
2020-03-03 20:20:12 -06:00
dc17171617
CI: Fix case of PlugIns directory
...
'PlugIns' is normal for MacOS and whatever is generating qt.conf
(macdeployqt?) is using 'PlugIns', so this both builds and generates
an app that works on case insensitive filesystems but fails to load
on case sensitive filesystems.
I haven't tested building the installer, only modifying the
qt.conf in the installed copy of OBS.app.
Fixes https://github.com/obsproject/obs-studio/issues/2302
2020-02-28 17:28:59 +00:00
0b33df9b2f
CI: Build CEF on Linux
2020-02-25 22:38:12 -06:00
faf1535ad5
Merge pull request #2422 from cg2121/remove-ci-script
...
CI: Remove unused Linux script
2020-02-23 00:19:46 -08:00
ab53f31eb5
CI: Use VS 2019 and windows-2019 VM image
2020-02-22 21:02:33 -08:00
c44a0e3fe7
CI: Remove unused Linux script
2020-02-22 19:12:02 -06:00
7d85aa3180
CI: Add libmbedtls-dev
2020-01-25 18:24:04 +01:00
b7a88f7ac8
CI: Fix QtNetwork in Mac packaging script
2019-12-16 04:37:16 -08:00
0273db7afc
CI: Fix error deleting QT network framework on OSX
2019-12-14 04:32:58 -08:00
de4ceb054c
CI: Fix mbedtls id in mac deploy script
2019-12-14 01:34:06 -08:00
6096d23632
CI: Fix up QT network framework on OSX
2019-12-11 23:04:51 -06:00
effcdc04d2
CI: Fix osx executable path in plist
2019-12-11 18:25:54 -06:00
43f9f45f8f
CI: Fix framework symlinks when building osx app
2019-12-11 17:32:04 -06:00
a19fef2248
obs-scripting: Fix Python in new MacOS .app bundles
...
The current scripting directory path given to Python on OSX is
`../data/obs-scripting`. This works when bin/ and data/ are in the same
folder like rundir after a compile and in the old .app bundles but the
new normal .app bundle structure is different.
For bundles move obspython.py and _obspython.so to the binary folder,
just like the Lua one, and pass that bin path to the Python interpreter
so it can find it.
The current working dir isn't guaranteed to be set with .app bundles
so look up binary path at runtime.
2019-11-17 22:11:44 +01:00
def6fcb0ee
Merge pull request #2125 from DDRBoxman/appbundle
...
Fixes to make OBS work on Catalina
2019-11-13 12:21:13 -08:00
32690926b9
CI: Use custom macdylibbundler for OSX deps
2019-11-03 00:00:38 -05:00
404dc6a84d
CI: Remove dead PPA to fix Linux build failure
2019-10-15 14:24:28 -05:00
7c08b3f95e
CI: Update scripts for reorganized OSX bundle
2019-10-14 22:10:38 -05:00
c351580a20
Build: Added BUILD_CAPTIONS to linux build script
2019-10-07 21:08:00 +01:00
1507db7b1b
CI: Update CEF on osx to 3770
2019-09-07 17:44:12 -05:00
05888fc3aa
CI: Update Windows CEF version
2019-08-30 16:38:59 +02:00
baddca2536
CI: Only download Qt if it doesn't exist already
2019-07-27 06:52:47 +02:00
28243dbc94
CI: Run clang format on linux and osx CI and fail if changes are made
2019-07-12 21:44:33 -05:00
21ce267ad4
Merge pull request #1896 from SCG82/cef-10.11
...
CI: Build CEF with OS X 10.11 target
2019-05-29 05:01:25 -07:00
839e74f522
CI: Fix travis test on OSX
2019-05-24 20:38:27 -07:00
85012d5a39
CI: Build CEF with OS X 10.11 target
2019-05-24 20:31:30 -07:00
f5c6fa3656
CI: Use swig 3.0.12 on OSX
2019-05-02 18:39:59 -05:00
f5becb64da
CI: Use swig 3.04 on OSX
2019-05-02 15:07:03 -05:00
ebb8d6bc28
Merge pull request #1767 from ratwithashotgun/caption-pr1
...
deps/obs-scripting: Expose obs_output_output_caption_text1 to scripts
2019-04-15 03:30:30 -07:00
758868093b
linux-capture: Add randr support
...
Add randr suport to the xshm plugin and prefer it over xinerama.
Add libxcb-xrandr0-dev as CI dependency
2019-04-05 16:05:59 -05:00
a81b7a3e58
CI: Don't build service integration in PRs&Forks
...
Without this, Fork and PR builds will fail.
2019-03-23 19:24:04 +01:00
3e78e05c6e
CI: Build service integration on Azure Pipelines
2019-03-23 14:35:29 +01:00
cb3054ae6e
CI: Build caption output support on OSX by default
...
Enable caption building by default on OSX to make captions usable
on OSX via scripting API.
2019-03-21 07:46:12 +01:00
5b9e96c15b
Merge pull request #1584 from cg2121/settings-icons
...
UI: Redo settings icons
2019-03-09 18:49:05 -06:00
e17cadaf38
CI: Build for windows on Azure Pipelines
2019-03-07 17:23:08 +01:00
80875768ad
UI: Redo settings icons
2019-03-05 19:54:12 -06:00
d73844c78a
CI: Fix building on trusty
2019-03-05 16:00:09 -08:00
a09ad610af
CI: macOS builds on Azure Pipelines
2019-03-01 11:36:22 -06:00
133b9462e1
CI: Build service-integration on Windows
2019-02-09 07:07:36 +01:00
b026f599d2
CI: Use modified macOS QT installer
2019-02-02 20:05:36 -06:00
98fc5750db
CI: Use proper VLC release tarball
...
As noted by ePirat, the VLC releases on GitHub are not official
releases, just repo snapshots. Use the official VLC 3.0.4 release
tarball to ensure maximum stability.
2018-11-30 22:33:04 +02:00
d10e4cd040
CI: Use VLC 3.0.4 instead of master for macOS
...
Fixes an issue where macOS builds on Travis would fail due to changes
in VLC master branch.
2018-11-30 18:03:48 +02:00
e6ac830247
CI: Update Qt path on Windows
...
AppVeyor recently updated their Qt version to 5.11.2 which breaks
builds, because of the outdated path. Using this path should always
ensure that the newest subversion of Qt 5.11 gets used.
2018-11-13 14:26:42 +01:00
a64ae11bce
obs-ffmpeg: Add linux VAAPI h.264 encoding support
...
Closes obsproject/obs-studio#1482
Closes obsproject/obs-studio#1256
2018-09-24 23:12:24 -07:00
2bf1f3f5d0
CI: Add mbedTLS dependency for AppVeyor Linux
...
On Ubuntu 16.04 (Xenial), we have to build mbedTLS from source because
the version available from apt, mbedTLS 2.2.1, does not work with the
RTMPS implementation in OBS, which requires mbedTLS 2.7 at minimum. This
is due to the use of the function mbedtls_ssl_conf_dh_param_bin, which
was introduced in mbedTLS 2.7.
2018-09-18 15:13:40 -04:00
c3b2380b13
CI: Build on Linux with AppVeyor
...
Build on Linux (Ubuntu 16.04) with AppVeyor. Disable PowerShell on
Linux. Ubuntu 16.04's dependencies are different from the existing
Ubuntu 14.04 dependencies, so a separate script for installing those
dependencies has been added.
2018-09-18 15:13:40 -04:00
dfbf42bfd1
CI: Move AppVeyor install commands to a script file
...
Move the AppVeyor install scripts to a separate script file. This
shortens the appveyor.yml file and makes it easier to introduce new
install scripts for other build environments.
There is one minor change to the install script, and that was to change
directory back to the obs-studio git root directory.
2018-09-18 15:13:39 -04:00
2c0f65c3ea
obs-browser: Fix local macOS build issues
...
(This also modifies the CI scripts accordingly)
It was difficult to build local obs-browser builds on macOS due to the
way the frameworks work and libraries are linked. This solves that
issue so that local builds of obs-browser should always work fine.
2018-09-11 01:29:13 -07:00
2d154d550e
CI: Use Qt 5.10.1 instead of 5.11.1 for macOS
...
This fixes a bug where the interact window would crash.
2018-08-28 19:29:08 -07:00
efaf93ed8e
CI: Rename one more missed cef-bootstrap name
2018-08-26 18:03:19 -07:00
8e9b62326a
CI: Rename cef-bootstrap to obs-browser-page
2018-08-26 17:44:11 -07:00
485f798e7a
CI: Use HTTPS for downloading macOS deps package
...
Pull Request #1420 changed the URL for the macOS deps package. When it
did that, it also changed the URL from HTTPS to HTTP. Since this asset
is available over HTTPS, we should use that.
2018-08-18 02:26:22 -04:00
62917b503a
CI: Update OSX Deps package
2018-08-09 22:29:21 -05:00
5411d6666e
CI: Fix building libvpx dep on osx
2018-08-05 22:23:57 -05:00
6dfeeca620
CI: Update macOS dependencies in build script
...
* Add mbedTLS in brew install
* Update Sparkle from 1.16.0 to 1.20.0
* Update Opus from 1.1.3 to 1.2.1
* Update libogg from 1.3.2 to 1.3.3
* Update libvorbis from 1.3.5 to 1.3.6
* Update libvpx from 1.6.0 to 1.7.0
* Update Jansson from 2.9 to 2.11
* Update FFmpeg from 3.2.2 to 4.0.2
2018-08-02 00:08:24 -04:00
3ea16c619f
CI: Update Travis scripts to target OSX 10.11+
2018-08-02 00:08:20 -04:00
729abd3825
CI: Use Qt 5.11.1 on Travis for macOS
2018-07-25 12:00:21 -04:00
d0c5f72048
Merge pull request #1348 from dtcooper/macos-fix-cef-path
...
CI: Fix CEF Path on Package Build
2018-07-18 01:26:34 -07:00
d4059f11c6
CI: Update Sparkle default base_url
2018-07-18 03:45:41 -04:00
b49469b860
CI: Fix CEF Path on Package Build
...
This fixes the pkg build of obs-browser by properly copying CEF to
`OBS.app/Content/Frameworks/Chromium Embedded Framework.framework`,
rather than `OBS.app/Content/Frameworks`.
2018-07-01 22:56:44 -07:00
bc7a77964e
CI: Add description to OSX deps build script
2018-04-22 14:19:17 -05:00
30d967eafa
obs-browser: Update to browser source refactor
2018-04-14 03:45:07 -07:00
89a5235ac0
CI: Reduce travis output verbosity
...
The log output of the travis CI for macOS is unreasonably large. This
reduces the verbosity of the output and reduces the size of the build
logs significantly.
2018-04-13 22:25:05 -07:00
92574a778d
CI: Check out OSX branch of obs-browser
2018-03-19 14:42:24 -05:00
9c7deb4df8
CI: Include style plugins when packaging on OSX
2018-02-05 19:04:56 -06:00
5823a58277
CI: Comment out OSX _obspython copy (not ready yet)
2018-02-01 20:30:06 -08:00
3040ff6347
CI: Don't install python for OSX
2018-01-30 23:25:35 -06:00
285d9bd6f1
CI: Add rpath info to _obspython
2018-01-30 18:15:44 -06:00
4e6bbb984f
CI: Move obspython.so so it can be found in a .app
2018-01-29 18:59:36 -06:00
d2c85a44f3
CI: Make sure that lua can find obslua
2018-01-29 17:43:19 -06:00
1b9e49dfe3
CI: Fetch RVM gpg key on osx
2018-01-28 19:52:35 -06:00
060edff177
CI: Fix a ruby issue on travis OSX
2018-01-28 19:47:01 -06:00
e2005044dd
CI: Update OSX deps build scripts
2018-01-28 19:04:46 -06:00
65e8bb04e8
CI: Point to newer brew python
2018-01-24 10:28:37 -06:00
d810e3dbfb
CI: Install swig and luajit for osx travis
2018-01-22 10:34:43 -06:00
7b6af4cc93
CI: Enable scripting in Linux builds
2018-01-21 14:41:06 +02:00
5d17e6f6ea
deps/scripting: Add python rpaths to the obs binary on OSX
...
Closes jp9000/obs-studio#1127
2018-01-04 17:04:08 -08:00
2f78871662
Revert "CI: Linux - Install FFmpeg from source"
...
This reverts commit de32d89fc6
2017-12-03 23:10:46 +02:00
b6348c932b
CI: Fix Mac builds on Travis CI's Xcode 8.3 image
...
The Travis CI Xcode 8.3 image uses macOS 10.12, where some OS and Xcode
components were changed. This commit finally fixes macOS deployments on
Travis for Xcode 8.3. This commit also reverts a few changes that got
into master while we were trying to fix this.
2017-12-02 23:04:10 -05:00
4a1c415270
CI: Fix macOS builds on Travis CI's Xcode 8.3 image
...
The Travis CI Xcode 8.3 image uses macOS 10.12, where some OS and Xcode
components were changed. This commit should hopefully fix macOS
deployments on Travis for Xcode 8.3.
2017-12-02 04:09:48 -05:00
af62c3648e
CI: Fix Mac builds on Travis CI's Xcode 8.3 image
...
The Travis CI Xcode 8.3 image uses macOS 10.12, where some changes were
made to productsign, and Apple's documentation didn't clearly reflect
this. This commit should fix Mac builds on Travis for Xcode 8.3 and
clean up the job log.
2017-12-01 13:20:06 -05:00
54a68ec535
CI: Update Travis script to target OSX 10.10+
...
Since OSX 10.10 is now the officially supported minimum OS version on
Mac, update the CI script.
2017-10-14 23:07:53 -04:00
23ea91976f
Build with CEF 3112 on OSX
2017-08-18 21:41:31 -05:00
59fcfaadb5
Merge pull request #913 from craftwar/robocopy
...
CI: exclude .gitignore from AppVeyor artifacts
2017-05-15 21:44:42 -07:00
ce44791932
CI: Use git fetch --unshallow for OSX
2017-05-12 18:19:40 -07:00
ebd341145e
CI: exclude .gitignore
2017-05-12 12:20:14 +08:00
2cb73f32a2
CI: OSX - Use wget instead of curl
...
Possible fix for "curl: (56) SSLRead()" errors on Travis.
[skip appveyor]
2017-05-08 16:10:51 +03:00
a23c009a69
Various: Optimize bundled PNG files
...
By losslessly recompressing and removing redundant metadata, this saves
around 910 KB.
2017-05-05 19:56:00 +00:00
2d706968cf
Merge pull request #816 from juvester/ci-linux-libfdk-aac
...
CI: Linux - Install libfdk-aac-dev
2017-03-26 03:42:35 -07:00
de32d89fc6
CI: Linux - Install FFmpeg from source
...
[skip appveyor]
2017-03-24 20:49:25 +02:00
cf59f933fa
CI: Linux - Install libfdk-aac-dev
...
[skip appveyor]
2017-03-10 19:18:03 +02:00
723d25e0ed
CI: OSX - Fix obs.png
2017-03-10 14:54:58 +01:00
5f128d9e54
CI: Use ccache to speed up the build
...
Speeds up recompilation by caching previous compilations and detecting
when the same compilation is being done again. [skip appveyor]
2017-03-08 15:10:07 +02:00
b0aa8a5b6b
Merge pull request #852 from DDRBoxman/sparkle
...
CI: OSX - enable sparkle
2017-03-06 04:03:11 +01:00
c22cfaa15b
CI: OSX - enable sparkle
2017-03-05 20:45:19 -06:00
efc369ef83
CI: OSX - Brew install speexdsp
2017-03-06 03:15:17 +01:00
5eda800d3f
CI: OSX - Move CEF version to .travis
2017-03-01 18:18:29 -06:00
108b296855
CI: Fix cef version variable
2017-03-01 15:27:33 -06:00
a029b3e217
CI: OSX - export cef version so we can use it elsewhere
2017-03-01 14:35:22 -06:00
5843100b9e
CI: OSX - Use bash variable for CEF version
2017-03-01 12:22:41 -06:00
33e16c3ee9
CI: Use correct folder for building browser
2017-03-01 19:05:08 +01:00
d421228315
Merge pull request #834 from DDRBoxman/osxsign
...
CI: OSX - Update to CEF 2987
2017-02-28 22:35:28 -08:00
8a78e79a83
CI: OSX - Update to CEF 2987
2017-03-01 00:34:03 -06:00
44b9770037
CI: OSX - Include branch in pkg
2017-02-27 19:30:23 -06:00
Ryan Foster
Colin Edwards
PatTheMav
Jim
Theodore Dubois
John Boiles
Clayton Groeneveld
PatTheMav
pkv
Rodney
jpark37
derrod
Kurt Kartaltepe
David Baker
Richard Stanway
SCG82
Rat
Joel Bethke
Ioan Loosley
Gol-D-Ace
Gary Kramlich
Rat
juvester
Thomas Crider
David Cooper
craftwar
Richard Stanway
juvester