update to 0.20.2

changes:
-Gradient improvements
-Performance improvements
-bugfixes

7 files changed, 58 insertions, 55 deletions

diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index d3e683764fb..b19fea73dce 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/08/17 09:28:30 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2011/01/26 19:25:55 drochner Exp $
 #
 
-DISTNAME=	pixman-0.18.4
+DISTNAME=	pixman-0.20.2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo
index 2dce616bfd8..25290752e7d 100644
--- a/x11/pixman/distinfo
+++ b/x11/pixman/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.40 2010/08/17 09:28:30 wiz Exp $
+$NetBSD: distinfo,v 1.41 2011/01/26 19:25:55 drochner Exp $
 
-SHA1 (pixman-0.18.4.tar.bz2) = 011b00fb33d6e5021a680bcc74f600f44d709d8d
-RMD160 (pixman-0.18.4.tar.bz2) = c30b9069de50efb622c20e607fbeb11a42d9c45e
-Size (pixman-0.18.4.tar.bz2) = 421626 bytes
-SHA1 (patch-aa) = d677fc21632e0e34c65681210ed6c2666e639634
-SHA1 (patch-ab) = 94c677d142edb43a61b0aff78f85cbc4448dc221
-SHA1 (patch-ad) = b2fa221652bc5f8bec000e071417b0180816a451
-SHA1 (patch-ae) = e1857a415770b4f3c8ac7d4caeef1603472c235a
-SHA1 (patch-af) = e021d2c97e8c3ff69f832ae92d2ec1999a864193
+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 (patch-aa) = 019368315a48e7f928a0d85c340da7a5131504ec
+SHA1 (patch-ab) = dd31ac6ff6dffb5a29b9d2ac372be55900e773f6
+SHA1 (patch-ad) = 2841fb543df1a180a263a770d1934924a4648d8d
+SHA1 (patch-ae) = c7160ea920a67b2f77f83ddbcebebfe06a3e67e9
+SHA1 (patch-af) = 53b87f118c8f287449a1a99cad1eb90d9cee1b42
diff --git a/x11/pixman/patches/patch-aa b/x11/pixman/patches/patch-aa
index b9e0f487ff9..d2f0acf949a 100644
--- a/x11/pixman/patches/patch-aa
+++ b/x11/pixman/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.11 2010/06/16 16:35:57 drochner Exp $
+$NetBSD: patch-aa,v 1.12 2011/01/26 19:25:55 drochner Exp $
 
---- pixman/Makefile.am.orig	2010-05-12 20:13:49.000000000 +0000
+--- pixman/Makefile.am.orig	2011-01-19 12:13:01.000000000 +0000
 +++ pixman/Makefile.am
 @@ -1,5 +1,5 @@
  lib_LTLIBRARIES = libpixman-1.la
 -libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -no-undefined @PTHREAD_LDFLAGS@ 
 +libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -no-undefined @PTHREAD_LDFLAGS@ -export-symbols $(PIXMAN_SYMFILE)
- libpixman_1_la_LIBADD = @DEP_LIBS@ -lm
+ libpixman_1_la_LIBADD = @PTHREAD_LIBS@ @DEP_LIBS@ -lm
  libpixman_1_la_SOURCES =			\
  	pixman.h				\
diff --git a/x11/pixman/patches/patch-ab b/x11/pixman/patches/patch-ab
index 9602de0cfc9..0597def89af 100644
--- a/x11/pixman/patches/patch-ab
+++ b/x11/pixman/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.11 2010/06/16 16:35:57 drochner Exp $
+$NetBSD: patch-ab,v 1.12 2011/01/26 19:25:55 drochner Exp $
 
---- pixman/Makefile.in.orig	2010-05-12 20:26:22.000000000 +0000
+--- pixman/Makefile.in.orig	2011-01-19 13:22:55.000000000 +0000
 +++ pixman/Makefile.in
-@@ -355,7 +355,7 @@ top_srcdir = @top_srcdir@
+@@ -358,7 +358,7 @@ top_srcdir = @top_srcdir@
  lib_LTLIBRARIES = libpixman-1.la
  libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) \
  	-no-undefined @PTHREAD_LDFLAGS@ $(am__append_2) \
 -	$(am__append_7)
 +	$(am__append_7) -export-symbols $(PIXMAN_SYMFILE)
- libpixman_1_la_LIBADD = @DEP_LIBS@ -lm $(am__append_3) $(am__append_5) \
- 	$(am__append_8) $(am__append_10) $(am__append_12)
- libpixman_1_la_SOURCES = \
+ libpixman_1_la_LIBADD = @PTHREAD_LIBS@ @DEP_LIBS@ -lm $(am__append_3) \
+ 	$(am__append_5) $(am__append_8) $(am__append_10) \
+ 	$(am__append_12)
diff --git a/x11/pixman/patches/patch-ad b/x11/pixman/patches/patch-ad
index f3277e0f640..7e9ef31f708 100644
--- a/x11/pixman/patches/patch-ad
+++ b/x11/pixman/patches/patch-ad
@@ -1,26 +1,29 @@
-$NetBSD: patch-ad,v 1.4 2008/09/06 20:09:16 bjs Exp $
+$NetBSD: patch-ad,v 1.5 2011/01/26 19:25:55 drochner Exp $
 
---- configure.ac.orig	2008-09-06 06:06:45.000000000 -0400
+--- configure.ac.orig	2011-01-19 13:22:31.000000000 +0000
 +++ configure.ac
-@@ -109,14 +109,14 @@ dnl ====================================
+@@ -246,15 +246,15 @@ AC_SUBST(OPENMP_CFLAGS)
+ dnl =========================================================================
  dnl -fvisibility stuff
  
- have_gcc4=no
--AC_MSG_CHECKING(for -fvisibility)
--AC_COMPILE_IFELSE([
+-PIXMAN_CHECK_CFLAG([-fvisibility=hidden], [dnl
 -#if defined(__GNUC__) && (__GNUC__ >= 4)
+-#ifdef _WIN32
+-#error Have -fvisibility but it is ignored and generates a warning
+-#endif
 -#else
 -error Need GCC 4.0 for visibility
 -#endif
-+dnl AC_MSG_CHECKING(for -fvisibility)
-+dnl AC_COMPILE_IFELSE([
+-])
++dnl PIXMAN_CHECK_CFLAG([-fvisibility=hidden], [dnl
 +dnl #if defined(__GNUC__) && (__GNUC__ >= 4)
++dnl #ifdef _WIN32
++dnl #error Have -fvisibility but it is ignored and generates a warning
++dnl #endif
 +dnl #else
 +dnl error Need GCC 4.0 for visibility
 +dnl #endif
- int main () { return 0; } 
--], have_gcc4=yes)
-+dnl ], have_gcc4=yes)
++dnl ])
  
- if test "x$have_gcc4" = "xyes"; then
-    CFLAGS="$CFLAGS -fvisibility=hidden"
+ PIXMAN_CHECK_CFLAG([-xldscope=hidden], [dnl
+ #if defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
diff --git a/x11/pixman/patches/patch-ae b/x11/pixman/patches/patch-ae
index 63704f8ad57..8856b956091 100644
--- a/x11/pixman/patches/patch-ae
+++ b/x11/pixman/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.11 2010/06/16 16:35:57 drochner Exp $
+$NetBSD: patch-ae,v 1.12 2011/01/26 19:25:55 drochner Exp $
 
---- configure.orig	2010-05-12 20:26:22.000000000 +0000
+--- configure.orig	2011-01-19 13:22:54.000000000 +0000
 +++ configure
-@@ -11070,7 +11070,7 @@ fi
+@@ -11366,7 +11366,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.11 2010/06/16 16:35:57 drochner Exp $
     test "$CFLAGS" = "-g"
  then
    CFLAGS="-O -g"
-@@ -11161,6 +11161,7 @@ fi
+@@ -11677,6 +11677,7 @@ fi
+ 
  
  
- have_gcc4=no
 +if false; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fvisibility" >&5
- $as_echo_n "checking for -fvisibility... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -11177,6 +11178,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
-   have_gcc4=yes
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 	{ $as_echo "$as_me:${as_lineno-$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
+ 	fi
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_yesno" >&5
+ $as_echo "$_yesno" >&6; }
 +fi
  
- if test "x$have_gcc4" = "xyes"; then
-    CFLAGS="$CFLAGS -fvisibility=hidden"
+ 
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -xldscope=hidden" >&5
diff --git a/x11/pixman/patches/patch-af b/x11/pixman/patches/patch-af
index 4cc0c593e47..35117097b82 100644
--- a/x11/pixman/patches/patch-af
+++ b/x11/pixman/patches/patch-af
@@ -1,17 +1,17 @@
-$NetBSD: patch-af,v 1.8 2010/06/16 16:35:57 drochner Exp $
+$NetBSD: patch-af,v 1.9 2011/01/26 19:25:55 drochner Exp $
 
---- pixman/pixman-compiler.h.orig	2010-05-12 20:15:42.000000000 +0000
+--- pixman/pixman-compiler.h.orig	2011-01-19 13:05:40.000000000 +0000
 +++ pixman/pixman-compiler.h
-@@ -70,7 +70,7 @@
- #endif
+@@ -82,7 +82,7 @@
+ #   define PIXMAN_GET_THREAD_LOCAL(name)				\
+     (&name)
  
- /* TLS */
--#if defined(TOOLCHAIN_SUPPORTS__THREAD)
-+#if defined(TOOLCHAIN_SUPPORTS__THREAD) && !defined(__NetBSD__)
+-#elif defined(TOOLCHAIN_SUPPORTS__THREAD)
++#elif defined(TOOLCHAIN_SUPPORTS__THREAD) && !defined(__NetBSD__)
  
  #   define PIXMAN_DEFINE_THREAD_LOCAL(type, name)			\
      static __thread type name
-@@ -149,7 +149,7 @@ extern __stdcall int ReleaseMutex (void 
+@@ -149,7 +149,7 @@
  #   define PIXMAN_GET_THREAD_LOCAL(name)				\
      (&name)