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: 137775 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1149630lji; Tue, 5 Jun 2018 09:11:57 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLjsJoFV+opGM/B3VP+DsNkFW/zIjCu/W0gLWgbCTEpc8FWsc937n9F6nGe5Rj4ve00M/RU X-Received: by 2002:ac8:22a1:: with SMTP id f30-v6mr25412426qta.358.1528215117867; Tue, 05 Jun 2018 09:11:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528215117; cv=none; d=google.com; s=arc-20160816; b=l2ItcZk1PMTj10rJcEi4kNCXH2pa3Y7dkyBFxi9TCTGdT9ZnqQCg3GRMtBzrQMWMUj HE6kEdts9lVllywXsyhURPbewX2tvPspU1ZwSEp3dOpceRzJf36kW4xvdAMJi5f2zYJS QHXru3PjqlkJqEH4b2mHmqw34w5F4yyxowetTnXKvL361zzvgBi6/N+CnOuZBwwU84pV s1AwF+lvFXl0Gz7nlnadUDSJJ0eXNA82myz0YxeIqF3OgYQS8eiWxPQpH3T+7cuhN1Yk 2E14Y1MILsWm5M0QOmfN/TiosdeuLeBygEJmho+wBq/roOoU1A+IG7POLGFHjS7RKK7Z N9jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=gZJdSwuJp6NdScm9/QvDPKdtIjVvPNu1zaSAitr2bmk=; b=F/7/VN0vcxZK+/CdyCk3UI7TXkQKIafxP55DCIe2nvZ1UV7NtMkIV6LrFhWG/uHlmD Mkv4rk0Cax8J8IjIgGptkLHxsE5p4RScs597bkkWQ0KOzk6Akv1aKSWi6ggHFSO4jzCW JhL4XKWgPG/Vg/UKpBI3x1MjAwKDTp5/DwT2xwYNpkV9aiu/p4YEFz3u+xYqXu9hgV5C /mzE5cs+aHQOUYem464ZT+9npTvwSUCnigvqmYytniOiZSzc/gyuS7tH4BNrXXNAa2kr 4T+QoNBirDOol0Uhsa+zTnucnAv1LUxW+9pw+s49ozbb9QRWiXtZRX8OTeYIZvo6HKxJ ZdXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Pr8ngk2H; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id m7-v6si7447362qvo.247.2018.06.05.09.11.57 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 05 Jun 2018 09:11:57 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Pr8ngk2H; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:47886 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQEYv-0003x7-8m for patch@linaro.org; Tue, 05 Jun 2018 12:11:57 -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-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+patch=linaro.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 -- 2.17.0 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