From 0baffc3fd7244d9301cdc51175b214abeccab454 Mon Sep 17 00:00:00 2001
From: mrg <mrg@NetBSD.org>
Date: Wed, 5 Jun 2013 09:04:16 +0000
Subject: [PATCH] add new files for pixman 0.30.0.  bump minor.

---
 external/mit/xorg/lib/pixman/Makefile      | 16 ++++++++++------
 external/mit/xorg/lib/pixman/shlib_version |  4 ++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/external/mit/xorg/lib/pixman/Makefile b/external/mit/xorg/lib/pixman/Makefile
index b755421616bc..038cb82eb189 100644
--- a/external/mit/xorg/lib/pixman/Makefile
+++ b/external/mit/xorg/lib/pixman/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.23 2013/05/07 07:01:37 martin Exp $
+#	$NetBSD: Makefile,v 1.24 2013/06/05 09:04:16 mrg Exp $
 
 NOLINT=	1	# defined
 
@@ -17,13 +17,10 @@ SRCS=					\
 	pixman-combine32.c		\
 	pixman-combine-float.c		\
 	pixman-conical-gradient.c	\
-	pixman-x86.c			\
-	pixman-mips.c			\
-	pixman-arm.c			\
-	pixman-ppc.c			\
 	pixman-edge.c			\
 	pixman-edge-accessors.c		\
 	pixman-fast-path.c		\
+	pixman-filter.c			\
 	pixman-glyph.c			\
 	pixman-general.c		\
 	pixman-gradient-walker.c	\
@@ -40,6 +37,12 @@ SRCS=					\
 	pixman-trap.c			\
 	pixman-utils.c
 
+SRCS+=					\
+	pixman-x86.c			\
+	pixman-mips.c			\
+	pixman-arm.c			\
+	pixman-ppc.c			\
+
 # XXX
 
 .if ${MACHINE_ARCH} == "i386"
@@ -65,7 +68,8 @@ MKDEPFLAGS+=		-maltivec
 .if ${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmhf"
 # ARM SIMD
 SRCS+=		pixman-arm-simd.c 		\
-		pixman-arm-simd-asm.S
+		pixman-arm-simd-asm.S		\
+		pixman-arm-simd-asm-scaled.S
 CPPFLAGS+=	-DUSE_ARM_SIMD
 # ARM NEON
 SRCS+=		pixman-arm-neon.c		\
diff --git a/external/mit/xorg/lib/pixman/shlib_version b/external/mit/xorg/lib/pixman/shlib_version
index 3d4b79c612fc..8c98a3bda853 100644
--- a/external/mit/xorg/lib/pixman/shlib_version
+++ b/external/mit/xorg/lib/pixman/shlib_version
@@ -1,4 +1,4 @@
-#	$NetBSD: shlib_version,v 1.5 2010/05/23 04:26:19 mrg Exp $
+#	$NetBSD: shlib_version,v 1.6 2013/06/05 09:04:16 mrg Exp $
 #
 major=2
-minor=1
+minor=2