From patchwork Fri Dec 14 07:54:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 206363 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3D0D92C008C for ; Fri, 14 Dec 2012 18:54:50 +1100 (EST) Received: from localhost ([::1]:39488 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TjQ6a-0006nL-AZ for incoming@patchwork.ozlabs.org; Fri, 14 Dec 2012 02:54:48 -0500 Received: from eggs.gnu.org ([208.118.235.92]:34555) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TjQ6G-0006eT-Up for qemu-devel@nongnu.org; Fri, 14 Dec 2012 02:54:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TjQ6F-0005oI-PT for qemu-devel@nongnu.org; Fri, 14 Dec 2012 02:54:28 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47056) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TjQ6F-0005o2-IO for qemu-devel@nongnu.org; Fri, 14 Dec 2012 02:54:27 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qBE7sQ0M013105 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 14 Dec 2012 02:54:27 -0500 Received: from rincewind.home.kraxel.org (ovpn-116-27.ams2.redhat.com [10.36.116.27]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qBE7sQN3029390; Fri, 14 Dec 2012 02:54:26 -0500 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id AE7BA40390; Fri, 14 Dec 2012 08:54:25 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 14 Dec 2012 08:54:22 +0100 Message-Id: <1355471665-23903-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1355471665-23903-1-git-send-email-kraxel@redhat.com> References: <1355471665-23903-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 2/5] Revert "pixman: require 0.18.4 or newer" 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 This reverts commit 288fa40736e6eb63132d01aa6dc21ee831b796ae. The only reason old pixman versions didn't work was the missing PIXMAN_TYPE_BGRA, which is properly #ifdef'ed now. So we don't have to require a minimum pixman version. Conflicts: configure Signed-off-by: Gerd Hoffmann --- configure | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 38b1cc6..ecdb33a 100755 --- a/configure +++ b/configure @@ -2127,7 +2127,7 @@ fi # pixman support probe if test "$pixman" = ""; then - if $pkg_config --atleast-version=0.18.4 pixman-1 > /dev/null 2>&1; then + if $pkg_config pixman-1 > /dev/null 2>&1; then pixman="system" else pixman="internal" @@ -2138,7 +2138,7 @@ if test "$pixman" = "system"; then pixman_libs=`$pkg_config --libs pixman-1 2>/dev/null` else if test ! -d ${source_path}/pixman/pixman; then - echo "ERROR: pixman not present (or older than 0.18.4). Your options:" + echo "ERROR: pixman not present. Your options:" echo " (1) Preferred: Install the pixman devel package (any recent" echo " distro should have packages as Xorg needs pixman too)." echo " (2) Fetch the pixman submodule, using:"