[PULL,v3,13/20] docker: ubuntu: Use SDL2

Message ID	20180705160329.30386-14-alex.bennee@linaro.org
State	Accepted
Commit	daf999f77acfbe3ae09b5b8b58c140d9fdf38409
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org> To: peter.maydell@linaro.org Date: Thu, 5 Jul 2018 17:03:22 +0100 Message-Id: <20180705160329.30386-14-alex.bennee@linaro.org> In-Reply-To: <20180705160329.30386-1-alex.bennee@linaro.org> References: <20180705160329.30386-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PULL v3 13/20] docker: ubuntu: Use SDL2 Precedence: list Cc: Fam Zheng <famz@redhat.com>, =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>, qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>
Series	Travis, Code Coverage and Cross Build updates \| expand [PULL,v3,00/20] Travis, Code Coverage and Cross Build updates [PULL,v3,01/20] Revert "Makefile: Rename TARGET_DIRS to TARGET_LIST" [PULL,v3,02/20] travis: do not waste time cloning unused submodules [PULL,v3,03/20] travis: test out-of-tree builds [PULL,v3,04/20] build-system: remove per-test GCOV reporting [PULL,v3,05/20] .gitignore: add .gcov files [PULL,v3,06/20] docker: add gcovr to travis image [PULL,v3,07/20] travis: add gcovr summary for GCOV build [PULL,v3,08/20] build-system: add clean-coverage target [PULL,v3,09/20] build-system: add coverage-report target [PULL,v3,10/20] linux-user: introduce preexit_cleanup [PULL,v3,11/20] linux-user: add gcov support to preexit_cleanup [PULL,v3,12/20] docker: ubuntu: Update the package list before installing new ones [PULL,v3,13/20] docker: ubuntu: Use SDL2 [PULL,v3,14/20] docker: Clean the MXE base image [PULL,v3,15/20] docker: Do not run tests in 'intermediate' images [PULL,v3,16/20] docker: drop QEMU build-dep from bootstrap [PULL,v3,17/20] docker: debian-bootstrap.pre allow customising of variant/url [PULL,v3,18/20] docker: add special handling for FROM:debian-%-user targets [PULL,v3,19/20] docker: add special rule for deboostrapped images [PULL,v3,20/20] docker: add linux-user powered cross builder for QEMU

Message ID

20180705160329.30386-14-alex.bennee@linaro.org

State

Accepted

Commit

daf999f77acfbe3ae09b5b8b58c140d9fdf38409

Headers

Received-SPF: pass (google.com: domain of
	qemu-devel-bounces+patch=linaro.org@nongnu.org designates
	2001:4830:134:3::11 as permitted sender)
	client-ip=2001:4830:134:3::11; 
From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Date: Thu,  5 Jul 2018 17:03:22 +0100
Message-Id: <20180705160329.30386-14-alex.bennee@linaro.org>
In-Reply-To: <20180705160329.30386-1-alex.bennee@linaro.org>
References: <20180705160329.30386-1-alex.bennee@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [Qemu-devel] [PULL v3 13/20] docker: ubuntu: Use SDL2
Precedence: list
Cc: Fam Zheng <famz@redhat.com>, =?utf-8?q?Alex_Benn=C3=A9e?=
	<alex.bennee@linaro.org>, 	qemu-devel@nongnu.org,
	=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org>
Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>

Series

Travis, Code Coverage and Cross Build updates | expand

Commit Message

Alex Bennée July 5, 2018, 4:03 p.m. UTC

From: Philippe Mathieu-Daudé <f4bug@amsat.org>


Do not test the deprecated API versions (see cabd35840749d).
Debian MXE MinGW cross images are already using SDL2.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>


-- 
2.17.1

diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker
index c03520ce3f..7d724e7f53 100644
--- a/tests/docker/dockerfiles/ubuntu.docker
+++ b/tests/docker/dockerfiles/ubuntu.docker
@@ -5,7 +5,7 @@  ENV PACKAGES flex bison \
     libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev libncursesw5-dev \
     libseccomp-dev libgnutls-dev libssh2-1-dev  libspice-server-dev \
     libspice-protocol-dev libnss3-dev libfdt-dev \
-    libgtk-3-dev libvte-2.91-dev libsdl1.2-dev libpng12-dev libpixman-1-dev \
+    libgtk-3-dev libvte-2.91-dev libsdl2-dev libpng12-dev libpixman-1-dev \
     libvdeplug-dev liblzo2-dev libsnappy-dev libbz2-dev libxen-dev librdmacm-dev libibverbs-dev \
     libsasl2-dev libjpeg-turbo8-dev xfslibs-dev libcap-ng-dev libbrlapi-dev libcurl4-gnutls-dev \
     libbluetooth-dev librbd-dev libaio-dev glusterfs-common libnuma-dev libepoxy-dev libdrm-dev libgbm-dev \
@@ -15,4 +15,4 @@  ENV PACKAGES flex bison \
 RUN apt-get update && \
     apt-get -y install $PACKAGES
 RUN dpkg -l $PACKAGES | sort > /packages.txt
-ENV FEATURES clang pyyaml
+ENV FEATURES clang pyyaml sdl2

[PULL,v3,13/20] docker: ubuntu: Use SDL2

Commit Message

Patch