From patchwork Mon Sep 15 03:41:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hu Tao X-Patchwork-Id: 389194 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 6A95C1400B6 for ; Mon, 15 Sep 2014 13:45:34 +1000 (EST) Received: from localhost ([::1]:57077 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XTNEK-0002qM-MF for incoming@patchwork.ozlabs.org; Sun, 14 Sep 2014 23:45:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38527) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XTNCo-0000OL-KS for qemu-devel@nongnu.org; Sun, 14 Sep 2014 23:44:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XTNCg-00020z-B9 for qemu-devel@nongnu.org; Sun, 14 Sep 2014 23:43:58 -0400 Received: from [59.151.112.132] (port=51568 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XTNCf-00020e-W1 for qemu-devel@nongnu.org; Sun, 14 Sep 2014 23:43:50 -0400 X-IronPort-AV: E=Sophos;i="5.04,524,1406563200"; d="scan'208";a="35945451" Received: from localhost (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 15 Sep 2014 11:40:49 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id s8F3hucL017848; Mon, 15 Sep 2014 11:43:56 +0800 Received: from G08FNSTD100614.fnst.cn.fujitsu.com (10.167.226.102) by G08CNEXCHPEKD03.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Mon, 15 Sep 2014 11:43:48 +0800 From: Hu Tao To: Date: Mon, 15 Sep 2014 11:41:10 +0800 Message-ID: <5876221dfda224b2ac2ccab452d0b175e956e255.1410751970.git.hutao@cn.fujitsu.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.167.226.102] X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Cc: Peter Maydell , Gerd Hoffmann , Andreas Gustafsson Subject: [Qemu-devel] [PATCH v2 2/2] configure: check for pixman-1 version X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org commit a93a3af9 introduces use of PIXMAN_TYPE_RGBA, but it's only available in pixman >= 0.21.8. If pixman doesn't meet the version requirement, qemu will fail to build with following message: qemu/ui/qemu-pixman.c: In function ‘qemu_pixelformat_from_pixman’: qemu/ui/qemu-pixman.c:42: error: ‘PIXMAN_TYPE_RGBA’ undeclared (first use in this function) qemu/ui/qemu-pixman.c:42: error: (Each undeclared identifier is reported only once qemu/ui/qemu-pixman.c:42: error: for each function it appears in.) This patch fixes the problem by checking the pixman version. Signed-off-by: Hu Tao --- configure | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 961bf6f..1a9daa5 100755 --- a/configure +++ b/configure @@ -2737,7 +2737,7 @@ fi if test "$pixman" = ""; then if test "$want_tools" = "no" -a "$softmmu" = "no"; then pixman="none" - elif $pkg_config pixman-1 > /dev/null 2>&1; then + elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; then pixman="system" else pixman="internal" @@ -2753,11 +2753,12 @@ if test "$pixman" = "none"; then pixman_cflags= pixman_libs= elif test "$pixman" = "system"; then + # pixman version has been checked above pixman_cflags=`$pkg_config --cflags pixman-1` pixman_libs=`$pkg_config --libs pixman-1` else if test ! -d ${source_path}/pixman/pixman; then - error_exit "pixman not present. Your options:" \ + error_exit "pixman >= 0.21.8 not present. Your options:" \ " (1) Preferred: Install the pixman devel package (any recent" \ " distro should have packages as Xorg needs pixman too)." \ " (2) Fetch the pixman submodule, using:" \