Import pixman-0.9.6. This library provides low-level pixel manipulation

routines, currently used (at least) by xorg-server>=1.4 and cairo>=1.5.
Presently, nothing depends on this library, but probably will soon.
Also, those building their own Xorg servers will need this.

7 files changed, 86 insertions, 0 deletions

diff --git a/x11/pixman/DESCR b/x11/pixman/DESCR
new file mode 100644
index 00000000000..ee8db984a33
--- /dev/null
+++ b/x11/pixman/DESCR
@@ -0,0 +1 @@
+Pixel manipulation library for modular X.org.
diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
new file mode 100644
index 00000000000..29e02306907
--- /dev/null
+++ b/x11/pixman/Makefile
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.1.1.1 2007/11/08 19:51:43 bjs Exp $
+#
+
+DISTNAME=	pixman-0.9.6
+CATEGORIES=	x11
+MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/lib/
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	bjs@NetBSD.org
+HOMEPAGE=	http://xorg.freedesktop.org/
+COMMENT=	Library of low-level pixel manipulation routines
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	pkg-config
+
+PKGCONFIG_OVERRIDE+=	pixman-1.pc.in
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/pixman/PLIST b/x11/pixman/PLIST
new file mode 100644
index 00000000000..5ed928ff386
--- /dev/null
+++ b/x11/pixman/PLIST
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2007/11/08 19:51:43 bjs Exp $
+include/pixman-1/pixman.h
+lib/libpixman-1.la
+lib/pkgconfig/pixman-1.pc
+@dirrm include/pixman-1
diff --git a/x11/pixman/buildlink3.mk b/x11/pixman/buildlink3.mk
new file mode 100644
index 00000000000..dc05a7b0ce8
--- /dev/null
+++ b/x11/pixman/buildlink3.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/11/08 19:51:43 bjs Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+PIXMAN_BUILDLINK3_MK:=	${PIXMAN_BUILDLINK3_MK}+
+
+.if ${BUILDLINK_DEPTH} == "+"
+BUILDLINK_DEPENDS+=	pixman
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npixman}
+BUILDLINK_PACKAGES+=	pixman
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pixman
+
+.if ${PIXMAN_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.pixman+=	pixman>=0.9.6
+BUILDLINK_PKGSRCDIR.pixman?=	../../x11/pixman
+.endif	# PIXMAN_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo
new file mode 100644
index 00000000000..07da3d1be61
--- /dev/null
+++ b/x11/pixman/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1.1.1 2007/11/08 19:51:43 bjs Exp $
+
+SHA1 (pixman-0.9.6.tar.bz2) = d31ea97176e475b47bcc9c0ad4813859857fb061
+RMD160 (pixman-0.9.6.tar.bz2) = 3cde968776ea75ed8efd4b5c126238fd2a9817cb
+Size (pixman-0.9.6.tar.bz2) = 290399 bytes
+SHA1 (patch-aa) = 2ebff1def8deb37e378eaa6c4bafd4e71cfcd4a9
+SHA1 (patch-ab) = 38ebdb75be9fc41e61c0cc594b3a13c6778d2f23
diff --git a/x11/pixman/patches/patch-aa b/x11/pixman/patches/patch-aa
new file mode 100644
index 00000000000..1856da3e8e7
--- /dev/null
+++ b/x11/pixman/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.1.1.1 2007/11/08 19:51:43 bjs Exp $
+
+Not only OpenBSD has <inttypes.h>.
+
+--- pixman/pixman.h.orig	2007-10-24 12:30:17.000000000 -0400
++++ pixman/pixman.h
+@@ -75,7 +75,7 @@ SOFTWARE.
+ #if defined (__SVR4) && defined (__sun)
+ #  include <sys/int_types.h>
+ #  include <stdint.h>
+-#elif defined (__OpenBSD__)
++#elif defined (HAVE_INTTYPES_H)
+ #  include <inttypes.h>
+ #elif defined (_MSC_VER)
+ typedef __int8 int8_t;
diff --git a/x11/pixman/patches/patch-ab b/x11/pixman/patches/patch-ab
new file mode 100644
index 00000000000..6eee20cf1d2
--- /dev/null
+++ b/x11/pixman/patches/patch-ab
@@ -0,0 +1,18 @@
+$NetBSD: patch-ab,v 1.1.1.1 2007/11/08 19:51:43 bjs Exp $
+
+Some platforms (such as NetBSD) have UINT32_MAX without UINT32_MIN.
+This makes sense to me, as what else could be the minimum 
+--- pixman/pixman-private.h.orig	2007-10-24 12:30:17.000000000 -0400
++++ pixman/pixman-private.h
+@@ -48,7 +48,10 @@
+ #endif
+ 
+ #ifndef UINT32_MIN
+-# define UINT32_MIN             (0)
++# define UINT32_MIN             (0) /* XXX What else could this possibly be? */
++#endif
++
++#ifndef  UINT32_MAX
+ # define UINT32_MAX             (4294967295U)
+ #endif
+