diff options
-rw-r--r-- | graphics/libpixman/Makefile | 4 | ||||
-rw-r--r-- | graphics/libpixman/buildlink3.mk | 5 | ||||
-rw-r--r-- | graphics/libpixman/distinfo | 8 | ||||
-rw-r--r-- | graphics/libpixman/patches/patch-aa | 22 |
4 files changed, 8 insertions, 31 deletions
diff --git a/graphics/libpixman/Makefile b/graphics/libpixman/Makefile index c2925f79272..c76e753028d 100644 --- a/graphics/libpixman/Makefile +++ b/graphics/libpixman/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2005/02/09 21:24:50 xtraeme Exp $ +# $NetBSD: Makefile,v 1.10 2005/03/27 12:28:08 recht Exp $ # -DISTNAME= libpixman-0.1.3 +DISTNAME= libpixman-0.1.4 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/snapshots/ diff --git a/graphics/libpixman/buildlink3.mk b/graphics/libpixman/buildlink3.mk index 6901dca92fd..162cebf39a9 100644 --- a/graphics/libpixman/buildlink3.mk +++ b/graphics/libpixman/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2004/10/03 00:14:55 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2005/03/27 12:28:08 recht Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBPIXMAN_BUILDLINK3_MK:= ${LIBPIXMAN_BUILDLINK3_MK}+ @@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibpixman} BUILDLINK_PACKAGES+= libpixman .if !empty(LIBPIXMAN_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.libpixman+= libpixman>=0.1.1 -BUILDLINK_RECOMMENDED.libpixman+= libpixman>=0.1.1nb2 +BUILDLINK_DEPENDS.libpixman+= libpixman>=0.1.4 BUILDLINK_PKGSRCDIR.libpixman?= ../../graphics/libpixman .endif # LIBPIXMAN_BUILDLINK3_MK diff --git a/graphics/libpixman/distinfo b/graphics/libpixman/distinfo index 250854a1e5e..e4fba525978 100644 --- a/graphics/libpixman/distinfo +++ b/graphics/libpixman/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.6 2005/02/24 08:45:09 agc Exp $ +$NetBSD: distinfo,v 1.7 2005/03/27 12:28:08 recht Exp $ -SHA1 (libpixman-0.1.3.tar.gz) = eca26dc881227f983022203aafe8e2d4d0bff8ee -RMD160 (libpixman-0.1.3.tar.gz) = 777f0ad9e43428555d4da95bbe19576362675e76 -Size (libpixman-0.1.3.tar.gz) = 371766 bytes +SHA1 (libpixman-0.1.4.tar.gz) = 399d8e1cd3898c324ec2bf8c3fd0b2bbc680bc18 +RMD160 (libpixman-0.1.4.tar.gz) = 2a04690620c5cedc56537d8ed8315f9e5aedd13f +Size (libpixman-0.1.4.tar.gz) = 375226 bytes SHA1 (patch-aa) = 0172ca11ef392df251b84213295b1727e7274366 diff --git a/graphics/libpixman/patches/patch-aa b/graphics/libpixman/patches/patch-aa deleted file mode 100644 index 5bba4f7e80c..00000000000 --- a/graphics/libpixman/patches/patch-aa +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2004/11/15 03:43:46 rh Exp $ ---- src/icimage.c.orig 2004-11-08 11:43:58.000000000 -0500 -+++ src/icimage.c 2004-11-08 11:44:04.000000000 -0500 -@@ -263,10 +263,16 @@ - case CT_NONE: - return; - case CT_PIXMAP: -- pixman_image_destroy (image->clientClip); -+ -+ if (image->clientClip) { -+ pixman_image_destroy (image->clientClip); -+ } -+ - break; - default: -- pixman_region_destroy (image->clientClip); -+ if (image->clientClip) { -+ pixman_image_destroy (image->clientClip); -+ } - break; - } - image->clientClip = NULL; |