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

98 Commits

Author SHA1 Message Date
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
Ryan Foster
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
Ryan Foster
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
Ryan Foster
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
Ryan Foster
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
Colin Edwards
23ea91976f Build with CEF 3112 on OSX 2017-08-18 21:41:31 -05:00
Jim
59fcfaadb5 Merge pull request #913 from craftwar/robocopy
CI: exclude .gitignore from AppVeyor artifacts
2017-05-15 21:44:42 -07:00
jp9000
ce44791932 CI: Use git fetch --unshallow for OSX 2017-05-12 18:19:40 -07:00
craftwar
ebd341145e CI: exclude .gitignore 2017-05-12 12:20:14 +08:00
juvester
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
Richard Stanway
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
Jim
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
juvester
de32d89fc6 CI: Linux - Install FFmpeg from source
[skip appveyor]
2017-03-24 20:49:25 +02:00
juvester
cf59f933fa CI: Linux - Install libfdk-aac-dev
[skip appveyor]
2017-03-10 19:18:03 +02:00
Gol-D-Ace
723d25e0ed CI: OSX - Fix obs.png 2017-03-10 14:54:58 +01:00
juvester
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
Gol-D-Ace
b0aa8a5b6b Merge pull request #852 from DDRBoxman/sparkle
CI: OSX - enable sparkle
2017-03-06 04:03:11 +01:00
Colin Edwards
c22cfaa15b CI: OSX - enable sparkle 2017-03-05 20:45:19 -06:00
Gol-D-Ace
efc369ef83 CI: OSX - Brew install speexdsp 2017-03-06 03:15:17 +01:00
Colin Edwards
5eda800d3f CI: OSX - Move CEF version to .travis 2017-03-01 18:18:29 -06:00