From 1579c4c564df77158b6301e68dbd69d80a17a042 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Sat, 15 Aug 2009 20:51:30 +0000
Subject: Update to 0.15.20:

        - A new test program for compositing operators [Siarhei Siamashka]

        - Bugs and performance fixes [Benjamin Otte, Chris Wilson,
          Andre Tupinamba, Soren Sandmann]
---
 x11/pixman/Makefile         |  4 ++--
 x11/pixman/distinfo         | 10 +++++-----
 x11/pixman/patches/patch-ac | 20 ++++++++++++--------
 3 files changed, 19 insertions(+), 15 deletions(-)

(limited to 'x11')

diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index 33c4f664dba..6c57f9707c2 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2009/07/22 12:37:16 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2009/08/15 20:51:30 wiz Exp $
 #
 
-DISTNAME=	pixman-0.15.18
+DISTNAME=	pixman-0.15.20
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo
index 5073f6ebc7f..52e9c0877ca 100644
--- a/x11/pixman/distinfo
+++ b/x11/pixman/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.31 2009/07/22 12:37:16 wiz Exp $
+$NetBSD: distinfo,v 1.32 2009/08/15 20:51:30 wiz Exp $
 
-SHA1 (pixman-0.15.18.tar.bz2) = 30d953ff32338740dfdba8764f4cc8545b96d370
-RMD160 (pixman-0.15.18.tar.bz2) = f2aa711db7154faafd85d9567686ab77fb36a955
-Size (pixman-0.15.18.tar.bz2) = 392185 bytes
+SHA1 (pixman-0.15.20.tar.bz2) = 67a34a1fdc5431c9de5febd390057bdd9bb51df4
+RMD160 (pixman-0.15.20.tar.bz2) = 95047e078ce8dfe47ff9e2ea50d587fcebbb2751
+Size (pixman-0.15.20.tar.bz2) = 393424 bytes
 SHA1 (patch-aa) = 94e9fe38d2de8cfe75433b486bbbaf0536c48212
 SHA1 (patch-ab) = 422f2c0f3450da01c11a4005473945291421d41f
-SHA1 (patch-ac) = 8160f8131c81c0a5703816e3824611a217adee2b
+SHA1 (patch-ac) = c47ccb5120e09e140250207fadfb4ce7e1b49c85
 SHA1 (patch-ad) = b2fa221652bc5f8bec000e071417b0180816a451
 SHA1 (patch-ae) = a15fc3bdce0cf3efe19e1bd43c18e97fba8831f4
diff --git a/x11/pixman/patches/patch-ac b/x11/pixman/patches/patch-ac
index ac7232f4960..e75e3c877d4 100644
--- a/x11/pixman/patches/patch-ac
+++ b/x11/pixman/patches/patch-ac
@@ -1,6 +1,9 @@
-$NetBSD: patch-ac,v 1.10 2009/07/22 12:37:17 wiz Exp $
+$NetBSD: patch-ac,v 1.11 2009/08/15 20:51:30 wiz Exp $
 
---- test/Makefile.in.orig	2009-07-21 11:18:53.000000000 +0000
+blitters-test disabled because of
+https://bugs.freedesktop.org/show_bug.cgi?id=23331
+
+--- test/Makefile.in.orig	2009-08-11 17:54:00.000000000 +0000
 +++ test/Makefile.in
 @@ -57,7 +57,7 @@ CONFIG_CLEAN_FILES =
  @HAVE_GTK_TRUE@	composite-test$(EXEEXT) gradient-test$(EXEEXT) \
@@ -8,15 +11,16 @@ $NetBSD: patch-ac,v 1.10 2009/07/22 12:37:17 wiz Exp $
  @HAVE_GTK_TRUE@	convolution-test$(EXEEXT) trap-test$(EXEEXT)
 -am__EXEEXT_2 = region-test$(EXEEXT) scaling-test$(EXEEXT) \
 +am__EXEEXT_2 = region-test$(EXEEXT) \
- 	fetch-test$(EXEEXT) oob-test$(EXEEXT) window-test$(EXEEXT) \
- 	trap-crasher$(EXEEXT) $(am__EXEEXT_1)
+-	blitters-test$(EXEEXT) fetch-test$(EXEEXT) oob-test$(EXEEXT) \
++	fetch-test$(EXEEXT) oob-test$(EXEEXT) \
+ 	window-test$(EXEEXT) trap-crasher$(EXEEXT) $(am__EXEEXT_1)
  PROGRAMS = $(noinst_PROGRAMS)
-@@ -279,7 +279,7 @@ top_srcdir = @top_srcdir@
+@@ -282,7 +282,7 @@ top_srcdir = @top_srcdir@
  TEST_LDADD = $(top_builddir)/pixman/libpixman-1.la
  INCLUDES = -I$(top_srcdir)/pixman -I$(top_builddir)/pixman \
  	$(am__append_2)
--TESTPROGRAMS = region-test scaling-test fetch-test oob-test \
-+TESTPROGRAMS = region-test fetch-test oob-test \
- 	window-test trap-crasher $(am__append_1)
+-TESTPROGRAMS = region-test scaling-test blitters-test fetch-test \
++TESTPROGRAMS = region-test fetch-test \
+ 	oob-test window-test trap-crasher $(am__append_1)
  fetch_test_LDADD = $(TEST_LDADD)
  region_test_LDADD = $(TEST_LDADD)
-- 
cgit v1.2.3