diff --git a/.travis.yml b/.travis.yml index cd2f7c92..c6509275 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ matrix: addons: apt: sources: - - sourceline: 'ppa:beineri/opt-qt596-xenial' + - sourceline: 'ppa:beineri/opt-qt597-xenial' - sourceline: 'ppa:jonathonf/ffmpeg-4' packages: - qt59base @@ -31,11 +31,12 @@ matrix: - libavutil-dev - libva-dev - libvdpau-dev + - libsdl2-ttf-dev install: - '[ "$TRAVIS_OS_NAME" != osx ] || brew install qt5' - '[ "$TRAVIS_OS_NAME" != osx ] || brew link --force qt5' - - if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then export SDL2_VER=2.0.8 && wget https://www.libsdl.org/release/SDL2-$SDL2_VER.tar.gz && tar -xvf SDL2-$SDL2_VER.tar.gz && cd SDL2-$SDL2_VER && ./configure && make && sudo make install && cd ..; fi + - if [[ "$TRAVIS_OS_NAME" = "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 && sudo make install && cd ..; fi before_script: - '[ "$TRAVIS_OS_NAME" != "linux" ] || source /opt/qt59/bin/qt59-env.sh' diff --git a/README.md b/README.md index 37fc5bce..45e93750 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ You can follow development on our [Discord server](https://discord.gg/6ERtzFY). ### Linux-specific Requirements * GCC or Clang -* Install your distro equivalents of: `openssl-devel qt5-devel SDL2-devel ffmpeg-devel qt5-qtquickcontrols2-devel libva-devel libvdpau-devel opus-devel pulseaudio-libs-devel alsa-lib-devel` +* Install your distro equivalents of: `openssl-devel qt5-devel SDL2-devel ffmpeg-devel qt5-qtquickcontrols2-devel libva-devel libvdpau-devel opus-devel pulseaudio-libs-devel alsa-lib-devel SDL2_ttf-devel` * FFmpeg 4.0 is required to build. If your distro doesn't package FFmpeg 4.0, you can build and install it from source on http://ffmpeg.org/ ### Build Setup Steps diff --git a/app/app.pro b/app/app.pro index fa4c112e..0b5b0a09 100644 --- a/app/app.pro +++ b/app/app.pro @@ -61,7 +61,7 @@ macx { unix:!macx { CONFIG += link_pkgconfig soundio - PKGCONFIG += openssl sdl2 opus + PKGCONFIG += openssl sdl2 SDL2_ttf opus # For libsoundio packagesExist(libpulse) {