159 Commits

Author SHA1 Message Date
Stéphane Lepin
c12a4323e7
Merge pull request #279 from derrod/captions
Add caption handler
2019-04-16 23:12:20 +02:00
Stéphane L
37f96b8cf2 chore: bump to 4.6.0 2019-03-30 15:34:06 +01:00
derrod
545db60b98 ci: enable/build captions 2019-03-22 10:27:27 +01:00
Stéphane Lepin
4bc02a7389 ci(macos): install boost 2019-03-21 21:56:07 +01:00
Stéphane Lepin
eeeca8afd0
ci(macos): remove set -ev 2019-03-17 15:38:59 +01:00
Stéphane L
4f607df5fc ci(macos): fix typo 2019-03-17 15:01:01 +01:00
Stéphane L
b14b18e4be ci(macos): setup Azure Pipelines 2019-03-17 14:45:41 +01:00
Stéphane Lepin
ec7f3fa057 ci(macos): revert version change 2018-12-31 17:21:29 +01:00
Stéphane Lepin
5cfefd8b15 ci(docs): revert change 2018-12-31 17:19:24 +01:00
Stéphane Lepin
7e6b53311d import more changes from master 2018-12-31 17:18:07 +01:00
Stéphane L
82b8c66d51 docs: fix branch name in generation script 2018-12-24 02:07:55 +01:00
PatTheMav
77d63e9848
Added check for already installed packagesbuild 2018-11-08 21:29:39 +01:00
Stéphane L
962e26040d ci(windows): build OBS with VS2015 2018-11-07 00:02:34 +01:00
Stéphane L
b07884c1da ci(win): use VS2015 to fix build errors
`constexpr function 'qCountLeadingZeroBits' cannot result in a constant expression`
2018-11-06 23:52:03 +01:00
Stéphane L
c206cdfa4c chore(release): version bump 2018-11-01 13:22:26 +01:00
PatTheMav
65a9139ffe
Fixes Travis builds for macOS
Switching to Xcode 9.4 achieves parity with obs-studio.
Also QT 5.10.1 is not available as a bottle for Sierra
anymore, which leads to Travis building qt from sources.

By enabling output of the qt install step, the "missing
output" timeout in Travis should be fixed as well, once
qt is not available for High Sieera anymore.
2018-10-24 19:39:32 +02:00
PatTheMav
3d76f078cd
Silenced Homebrew update 2018-10-24 18:57:44 +02:00
PatTheMav
a1de1b11bc
Fixed Codacy commit check 2018-10-24 18:17:54 +02:00
PatTheMav
b5a3e3a4f0
Fixed dependency check for homebrew packages 2018-10-24 16:04:09 +02:00
PatTheMav
d7b0ad4916
Removed duplicate code (thanks CodeFactor..) 2018-10-24 15:17:43 +02:00
PatTheMav
2a80a6b217
More POSIX sh fixes. 2018-10-24 15:14:50 +02:00
PatTheMav
9df72f54d5
Fixed OS check and POSIX sh compatibility 2018-10-24 15:12:54 +02:00
PatTheMav
ef75ca36c9
Added missing OS check in packaging script 2018-10-24 14:59:12 +02:00
PatTheMav
84c0b698f5
Updated build files for macOS build
* Checks for OS type before executing
* Checks for Homebrew
* Checks for git (obs-studio build phase)
* Checks for cmake (obs-studio build phase)
* Installs/Updates depdencies
* Installs QT 5.10.1 from bottle (just like obs-studio)
* Pins QT so homebrew does not forcefully update it
* Removed wget dependency, uses macOS' curl
* More output
2018-10-24 14:55:17 +02:00
Stéphane Lepin
cf51fdceef
ci(macos): fix wget install error 2018-10-23 12:56:37 +02:00
Stéphane Lepin
85a52ab01f general: convert indents to tabs 2018-10-19 18:22:34 +02:00
Stéphane Lepin
03f1035690
Merge pull request #241 from caseymrm/patch-1
Add wget to install-dependencies-macos.sh
2018-10-19 17:32:59 +02:00
PatTheMav
7963b328f9 Applied patches to enable QT 5.10 building 10.13+
Issue: https://github.com/Homebrew/homebrew-core/issues/27095
Applied: https://github.com/Homebrew/formula-patches/pull/237
Applied: https://github.com/Homebrew/homebrew-core/pull/27139
2018-10-18 01:26:00 +02:00
Stéphane Lepin
9ae43a6f75 ci(macos): fix Qt 5.10.0 installation 2018-10-06 12:06:43 +02:00
Casey Muller
6b86de1fb9
Add wget to install-dependencies-macos.sh
wget is not installed by default, so when doing the build on a fresh machine, brew install it first
2018-09-27 14:07:14 -07:00
Stéphane L
e87955d59a ci(docs): fix docs deployment 2018-07-30 19:02:29 +02:00
Stéphane L
c718d8d803 general: version bump + minor CI fixes 2018-07-30 18:57:24 +02:00
Stéphane L
cd40ccdb9d Merge pull request #211 from wherget/build-fixes
MacOS Build fixes
2018-05-27 18:38:39 +02:00
Stéphane L
7bd434e755 ci(macos): get rid of manual Packages versioning 2018-04-28 23:53:47 +02:00
Ryan Foster
640bcb90c6 CI(macOS): Split off obs-studio build task
Split off the obs-studio build task to help separate CI log sections.
2018-04-28 23:53:42 +02:00
Ryan Foster
08e86a1378 CI(macOS): Use latest Qt from Homebrew
OBS Studio CI currently uses the latest Qt version in Homebrew.
2018-04-28 23:53:36 +02:00
Ryan Foster
fefcc3937a CI(macOS): Update Packages version
Update Packages to version 1.2.3, which released on April 7, 2018.
2018-04-28 23:53:28 +02:00
RytoEX
25210dfa52 CI and CMake improvements (#205)
* CMake: Copy PDB file to OBS build directory on Debug build

All native OBS build objects also bundle the associated PDB file for
debugging and handling crash reports.

* CMake: Add post-build commands for RelWithDebInfo

Add post-build commands for the RelWithDebInfo build config. OBS
official builds use RelWithDebInfo, so we should be able to treat it as
a release config.

* CI: Disable building OBS native plugins

Use the OBS CMake flag DISABLE_PLUGINS to disable building plugins
included with OBS (including submodule plugins like obs-browser). This
should speed up builds on Windows when we have to rebuild OBS and on
Mac.

* CI: Don't clone/update OBS submodules

The only submodules presently in OBS are in its plugins, which we don't
need to build.

* CI: Use obsproject/obs-studio instead of jp9000/obs-studio

The OBS GitHub recently changed from jp9000/obs-studio to
obsproject/obs-studio, so use that instead.

* CI: Build as RelWithDebInfo instead of Release

OBS official builds are produced with RelWithDebInfo. This will produce
a PDB file for the plugin, similar to the native OBS plugins.

* CI(Windows): Build OBS if current build config doesn't exist

If OBS libs for the current build config do not exist, build OBS before
building obs-websocket.
2018-03-26 11:12:39 +02:00
Ryan Foster
56fbb7b9cf CI(Windows): Build OBS with Visual Studio 2017
We should also build OBS with Visual Studio 2017.
2018-03-26 11:12:19 +02:00
Ryan Foster
c55d33b956 CI(Windows): Use Visual Studio 2017
Official OBS releases have switched to Visual Studio 2017. There is no
32-bit Qt 5.10.1 package for Visual Studio 2017, but the Visual Studio
2015 package is compatible.
2018-03-26 11:11:18 +02:00
Stéphane Lepin
0c5bce101e CI(linux): forgot to install checkinstall 2018-03-20 14:27:04 +01:00
Stéphane Lepin
0a50e2a95c ci(linux): use OBS dev deps from PPA release 2018-03-20 14:11:33 +01:00
Stéphane L
6eb49930bf general: version bump to 4.3.3 2018-03-19 01:11:35 +01:00
Stéphane L
3a0d5fb190 CI: let's try with VS2015 instead 2018-03-18 23:25:38 +01:00
Stéphane L
8c2eee2e25 CI: update Windows builds to VS2017 and Qt 5.10.1 2018-03-18 23:25:31 +01:00
Stéphane L
548b53437f general: version bump to 4.3.2 2018-03-14 22:58:53 +01:00
Stéphane L
357691bad5 CI: bump to latest OBS version 2018-01-22 23:24:09 +01:00
Stéphane L
beadb56b05 general: update version to 4.3.1 2018-01-22 23:13:27 +01:00
Palakis
73f00ca195 CI: update Packages version 2018-01-12 11:13:16 +01:00
Palakis
4ada388828 general: version bump 2018-01-12 09:25:41 +01:00