update to 0.22.2

changes:
-New r8g8b8a8 and r8g8b8x8 image formats
-better support for compositing triangles and trapezoids
-performance improvements
-bugfixes

3 files changed, 15 insertions, 15 deletions

diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index ca23847d02c..cfff7998849 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2011/02/28 14:53:08 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2011/07/11 10:50:58 drochner Exp $
 #
 
-DISTNAME=	pixman-0.20.2
+DISTNAME=	pixman-0.22.2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo
index 25290752e7d..faf1918129e 100644
--- a/x11/pixman/distinfo
+++ b/x11/pixman/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.41 2011/01/26 19:25:55 drochner Exp $
+$NetBSD: distinfo,v 1.42 2011/07/11 10:50:58 drochner Exp $
 
-SHA1 (pixman-0.20.2.tar.bz2) = 9972c8f8ce484f7649d9f588168cd29f61c05c63
-RMD160 (pixman-0.20.2.tar.bz2) = f1a2ef1252e97a8948c8e5cf991c3978fa597619
-Size (pixman-0.20.2.tar.bz2) = 446620 bytes
+SHA1 (pixman-0.22.2.tar.bz2) = ad2b828ce4280472f5933d8bb5f0f4d583aed7f3
+RMD160 (pixman-0.22.2.tar.bz2) = 13dbab02962cf45995aaebde4ec9a952ca8e6e76
+Size (pixman-0.22.2.tar.bz2) = 461319 bytes
 SHA1 (patch-aa) = 019368315a48e7f928a0d85c340da7a5131504ec
 SHA1 (patch-ab) = dd31ac6ff6dffb5a29b9d2ac372be55900e773f6
 SHA1 (patch-ad) = 2841fb543df1a180a263a770d1934924a4648d8d
-SHA1 (patch-ae) = c7160ea920a67b2f77f83ddbcebebfe06a3e67e9
+SHA1 (patch-ae) = 3bec7a866692b06fd2d9a1376d36277b2d618e14
 SHA1 (patch-af) = 53b87f118c8f287449a1a99cad1eb90d9cee1b42
diff --git a/x11/pixman/patches/patch-ae b/x11/pixman/patches/patch-ae
index 8856b956091..933ee33fd38 100644
--- a/x11/pixman/patches/patch-ae
+++ b/x11/pixman/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.12 2011/01/26 19:25:55 drochner Exp $
+$NetBSD: patch-ae,v 1.13 2011/07/11 10:50:58 drochner Exp $
 
---- configure.orig	2011-01-19 13:22:54.000000000 +0000
+--- configure.orig	2011-07-04 20:24:41.000000000 +0000
 +++ configure
-@@ -11366,7 +11366,7 @@ fi
+@@ -21325,7 +21325,7 @@ fi
  # if we're using Sun Studio and neither the user nor a config.site
  # has set CFLAGS.
  if test $SUNCC = yes &&			\
@@ -11,19 +11,19 @@ $NetBSD: patch-ae,v 1.12 2011/01/26 19:25:55 drochner Exp $
     test "$CFLAGS" = "-g"
  then
    CFLAGS="-O -g"
-@@ -11677,6 +11677,7 @@ fi
+@@ -21767,6 +21767,7 @@ fi
  
  
  
 +if false; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fvisibility=hidden" >&5
+ 	{ $as_echo "$as_me:$LINENO: checking whether the compiler supports -fvisibility=hidden" >&5
  $as_echo_n "checking whether the compiler supports -fvisibility=hidden... " >&6; }
  		save_CFLAGS="$CFLAGS"
-@@ -11727,6 +11728,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -21841,6 +21842,7 @@ rm -f core conftest.err conftest.$ac_obj
  	fi
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_yesno" >&5
+ 	{ $as_echo "$as_me:$LINENO: result: $_yesno" >&5
  $as_echo "$_yesno" >&6; }
 +fi
  
  
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -xldscope=hidden" >&5
+ 	{ $as_echo "$as_me:$LINENO: checking whether the compiler supports -xldscope=hidden" >&5