diff --git a/ci-scripts/linux/travis-install.sh b/ci-scripts/linux/travis-install.sh index 91035d1..156b00e 100644 --- a/ci-scripts/linux/travis-install.sh +++ b/ci-scripts/linux/travis-install.sh @@ -1,6 +1,7 @@ sudo add-apt-repository --yes ppa:beineri/opt-qt562-trusty +sudo add-apt-repository --yes ppa:achadwick/mypaint-testing sudo apt-get update -sudo apt-get install -y liblzo2-dev liblz4-dev libfreetype6-dev libpng-dev libsdl2-dev libglew-dev freeglut3-dev qt56script libsuperlu3-dev libpng-dev qt56svg qt56tools qt56multimedia wget libusb-1.0-0-dev libboost-all-dev liblzma-dev +sudo apt-get install -y liblzo2-dev liblz4-dev libfreetype6-dev libpng-dev libsdl2-dev libglew-dev freeglut3-dev qt56script libsuperlu3-dev libpng-dev qt56svg qt56tools qt56multimedia wget libusb-1.0-0-dev libboost-all-dev liblzma-dev libjson-c-dev libmypaint-dev # someone forgot to include liblz4.pc with the package, use the version from xenial, as it only depends on libc wget http://mirrors.kernel.org/ubuntu/pool/main/l/lz4/liblz4-1_0.0~r131-2ubuntu2_amd64.deb -O liblz4.deb wget http://mirrors.kernel.org/ubuntu/pool/main/l/lz4/liblz4-dev_0.0~r131-2ubuntu2_amd64.deb -O liblz4-dev.deb diff --git a/ci-scripts/osx/travis-install.sh b/ci-scripts/osx/travis-install.sh index 5a2358d..38456ad 100644 --- a/ci-scripts/osx/travis-install.sh +++ b/ci-scripts/osx/travis-install.sh @@ -1,5 +1,5 @@ #!/bin/bash brew update -brew install qt55 glew lz4 lzo libusb +brew install qt55 glew lz4 lzo libusb libmypaint brew tap tcr/tcr brew install clang-format