mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 13:08:50 +02:00
Code
10,063 Commits 16 Branches 211 Tags 169 MiB
293b7951ed
Commit Graph

222 Commits

Author SHA1 Message Date
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
Colin Edwards
108b296855 CI: Fix cef version variable 2017-03-01 15:27:33 -06:00
Colin Edwards
a029b3e217 CI: OSX - export cef version so we can use it elsewhere 2017-03-01 14:35:22 -06:00
Colin Edwards
5843100b9e CI: OSX - Use bash variable for CEF version 2017-03-01 12:22:41 -06:00
Gol-D-Ace
33e16c3ee9 CI: Use correct folder for building browser 2017-03-01 19:05:08 +01:00
Jim
d421228315 Merge pull request #834 from DDRBoxman/osxsign 
CI: OSX - Update to CEF 2987
 2017-02-28 22:35:28 -08:00
Colin Edwards
8a78e79a83 CI: OSX - Update to CEF 2987 2017-03-01 00:34:03 -06:00
Colin Edwards
44b9770037 CI: OSX - Include branch in pkg 2017-02-27 19:30:23 -06:00
Colin Edwards
92b48de535 CI: Add boolean arg parser to OSX 2017-02-27 17:47:11 -06:00
Colin Edwards
55eb2446c1 CI: Fix true / false on stable builds 2017-02-27 17:31:15 -06:00
jp9000
5312ffa815 CI: Update public OSX install key 2017-02-27 13:24:40 -08:00
Colin Edwards
775a0d0bbc CI: OSX Set builds to stable on tagged builds 2017-02-27 14:50:16 -06:00
Jim
3284709f3b Merge pull request #825 from DDRBoxman/osxsign 
CI: OSX - Brew install jack
 2017-02-26 18:42:17 -08:00
Colin Edwards
e73890b7ef CI: OSX - Brew install jack 2017-02-26 20:39:04 -06:00
Colin Edwards
b538375a3f CI: Possibly fix OSX cert import issue 2017-02-26 19:49:32 -06:00
Colin Edwards
e302c0b837 CI: Add some logging to the before deploy script on OSX 2017-02-26 19:17:52 -06:00
Gol-D-Ace
5e185444e1 CI: Set keychain timeout & allow productsign 2017-02-27 01:21:20 +01:00
Colin Edwards
48abb05de4 CI: Use combined cert for signing OSX 2017-02-26 16:27:29 -06:00
Colin Edwards
e609602cfe CI: Get some codesigning and sparkle stuff in place 2017-02-26 15:34:41 -06:00
Jim
f3196f487d Merge pull request #815 from juvester/ci-linux 
CI: Build on Linux
 2017-02-25 13:13:03 -08:00
juvester
66c8d3bc2b CI: Build on Linux 
[skip appveyor]
 2017-02-25 22:28:29 +02:00
Jim
4f417aa39c Merge pull request #812 from DDRBoxman/patch-4 
CI: Exit on errors when building the OSX package
 2017-02-25 09:49:57 -08:00
Colin Edwards
936c582651 CI: Exit on errors when building the OSX package 2017-02-25 11:32:39 -06:00
Colin Edwards
a15c27effe CI: Fetch git tags on OSX build 2017-02-25 11:31:44 -06:00
juvester
e99c06ad6a CI: Retry failed downloads 
If all retries fail, stop the build.
 2017-02-17 15:22:18 +02:00
David Cooper
7a5ac075d0 CI: Fix OSX post-install script 
Closes jp9000/obs-studio#789
 2017-02-04 20:39:18 -08:00
Colin Edwards
9af749389e CI: Unzip VLC quietly 2017-02-01 18:11:49 -06:00
juvester
6c5a364e88 CI: Fix VLC download 2017-02-01 23:50:24 +02:00
Colin Edwards
42467c58e8 CI: Add post install script to OBS installer to fix CEF permissions 2017-01-30 10:41:24 -06:00
Jim
7099e170b2 Merge pull request #769 from DDRBoxman/osx 
CI: Build VLC plugin for OSX on travis
 2017-01-23 22:30:24 -08:00
Jim
70bcf3d5b0 Merge pull request #773 from Gol-D-Ace/CI_Stuff 
CI: Build Windows version and upload artifacts
 2017-01-23 22:20:09 -08:00
Colin Edwards
be59588df6 CI: Update permissions on CEF app plist before packaging 2017-01-23 21:59:08 -06:00
Gol-D-Ace
29888dc2f7 CI: Build Windows version and upload artifacts 
Currently this build is still missing the following plugins:
enc-amf
obs-browser
win-ivcam
 2017-01-24 01:17:13 +01:00
Colin Edwards
22e2a12432 CI: Build VLC plugin for OSX on travis 2017-01-22 00:51:40 -06:00
Colin Edwards
991c8bd352 CI: Move browser source before building app 
The buildapp.py script was modifying the CEF.app when we don't want it to. It was also packaging the plugin inside the OBS.app so the app was not using the one under /Library
 2017-01-19 10:15:41 -06:00
Colin Edwards
e1496ecff9 CI: Install Packages and use the full version 2017-01-15 11:26:58 -06:00
Colin Edwards
2132919005 CI: actually call packagesbuild from the right place 😑 2017-01-12 23:13:26 -06:00
Colin Edwards
836031a7ba CI: Ability to make packages on travis 2017-01-12 20:52:42 -06:00
Colin Edwards
09695ce9b1 CI: Fix zip permission issue on CEF plist files 2017-01-09 20:50:39 -06:00
Colin Edwards
770a9b7e67 CI: Update browser plugin ref and build scripts. 
Hopefully this will fix a crash from CEF on 10.9
 2017-01-09 19:48:32 -06:00
Colin Edwards
1310e0404f CI: Build more features into FFMPEG deps 2017-01-08 22:11:23 -06:00
Colin Edwards
0f2e71cdb5 [CI] Use prebuilt deps so we can build on 10.9 2017-01-07 21:05:23 -06:00
Colin Edwards
e361855dc1 Remove python dep 2016-11-21 22:35:57 -06:00
Colin Edwards
3667c6c3ba Revert "CI: Build on OSX 10.10 on travis" 
This reverts commit d160cedbc3.
 2016-11-21 22:21:15 -06:00
Colin Edwards
d160cedbc3 CI: Build on OSX 10.10 on travis 2016-10-17 00:49:55 -05:00
Colin Edwards
947d04012f Build browser plugin on travis for OSX 2016-10-13 19:36:55 -05:00
Colin Edwards
522c43f827 CI: Use python2 to run package script 2016-10-13 19:32:19 -05:00
Colin Edwards
a0b4439893 CI: Package OSX build into an actual app 2016-10-11 22:43:17 -05:00
Colin Edwards
47c8365cdd OSX Travis build 2016-10-10 00:39:55 -05:00