From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: qemu-devel@nongnu.org, berrange@redhat.com,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Fam Zheng" <famz@redhat.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [Qemu-devel] [PULL 5/6] docker: test-mingw: use SDL2 and GTK+3
Date: Tue, 5 Jun 2018 17:05:40 +0100 [thread overview]
Message-ID: <20180605160541.10664-6-alex.bennee@linaro.org> (raw)
In-Reply-To: <20180605160541.10664-1-alex.bennee@linaro.org>
From: Paolo Bonzini <pbonzini@redhat.com>
Do not test the deprecated API versions. debian-win32-cross and debian-win64-cross
are already using SDL2 (they do not cover GTK+ at all).
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
[AJB: fix merge conflicts]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index 65d7761cf5..7d1d008002 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -11,12 +11,12 @@ ENV PACKAGES \
numactl-devel SDL2-devel snappy-devel spice-server-devel \
systemtap-sdt-devel usbredir-devel virglrenderer-devel vte3-devel \
xen-devel \
- mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL mingw32-pkg-config \
- mingw32-gtk2 mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 \
+ mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL2 mingw32-pkg-config \
+ mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 \
mingw32-libjpeg-turbo mingw32-libpng mingw32-curl mingw32-libssh2 \
mingw32-bzip2 \
- mingw64-pixman mingw64-glib2 mingw64-gmp mingw64-SDL mingw64-pkg-config \
- mingw64-gtk2 mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtasn1 \
+ mingw64-pixman mingw64-glib2 mingw64-gmp mingw64-SDL2 mingw64-pkg-config \
+ mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtasn1 \
mingw64-libjpeg-turbo mingw64-libpng mingw64-curl mingw64-libssh2 \
mingw64-bzip2
ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3
diff --git a/tests/docker/test-mingw b/tests/docker/test-mingw
index 503a6bc6f7..7cca7e16a6 100755
--- a/tests/docker/test-mingw
+++ b/tests/docker/test-mingw
@@ -28,8 +28,8 @@ for prefix in x86_64-w64-mingw32- i686-w64-mingw32-; do
--enable-vnc \
--enable-bzip2 \
--enable-guest-agent \
- --with-sdlabi=1.2 \
- --with-gtkabi=2.0
+ --with-sdlabi=2.0 \
+ --with-gtkabi=3.0
install_qemu
make clean
--
2.17.0
next prev parent reply other threads:[~2018-06-05 16:08 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-05 16:05 [Qemu-devel] [PULL 0/6] Some docker updates Alex Bennée
2018-06-05 16:05 ` [Qemu-devel] [PULL 1/6] docker: add "probe" command for configure Alex Bennée
2018-06-05 16:05 ` [Qemu-devel] [PULL 2/6] configure: add test for docker availability Alex Bennée
2018-06-05 16:05 ` [Qemu-devel] [PULL 3/6] Makefile: Rename TARGET_DIRS to TARGET_LIST Alex Bennée
2018-06-28 16:11 ` Paolo Bonzini
2018-06-28 16:27 ` Alex Bennée
2018-06-29 12:06 ` Alex Bennée
2018-06-05 16:05 ` [Qemu-devel] [PULL 4/6] docker: Add fedora-i386-cross image Alex Bennée
2018-06-05 16:05 ` Alex Bennée [this message]
2018-06-05 16:05 ` [Qemu-devel] [PULL 6/6] docker: add debian/tricore image Alex Bennée
2018-06-07 7:59 ` [Qemu-devel] [PULL 0/6] Some docker 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=20180605160541.10664-6-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=berrange@redhat.com \
--cc=f4bug@amsat.org \
--cc=famz@redhat.com \
--cc=pbonzini@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).