From 44fe652640c193572d06de010f54294f971f989c Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Wed, 30 Jan 2013 10:21:22 +0000
Subject: Update to 0.28.2:

0.28.2:

This stable release in the 0.28 series contains fixes for 64 bit
Windows, clang, and PowerPC on MacOS and OpenBSD.

0.28.0:
A new major release 0.28.0 of the pixman rendering library is now
available. Highlights of this release:

  * Support for sRGB coded images [Antti Lankila]

  * New API for fast glyph rendering [Soren Sandmann]

  * Faster bilinear scaling on iwMMX, Loongson and MMX [Matt Turner]

  * More fast paths in the MIPS DSPr2 backend [Nemanja Lukic]

  * Faster scaling in general and on SSE2 in particular [Siarhei
    Siamashka]
---
 x11/pixman/Makefile         |  5 ++---
 x11/pixman/distinfo         | 12 ++++++------
 x11/pixman/patches/patch-bc | 14 +++++++-------
 x11/pixman/patches/patch-bd |  8 ++++----
 4 files changed, 19 insertions(+), 20 deletions(-)

(limited to 'x11/pixman')

diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index fa2f84023ee..3e787f5a103 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.50 2012/10/29 05:06:43 asau Exp $
+# $NetBSD: Makefile,v 1.51 2013/01/30 10:21:22 wiz Exp $
 
-DISTNAME=	pixman-0.26.2
-PKGREVISION=	1
+DISTNAME=	pixman-0.28.2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo
index aa963b8c83d..0efabce82fe 100644
--- a/x11/pixman/distinfo
+++ b/x11/pixman/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.47 2012/07/14 20:57:59 wiz Exp $
+$NetBSD: distinfo,v 1.48 2013/01/30 10:21:22 wiz Exp $
 
-SHA1 (pixman-0.26.2.tar.bz2) = 1daf014714cc29147726abada12359345d156705
-RMD160 (pixman-0.26.2.tar.bz2) = a799dc2cf6f526c2f59e810e3b9a1c73df55fc2d
-Size (pixman-0.26.2.tar.bz2) = 622398 bytes
+SHA1 (pixman-0.28.2.tar.bz2) = 9e9ede6e13061030f9c827219cb87f47e32ecdb4
+RMD160 (pixman-0.28.2.tar.bz2) = 05f7b1d7369f5d878142330f3a7cdab967a0d79d
+Size (pixman-0.28.2.tar.bz2) = 625655 bytes
 SHA1 (patch-af) = 660feebae10eccebc62cde85b05ae0042834d398
 SHA1 (patch-ba) = 9bd8a7fd0cfbd280df06d69838d3d10ab1b51e23
 SHA1 (patch-bb) = bf9a4725e5dc20af7cafbedd212f6e2e2d78fa71
-SHA1 (patch-bc) = 7e1ba2de0c29a8f89f3549f4b3b8d1dd9e4fbaa5
-SHA1 (patch-bd) = cd2feeedffd78dbcc16b327d346afc0b14c78136
+SHA1 (patch-bc) = 06ddfe91e60acd26d47dd7d7b50db6fc3fcfd4fb
+SHA1 (patch-bd) = 1b1432f4a88d5486afdb4c0cad0808d3748fa522
diff --git a/x11/pixman/patches/patch-bc b/x11/pixman/patches/patch-bc
index 6543b0f28f9..38ba46428ed 100644
--- a/x11/pixman/patches/patch-bc
+++ b/x11/pixman/patches/patch-bc
@@ -1,8 +1,8 @@
-$NetBSD: patch-bc,v 1.2 2012/05/12 17:38:32 wiz Exp $
+$NetBSD: patch-bc,v 1.3 2013/01/30 10:21:22 wiz Exp $
 
---- pixman/pixman.c.orig	2012-01-27 15:45:27.000000000 +0000
+--- pixman/pixman.c.orig	2012-12-10 11:34:13.000000000 +0000
 +++ pixman/pixman.c
-@@ -162,6 +162,57 @@ optimize_operator (pixman_op_t     op,
+@@ -152,6 +152,57 @@ optimize_operator (pixman_op_t     op,
      return operator_table[op].opaque_info[is_dest_opaque | is_source_opaque];
  }
  
@@ -60,7 +60,7 @@ $NetBSD: patch-bc,v 1.2 2012/05/12 17:38:32 wiz Exp $
  /*
   * Computing composite region
   */
-@@ -586,6 +637,13 @@ pixman_image_composite32 (pixman_op_t
+@@ -576,6 +627,13 @@ pixman_image_composite32 (pixman_op_t   
      uint32_t src_flags, mask_flags, dest_flags;
      pixman_region32_t region;
      pixman_box32_t extents;
@@ -74,7 +74,7 @@ $NetBSD: patch-bc,v 1.2 2012/05/12 17:38:32 wiz Exp $
      pixman_implementation_t *imp;
      pixman_composite_func_t func;
  
-@@ -623,6 +681,16 @@ pixman_image_composite32 (pixman_op_t
+@@ -614,6 +672,16 @@ pixman_image_composite32 (pixman_op_t   
  	    src_format = mask_format = PIXMAN_rpixbuf;
      }
  
@@ -90,8 +90,8 @@ $NetBSD: patch-bc,v 1.2 2012/05/12 17:38:32 wiz Exp $
 +
      pixman_region32_init (&region);
  
-     if (!pixman_compute_composite_region32 (
-@@ -716,6 +784,13 @@ pixman_image_composite32 (pixman_op_t
+     if (!_pixman_compute_composite_region32 (
+@@ -707,6 +775,13 @@ pixman_image_composite32 (pixman_op_t   
      }
  
  out:
diff --git a/x11/pixman/patches/patch-bd b/x11/pixman/patches/patch-bd
index 1facbb14c82..10b4ff63bba 100644
--- a/x11/pixman/patches/patch-bd
+++ b/x11/pixman/patches/patch-bd
@@ -1,8 +1,8 @@
-$NetBSD: patch-bd,v 1.1 2011/10/27 16:52:51 drochner Exp $
+$NetBSD: patch-bd,v 1.2 2013/01/30 10:21:22 wiz Exp $
 
---- pixman/pixman.h.orig	2011-07-04 20:22:40.000000000 +0000
+--- pixman/pixman.h.orig	2012-12-10 11:34:13.000000000 +0000
 +++ pixman/pixman.h
-@@ -845,25 +845,19 @@ void          pixman_image_composite32  
+@@ -856,25 +856,19 @@ void          pixman_image_composite32  
  					       int32_t            width,
  					       int32_t            height);
  
@@ -35,4 +35,4 @@ $NetBSD: patch-bd,v 1.1 2011/10/27 16:52:51 drochner Exp $
 +void          pixman_disable_out_of_bounds_workaround (void);
  
  /*
-  * Trapezoids
+  * Glyphs
-- 
cgit v1.2.3