qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PATCH 2/5] Revert "pixman: require 0.18.4 or newer"
Date: Fri, 14 Dec 2012 08:54:22 +0100	[thread overview]
Message-ID: <1355471665-23903-3-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1355471665-23903-1-git-send-email-kraxel@redhat.com>

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 <kraxel@redhat.com>
---
 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

  parent reply	other threads:[~2012-12-14  7:54 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-14  7:54 [Qemu-devel] [PATCH 0/5] pixman patch queue Gerd Hoffmann
2012-12-14  7:54 ` [Qemu-devel] [PATCH 1/5] pixman: fix version check for PIXMAN_TYPE_BGRA Gerd Hoffmann
2012-12-14  7:54 ` Gerd Hoffmann [this message]
2012-12-14  7:54 ` [Qemu-devel] [PATCH 3/5] pixman: update internal copy to pixman-0.28.2 Gerd Hoffmann
2012-12-14  7:54 ` [Qemu-devel] [PATCH 4/5] pixman: fix vnc tight png/jpeg support Gerd Hoffmann
2012-12-14  7:54 ` [Qemu-devel] [PATCH 5/5] console: clip update rectangle Gerd Hoffmann
2012-12-14 17:31 ` [Qemu-devel] [PATCH 0/5] pixman patch queue Stefan Weil
2012-12-15  9:04 ` Blue Swirl

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1355471665-23903-3-git-send-email-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).