From patchwork Tue Jun 5 16:05:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 925545 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="Pr8ngk2H"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 410cJd2rr4z9s01 for ; Wed, 6 Jun 2018 02:12:17 +1000 (AEST) Received: from localhost ([::1]:47886 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQEZD-0003x7-2N for incoming@patchwork.ozlabs.org; Tue, 05 Jun 2018 12:12:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53154) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQEVG-0000vB-Ke for qemu-devel@nongnu.org; Tue, 05 Jun 2018 12:08:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fQESz-0004N3-Eq for qemu-devel@nongnu.org; Tue, 05 Jun 2018 12:08:10 -0400 Received: from mail-wm0-x236.google.com ([2a00:1450:400c:c09::236]:52857) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fQESz-0004MY-3J for qemu-devel@nongnu.org; Tue, 05 Jun 2018 12:05:49 -0400 Received: by mail-wm0-x236.google.com with SMTP id p126-v6so6010396wmb.2 for ; Tue, 05 Jun 2018 09:05:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gZJdSwuJp6NdScm9/QvDPKdtIjVvPNu1zaSAitr2bmk=; b=Pr8ngk2Hy51E+f+BJbaxMPpS/KrQTfZYpJK4HXOsASa4Dh8oCnXEB8ib2BWG/YTUUP GGXQGO56p/jddd4slmW2LLKe0uz+RdqfbDvfoQ/plubT7SvF+YSUFjUKQfflpQpy07J2 9tv3Frw856Uj/vLvaQ/XSiFCx6Xzj7svOJmNY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gZJdSwuJp6NdScm9/QvDPKdtIjVvPNu1zaSAitr2bmk=; b=Epk8wYTGxUjSe1iDwFtWt4E1exgyE6GYYbQwaqqDkHmH2C6pFXCjPT9YVuz6MH2cb0 KrwPKkazLOQ2f8vYi+7zORMiGzM9HA+oV9YDwWdOqWckutY5vlNHX22akF9ntTkDR9Zg 1O/z7/KMnMzDkLH+zUWeJ+XhHIjZkMbq1qKN35tB9C3D0BCV4Lj2XXWjzC3/cbDP81rO pOfhsveWxvLMn5u6zSrrRoOmkqddShgTk7o3AK98WLyZR0Kz2gGD1mBqDL8ta/7WTCqz Ob5/yf8oOyXFUJ0Pvwd4Qys4fdevBMMbeb09Zc2Vrc/BBEfSzLadWL+R/nrbwKtj95rb YwAw== X-Gm-Message-State: APt69E33sSNyMWdI4+COQTLar59ixunmaOLW1hluvILYKwS9fmtZSFvn dYXZmMfrTwB9fCrxlM4/6RwGSA== X-Google-Smtp-Source: ADUXVKKhCftGUDlkH1+MgxcHF6R2gYSv4dVwzqVBKKlefeL0MRMbLhn4yrgtZgaU+FlZ7qTvulOPvg== X-Received: by 2002:a1c:1815:: with SMTP id 21-v6mr4917294wmy.72.1528214748019; Tue, 05 Jun 2018 09:05:48 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u16-v6sm5794594wrq.2.2018.06.05.09.05.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Jun 2018 09:05:43 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 04F5C3E0A0C; Tue, 5 Jun 2018 17:05:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 5 Jun 2018 17:05:40 +0100 Message-Id: <20180605160541.10664-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180605160541.10664-1-alex.bennee@linaro.org> References: <20180605160541.10664-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::236 Subject: [Qemu-devel] [PULL 5/6] docker: test-mingw: use SDL2 and GTK+3 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , qemu-devel@nongnu.org, Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini 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 Reviewed-by: Daniel P. Berrangé [AJB: fix merge conflicts] Signed-off-by: Alex Bennée 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