diff --git a/.travis.yml b/.travis.yml index 48a8e017..64d75697 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,38 +25,39 @@ matrix: - libstdc++6:i386 - os: linux sudo: required - dist: xenial + dist: bionic compiler: gcc env: TRAVIS_TARGET=linux addons: apt: sources: - - sourceline: 'ppa:beineri/opt-qt597-xenial' - - sourceline: 'ppa:jonathonf/ffmpeg-4' + - sourceline: 'ppa:savoury1/multimedia' + - sourceline: 'ppa:savoury1/ffmpeg4' packages: - - qt59base - - qt59quickcontrols2 - - qt59svg - - libesd0-dev - - libgl-dev + - qt5-default + - qtbase5-dev + - qtquickcontrols2-5-dev + - libqt5svg5-dev + - libgl1-mesa-dev - libegl1-mesa-dev - libxkbcommon-dev - wayland-protocols - libopus-dev - - libavcodec-dev - - libavutil-dev - libva-dev - libvdpau-dev + - libsdl2-dev + - qtdeclarative5-dev + - libssl-dev + - libsdl2-ttf-dev + - libavcodec-dev + - libavutil-dev install: - '[ "$TRAVIS_TARGET" != osx ] || brew link --force qt' - if [[ "$TRAVIS_TARGET" = "osx" ]]; then nvm use node && npm install --global create-dmg; fi - - if [[ "$TRAVIS_TARGET" = "linux" ]]; then export SDL2_VER=2.0.9 && wget https://www.libsdl.org/release/SDL2-$SDL2_VER.tar.gz && tar -xvf SDL2-$SDL2_VER.tar.gz && cd SDL2-$SDL2_VER && ./configure && make -j$(nproc) && sudo make install && cd ..; fi - - if [[ "$TRAVIS_TARGET" = "linux" ]]; then export SDL2_TTF_VER=2.0.15 && wget https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-$SDL2_TTF_VER.tar.gz && tar -xvf SDL2_ttf-$SDL2_TTF_VER.tar.gz && cd SDL2_ttf-$SDL2_TTF_VER && ./configure && make -j$(nproc) && sudo make install && cd ..; fi - if [[ "$TRAVIS_TARGET" = "steamlink" ]]; then git clone --depth=1 https://github.com/ValveSoftware/steamlink-sdk.git $HOME/steamlink-sdk; fi before_script: - - '[ "$TRAVIS_TARGET" != "linux" ] || source /opt/qt59/bin/qt59-env.sh' - '[ "$TRAVIS_TARGET" = "steamlink" ] || qmake -v' - '[[ "$TRAVIS_TARGET" != linux || "$CXX" != clang++ ]] || export QMAKESPEC=linux-clang' - '[[ "$TRAVIS_TARGET" != linux || "$CXX" != g++ ]] || export QMAKESPEC=linux-g++'