628 Commits

Author SHA1 Message Date
Stéphane L
c206cdfa4c chore(release): version bump 2018-11-01 13:22:26 +01:00
Travis CI
c31ec077f5 docs(travis): Update protocol.md - afc6a60 [skip ci] 2018-11-01 12:15:56 +00:00
Stéphane Lepin
afc6a60746
Merge pull request #248 from RytoEX/4.3-fix-typos
general: Fix several typos throughout
2018-11-01 13:13:24 +01:00
Stéphane L
0a495b67e6 bugfix(requests): register DuplicateSceneItem and DeleteSceneItem 2018-11-01 13:00:07 +01:00
Ryan Foster
37ea7073d5 general: Fix several typos throughout 2018-11-01 00:42:02 -04:00
Stéphane Lepin
feaeef5a70
Merge pull request #246 from PatTheMav/4.4-macOS-build-update
4.4 macOS build system update
2018-10-30 14:58:17 +01:00
Stéphane Lepin
5586670d38 Utils: add missing scene item methods 2018-10-30 14:53:48 +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 L
3d9a4ef1e6 cpp: fix build errors 2018-10-23 13:12:51 +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
Travis CI
f2792c0b40 docs(travis): Update protocol.md - 9710908 [skip ci] 2018-10-19 16:06:06 +00:00
Stéphane L
97109087a4 DuplicateSceneItem bug fix
Courtesy of @TStod
2018-10-19 18:04:34 +02:00
Stéphane L
953f07f21f new request types for filter management 2018-10-19 18:01:14 +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
Stéphane Lepin
a561c60f7e
Merge pull request #245 from PatTheMav/macos-10.14-qt-fix
CI: Fix QT 5.10 not building under macOS 10.13+
2018-10-19 17:32:19 +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
3b7e216409 Merge branch 'macos-qt-fix' into 4.3-maintenance 2018-10-06 12:24:21 +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
4e6d4ac437 events: fix triggering of PreviewSceneChanged 4.4.0 2018-07-31 11:27:10 +02:00
Stéphane L
3b197651cc general: step by one commit to have CI running 2018-07-30 19:17:35 +02:00
Travis CI
c675f1c20c docs(travis): Update protocol.md - e87955d [skip ci] 2018-07-30 17:04:19 +00: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 Lepin
454a68d1b7
Merge pull request #199 from Palakis/4.3-jimtree-studiomode-fix
[not ready] events: fix triggering of PreviewSceneChanged
2018-07-29 17:01:48 +02:00
Stéphane L
45f6f74cbe cmake: remove copy operation 2018-07-21 23:05:38 +02:00
Stéphane L
cb7412a457 events: fix triggering of PreviewSceneChanged 2018-07-08 12:58:06 +02:00
Stéphane L
a9fc82365c TransitionBegin: add source and destination scene names 2018-06-24 22:33:07 +02:00
Stéphane L
edc0fed9e2 Merge branch 'transition-override-begin-event' into 4.3-maintenance 2018-06-24 22:20:55 +02:00
Stéphane L
1c718963ea TransitionBegin: support for transition overrides 2018-06-24 22:19:45 +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
80e1dc2446 Merge pull request #210 from RytoEX/build-instruction-update
Build instruction update
2018-05-27 18:35:07 +02:00
Stéphane L
d03c4cc4b9 Merge pull request #219 from christopher-dG/cdg/replaystopping
docs: Fix ReplayStopping description
2018-05-27 18:34:58 +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