qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: qemu-devel@nongnu.org, "Philippe Mathieu-Daudé" <f4bug@amsat.org>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Fam Zheng" <famz@redhat.com>
Subject: [Qemu-devel] [PULL v3 13/20] docker: ubuntu: Use SDL2
Date: Thu,  5 Jul 2018 17:03:22 +0100	[thread overview]
Message-ID: <20180705160329.30386-14-alex.bennee@linaro.org> (raw)
In-Reply-To: <20180705160329.30386-1-alex.bennee@linaro.org>

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>

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
-- 
2.17.1

  parent reply	other threads:[~2018-07-05 16:03 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-05 16:03 [Qemu-devel] [PULL v3 00/20] Travis, Code Coverage and Cross Build updates Alex Bennée
2018-07-05 16:03 ` [Qemu-devel] [PULL v3 01/20] Revert "Makefile: Rename TARGET_DIRS to TARGET_LIST" Alex Bennée
2018-07-05 16:03 ` [Qemu-devel] [PULL v3 02/20] travis: do not waste time cloning unused submodules Alex Bennée
2018-07-05 16:03 ` [Qemu-devel] [PULL v3 03/20] travis: test out-of-tree builds Alex Bennée
2018-07-05 16:03 ` [Qemu-devel] [PULL v3 04/20] build-system: remove per-test GCOV reporting Alex Bennée
2018-07-05 16:03 ` [Qemu-devel] [PULL v3 05/20] .gitignore: add .gcov files Alex Bennée
2018-07-05 16:03 ` [Qemu-devel] [PULL v3 06/20] docker: add gcovr to travis image Alex Bennée
2018-07-05 16:03 ` [Qemu-devel] [PULL v3 07/20] travis: add gcovr summary for GCOV build Alex Bennée
2018-07-05 16:03 ` [Qemu-devel] [PULL v3 08/20] build-system: add clean-coverage target Alex Bennée
2018-07-05 16:03 ` [Qemu-devel] [PULL v3 09/20] build-system: add coverage-report target Alex Bennée
2018-07-05 16:03 ` [Qemu-devel] [PULL v3 10/20] linux-user: introduce preexit_cleanup Alex Bennée
2018-07-05 16:03 ` [Qemu-devel] [PULL v3 11/20] linux-user: add gcov support to preexit_cleanup Alex Bennée
2018-07-05 16:03 ` [Qemu-devel] [PULL v3 12/20] docker: ubuntu: Update the package list before installing new ones Alex Bennée
2018-07-05 16:03 ` Alex Bennée [this message]
2018-07-05 16:03 ` [Qemu-devel] [PULL v3 14/20] docker: Clean the MXE base image Alex Bennée
2018-07-05 16:03 ` [Qemu-devel] [PULL v3 15/20] docker: Do not run tests in 'intermediate' images Alex Bennée
2018-07-05 16:03 ` [Qemu-devel] [PULL v3 16/20] docker: drop QEMU build-dep from bootstrap Alex Bennée
2018-07-05 16:03 ` [Qemu-devel] [PULL v3 17/20] docker: debian-bootstrap.pre allow customising of variant/url Alex Bennée
2018-07-05 16:03 ` [Qemu-devel] [PULL v3 18/20] docker: add special handling for FROM:debian-%-user targets Alex Bennée
2018-07-05 16:03 ` [Qemu-devel] [PULL v3 19/20] docker: add special rule for deboostrapped images Alex Bennée
2018-07-05 16:03 ` [Qemu-devel] [PULL v3 20/20] docker: add linux-user powered cross builder for QEMU Alex Bennée
2018-07-05 18:10 ` [Qemu-devel] [PULL v3 00/20] Travis, Code Coverage and Cross Build updates Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180705160329.30386-14-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=f4bug@amsat.org \
    --cc=famz@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).