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

117 Commits

Author SHA1 Message Date
Jim
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
Gary Kramlich
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
Gol-D-Ace
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
Gol-D-Ace
3e78e05c6e CI: Build service integration on Azure Pipelines 2019-03-23 14:35:29 +01:00
Rat
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
Colin Edwards
5b9e96c15b
Merge pull request #1584 from cg2121/settings-icons
UI: Redo settings icons
2019-03-09 18:49:05 -06:00
Colin Edwards
e17cadaf38 CI: Build for windows on Azure Pipelines 2019-03-07 17:23:08 +01:00
Clayton Groeneveld
80875768ad UI: Redo settings icons 2019-03-05 19:54:12 -06:00
jp9000
d73844c78a CI: Fix building on trusty 2019-03-05 16:00:09 -08:00
Colin Edwards
a09ad610af CI: macOS builds on Azure Pipelines 2019-03-01 11:36:22 -06:00
Gol-D-Ace
133b9462e1 CI: Build service-integration on Windows 2019-02-09 07:07:36 +01:00
Colin Edwards
b026f599d2 CI: Use modified macOS QT installer 2019-02-02 20:05:36 -06:00
juvester
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
juvester
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
Gol-D-Ace
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
Thomas Crider
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
Ryan Foster
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
Ryan Foster
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
Ryan Foster
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
jp9000
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
jp9000
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
jp9000
efaf93ed8e CI: Rename one more missed cef-bootstrap name 2018-08-26 18:03:19 -07:00
jp9000
8e9b62326a CI: Rename cef-bootstrap to obs-browser-page 2018-08-26 17:44:11 -07:00
Ryan Foster
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
Colin Edwards
62917b503a CI: Update OSX Deps package 2018-08-09 22:29:21 -05:00
Colin Edwards
5411d6666e CI: Fix building libvpx dep on osx 2018-08-05 22:23:57 -05:00
Ryan Foster
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
Ryan Foster
3ea16c619f CI: Update Travis scripts to target OSX 10.11+ 2018-08-02 00:08:20 -04:00
Ryan Foster
729abd3825 CI: Use Qt 5.11.1 on Travis for macOS 2018-07-25 12:00:21 -04:00
Jim
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
Ryan Foster
d4059f11c6 CI: Update Sparkle default base_url 2018-07-18 03:45:41 -04:00
David Cooper
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
Colin Edwards
bc7a77964e
CI: Add description to OSX deps build script 2018-04-22 14:19:17 -05:00
jp9000
30d967eafa obs-browser: Update to browser source refactor 2018-04-14 03:45:07 -07:00
jp9000
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
Colin Edwards
92574a778d CI: Check out OSX branch of obs-browser 2018-03-19 14:42:24 -05:00
Colin Edwards
9c7deb4df8 CI: Include style plugins when packaging on OSX 2018-02-05 19:04:56 -06:00
jp9000
5823a58277 CI: Comment out OSX _obspython copy (not ready yet) 2018-02-01 20:30:06 -08:00
Colin Edwards
3040ff6347 CI: Don't install python for OSX 2018-01-30 23:25:35 -06:00
Colin Edwards
285d9bd6f1 CI: Add rpath info to _obspython 2018-01-30 18:15:44 -06:00
Colin Edwards
4e6bbb984f CI: Move obspython.so so it can be found in a .app 2018-01-29 18:59:36 -06:00
Colin Edwards
d2c85a44f3 CI: Make sure that lua can find obslua 2018-01-29 17:43:19 -06:00
Colin Edwards
1b9e49dfe3 CI: Fetch RVM gpg key on osx 2018-01-28 19:52:35 -06:00
Colin Edwards
060edff177 CI: Fix a ruby issue on travis OSX 2018-01-28 19:47:01 -06:00
Colin Edwards
e2005044dd CI: Update OSX deps build scripts 2018-01-28 19:04:46 -06:00
Colin Edwards
65e8bb04e8 CI: Point to newer brew python 2018-01-24 10:28:37 -06:00
Colin Edwards
d810e3dbfb CI: Install swig and luajit for osx travis 2018-01-22 10:34:43 -06:00
juvester
7b6af4cc93 CI: Enable scripting in Linux builds 2018-01-21 14:41:06 +02:00
Colin Edwards
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
juvester
2f78871662 Revert "CI: Linux - Install FFmpeg from source"
This reverts commit de32d89fc6.

Fixes an issue where Linux CI builds fail because FFmpeg fails to
compile. Using FFmpeg git master in CI builds was obviously not the
smartest idea because changes in FFmpeg can break things unexpectedly.
Sorry about that.

The reason for the original commit was that OBS failed to compile
with FFmpeg 2.4. That has been fixed since.
2017-12-03 23:10:46 +02:00