jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,651 Commits
1 Branch
0 Tags
60 MiB
Commit Graph

291 Commits (master)

Author SHA1 Message Date
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
Ryan Foster c3b2380b13 CI: Build on Linux with AppVeyor 
Build on Linux (Ubuntu 16.04) with AppVeyor. Disable PowerShell on
Linux. Ubuntu 16.04's dependencies are different from the existing
Ubuntu 14.04 dependencies, so a separate script for installing those
dependencies has been added.
 2018-09-18 15:13:40 -04:00
Ryan Foster dfbf42bfd1 CI: Move AppVeyor install commands to a script file 
Move the AppVeyor install scripts to a separate script file. This
shortens the appveyor.yml file and makes it easier to introduce new
install scripts for other build environments.

There is one minor change to the install script, and that was to change
directory back to the obs-studio git root directory.
 2018-09-18 15:13:39 -04:00
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
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