150 Commits

Author SHA1 Message Date
Colin Edwards
8b6f6d1c85 CI: Move clang format check into a seperate github workflow 2020-04-09 21:26:41 -05:00
Colin Edwards
921a742966
Merge pull request #2617 from RytoEX/update-macos-deps
CI: Update macOS dependencies
2020-04-07 14:51:16 -05:00
Colin Edwards
de6643b8ea CI: Update dependencies on macOS 2020-04-07 14:06:54 -05:00
Ryan Foster
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
Colin Edwards
f0fe107515 CI: macOS use qt 5.14.1 2020-03-04 21:48:26 -06:00
Colin Edwards
91d5a9c895 CI: Fix some macOS build settings 2020-03-03 20:20:12 -06:00
David Baker
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
Clayton Groeneveld
0b33df9b2f CI: Build CEF on Linux 2020-02-25 22:38:12 -06:00
Jim
faf1535ad5
Merge pull request #2422 from cg2121/remove-ci-script
CI: Remove unused Linux script
2020-02-23 00:19:46 -08:00
jpark37
ab53f31eb5 CI: Use VS 2019 and windows-2019 VM image 2020-02-22 21:02:33 -08:00
Clayton Groeneveld
c44a0e3fe7 CI: Remove unused Linux script 2020-02-22 19:12:02 -06:00
Richard Stanway
7d85aa3180 CI: Add libmbedtls-dev 2020-01-25 18:24:04 +01:00
SCG82
b7a88f7ac8 CI: Fix QtNetwork in Mac packaging script 2019-12-16 04:37:16 -08:00
SCG82
0273db7afc CI: Fix error deleting QT network framework on OSX 2019-12-14 04:32:58 -08:00
SCG82
de4ceb054c CI: Fix mbedtls id in mac deploy script 2019-12-14 01:34:06 -08:00
Colin Edwards
6096d23632 CI: Fix up QT network framework on OSX 2019-12-11 23:04:51 -06:00
Colin Edwards
effcdc04d2 CI: Fix osx executable path in plist 2019-12-11 18:25:54 -06:00
Colin Edwards
43f9f45f8f CI: Fix framework symlinks when building osx app 2019-12-11 17:32:04 -06:00
Rat
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
Jim
def6fcb0ee
Merge pull request #2125 from DDRBoxman/appbundle
Fixes to make OBS work on Catalina
2019-11-13 12:21:13 -08:00
Colin Edwards
32690926b9 CI: Use custom macdylibbundler for OSX deps 2019-11-03 00:00:38 -05:00
Joel Bethke
404dc6a84d CI: Remove dead PPA to fix Linux build failure 2019-10-15 14:24:28 -05:00
Colin Edwards
7c08b3f95e CI: Update scripts for reorganized OSX bundle 2019-10-14 22:10:38 -05:00
Ioan Loosley
c351580a20 Build: Added BUILD_CAPTIONS to linux build script 2019-10-07 21:08:00 +01:00
Colin Edwards
1507db7b1b CI: Update CEF on osx to 3770 2019-09-07 17:44:12 -05:00
Gol-D-Ace
05888fc3aa CI: Update Windows CEF version 2019-08-30 16:38:59 +02:00
Gol-D-Ace
baddca2536 CI: Only download Qt if it doesn't exist already 2019-07-27 06:52:47 +02:00
Colin Edwards
28243dbc94 CI: Run clang format on linux and osx CI and fail if changes are made 2019-07-12 21:44:33 -05:00
Jim
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
SCG82
839e74f522 CI: Fix travis test on OSX 2019-05-24 20:38:27 -07:00
SCG82
85012d5a39 CI: Build CEF with OS X 10.11 target 2019-05-24 20:31:30 -07:00
Colin Edwards
f5c6fa3656 CI: Use swig 3.0.12 on OSX 2019-05-02 18:39:59 -05:00
Colin Edwards
f5becb64da CI: Use swig 3.04 on OSX 2019-05-02 15:07:03 -05:00
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