summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorThomas Huth2019-10-09 19:06:59 +0200
committerAlex Bennée2019-10-25 20:23:53 +0200
commit3c7a8b41b4227729e6347c682286b41eafdab1bf (patch)
treeb997fbcfeb6fa74632f6481dab25965d5dc8eb7b /.travis.yml
parenttravis.yml: Use libsdl2 instead of libsdl1.2, and install libsdl2-image (diff)
downloadqemu-3c7a8b41b4227729e6347c682286b41eafdab1bf.tar.gz
qemu-3c7a8b41b4227729e6347c682286b41eafdab1bf.tar.xz
qemu-3c7a8b41b4227729e6347c682286b41eafdab1bf.zip
travis.yml: Use newer version of libgnutls and libpng
libgnutls-dev and libpng12-dev are not available in newer versions of Ubuntu anymore, so installing these packages fails e.g. in the new arm64 containers on Travis. Let's use newer versions of these packages by default instead. (The old versions still get tested in the "gcc-9" build). Signed-off-by: Thomas Huth <thuth@redhat.com> Message-Id: <20191009170701.14756-4-thuth@redhat.com> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index b446e04e8a..e65e53f3d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ addons:
- libcap-dev
- libcap-ng-dev
- libgcc-4.8-dev
- - libgnutls-dev
+ - libgnutls28-dev
- libgtk-3-dev
- libiscsi-dev
- liblttng-ust-dev
@@ -37,7 +37,7 @@ addons:
- libnfs-dev
- libnss3-dev
- libpixman-1-dev
- - libpng12-dev
+ - libpng-dev
- librados-dev
- libsdl2-dev
- libsdl2-image-dev