diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2019-06-30 22:21:09 +0200 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2019-06-30 22:21:09 +0200 |
| commit | 2d7392a8e44aa92bfd2fd5f04b3b04da5b83b420 (patch) | |
| tree | fbc10979a437d568f0c5e965762c9b2205bc1a2d /appveyor.yml | |
| parent | 935563effc9c018532162c23f95c027ee11f4651 (diff) | |
| parent | bc1310eebaa29e3b83668e9804125f10b6b21467 (diff) | |
Merge branch 'master' of git@github.com:mixxxdj/mixxx.git into ffmpeg31
# Conflicts:
# .travis.yml
Diffstat (limited to 'appveyor.yml')
| -rw-r--r-- | appveyor.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/appveyor.yml b/appveyor.yml index 59192c6ff2..835e65bd2d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -50,7 +50,7 @@ for: install: - sudo apt-get update - - sudo apt-get -y install gdb libavformat-dev libchromaprint-dev libfaad-dev libflac-dev libid3tag0-dev libmad0-dev libmodplug-dev libmp3lame-dev libmp4v2-dev libopus-dev libopusfile-dev libportmidi-dev libprotobuf-dev libqt5opengl5-dev libqt5sql5-sqlite libqt5svg5-dev librubberband-dev libshout3-dev libsndfile1-dev libsqlite3-dev libtag1-dev libupower-glib-dev libusb-1.0-0-dev libwavpack-dev portaudio19-dev protobuf-compiler qt5-default qtscript5-dev libqt5x11extras5-dev scons qtkeychain-dev liblilv-dev libsoundtouch-dev + - sudo apt-get -y install gdb libavformat-dev libchromaprint-dev libfaad-dev libflac-dev libid3tag0-dev libmad0-dev libmodplug-dev libmp3lame-dev libmp4v2-dev libopus-dev libopusfile-dev libportmidi-dev libprotobuf-dev libqt5opengl5-dev libqt5sql5-sqlite libqt5svg5-dev librubberband-dev libshout3-dev libsndfile1-dev libsqlite3-dev libtag1-dev libupower-glib-dev libusb-1.0-0-dev libwavpack-dev portaudio19-dev protobuf-compiler qt5-default qtscript5-dev libqt5x11extras5-dev scons qt5keychain-dev liblilv-dev libsoundtouch-dev build_script: # ffmpeg4=1 is not supported by Ubuntu 18.04 (FFmpeg 3.4.x) |