[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 5/6] docker: test-mingw: use SDL2 and GTK+3
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 5/6] docker: test-mingw: use SDL2 and GTK+3 |
Date: |
Tue, 5 Jun 2018 17:05:40 +0100 |
From: Paolo Bonzini <address@hidden>
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 <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
[AJB: fix merge conflicts]
Signed-off-by: Alex Bennée <address@hidden>
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
- [Qemu-devel] [PULL 0/6] Some docker updates, Alex Bennée, 2018/06/05
- [Qemu-devel] [PULL 5/6] docker: test-mingw: use SDL2 and GTK+3,
Alex Bennée <=
- [Qemu-devel] [PULL 4/6] docker: Add fedora-i386-cross image, Alex Bennée, 2018/06/05
- [Qemu-devel] [PULL 2/6] configure: add test for docker availability, Alex Bennée, 2018/06/05
- [Qemu-devel] [PULL 1/6] docker: add "probe" command for configure, Alex Bennée, 2018/06/05
- [Qemu-devel] [PULL 6/6] docker: add debian/tricore image, Alex Bennée, 2018/06/05
- [Qemu-devel] [PULL 3/6] Makefile: Rename TARGET_DIRS to TARGET_LIST, Alex Bennée, 2018/06/05
- Re: [Qemu-devel] [PULL 0/6] Some docker updates, Peter Maydell, 2018/06/07