diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2017-12-30 23:29:40 +0100 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2017-12-30 23:29:40 +0100 |
| commit | 05fb3edac14f2bc9fd721dba33d04d6c7dd53ad4 (patch) | |
| tree | 74932a5d8db9369d97f9580d9593b782d8724f73 /.travis.yml | |
| parent | eb9ef4f1f5212f5fb773b3a19fb8163cc5a76c61 (diff) | |
| parent | 7946a80be2ba44682618a563bd9fe4c4f38d4b7a (diff) | |
Merge commit '7946a80be2ba44682618a563bd9fe4c4f38d4b7a' into lv2_support2
Conflicts:
src/effects/native/echoeffect.cpp
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 15473dd39c..e154e0fdcc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,7 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export DISPLAY=:99.0 ; fi - 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 libjpeg qt chromaprint rubberband fftw libmodplug libid3tag libmad mp4v2 faad2 wavpack opusfile; 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 install: #### |