From 45f52898dc202ebd931720a537af24b33a7e47a6 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Mon, 21 Sep 2015 00:46:57 -0700 Subject: [PATCH] All: Travis deps install script --- .travis-deps.sh | 15 +++++++++++++++ .travis.yml | 11 +---------- 2 files changed, 16 insertions(+), 10 deletions(-) create mode 100755 .travis-deps.sh diff --git a/.travis-deps.sh b/.travis-deps.sh new file mode 100755 index 000000000..77ab3832a --- /dev/null +++ b/.travis-deps.sh @@ -0,0 +1,15 @@ +#!/bin/sh +if [ $TRAVIS_OS_NAME -eq "osx"]; then + brew install qt5 ffmpeg imagemagick sdl2 libzip libpng +else + sudo add-apt-repository ppa:smspillaz/cmake-2.8.12 -y + sudo add-apt-repository ppa:zoogie/sdl2-snapshots -y + sudo add-apt-repository ppa:immerrr-k/qt5-backport -y + sudo add-apt-repository ppa:spvkgn/ffmpeg+mpv -y + sudo apt-get update -qq + sudo apt-get purge cmake -qq + sudo apt-get install -y -qq cmake libedit-dev libmagickwand-dev \ + libpng-devlibsdl2-dev libzip-dev qtbase5-dev \ + libqt5opengl5-dev qtmultimedia5-dev libavcodec-dev \ + libavutil-dev libavformat-dev libavresample-dev libswscale-dev +fi diff --git a/.travis.yml b/.travis.yml index 9f200427f..5bc51c00a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,15 +8,6 @@ compiler: - clang before_install: - - if [ $TRAVIS_OS_NAME -eq "osx"] - - then - - brew install qt5 ffmpeg imagemagick sdl2 libzip libpng - - else - - sudo add-apt-repository ppa:smspillaz/cmake-2.8.12 -y - - sudo add-apt-repository ppa:zoogie/sdl2-snapshots -y - - sudo apt-get update -qq - - sudo apt-get purge cmake -qq - - sudo apt-get install -y -qq cmake libedit-dev libmagickwand-dev libpng-dev libsdl2-dev libzip-dev - - fi + - ./.travis-deps.sh script: mkdir build && cd build && cmake .. && make