From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: Gerd Hoffmann 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> Subject: [Qemu-devel] [PATCH 2/5] Revert "pixman: require 0.18.4 or newer" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann 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:" -- 1.7.1