diff options
| author | Stéphane L <Palakis@users.noreply.github.com> | 2017-09-24 19:54:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-24 19:54:09 +0200 |
| commit | c5ef2d1cc24d2ff90639d0ec25debdec7e0a12d6 (patch) | |
| tree | 7cdb7dd38474e151a78da13b29fae7a128724441 /.travis.yml | |
| parent | abfa30085b6256aa987ab845df6a3e9ceb21a261 (diff) | |
| parent | 96bfb41779917028e09c022e3b6f5c291ae9048d (diff) | |
Merge branch 'master' into multi-broadcasting
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 24fdb053ef..bb1b86b837 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,7 +51,6 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sh -e /etc/init.d/xvfb start ; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install scons portaudio libsndfile libogg libvorbis portmidi taglib libshout protobuf flac ffmpeg qt chromaprint rubberband fftw libmodplug libid3tag libmad mp4v2 faad2 wavpack opusfile; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade libjpeg; fi install: #### |