From e54d0d1bf10201ce49186c93b35485f97cd2948d Mon Sep 17 00:00:00 2001 From: adam Date: Sat, 31 Aug 2013 22:19:32 +0000 Subject: Changes 1.12.16: Bug fixes * Set the correct orientation for simple boxes with a negative scale factor. * Fix the creation of the shading dictionary in PDF. * Fix a crash in PDF when incorporating an image with CAIRO_EXTEND_PAD. * Avoid upscaling bitmap fonts if possible. * Fix an assertion failure within the mempool allocator for shared memory. * Fix allocation size for CFF subsets. * Export cairo_matrix_t for GObject bindings. * Fix a double free in the Quartz backend. * Fix origin of GDI StretchBlits for the Windows backend * Fix error propagation for requests to create a similar surface with negative size. * Fix complex clipping of trapezoids with regions * Stop leaking the image data when loading PNGs * Fix unbounded operations with a clip mask through the span compositor * Add missing checks before rendering to a finished surface - so we return an error rather than hit an assert. * Prevent an assertion failure when creating similar GL surfaces larger than supported by hardware. * Prevent a double free of a similar image under Windows. --- graphics/cairo/Makefile | 46 ++++-------------------------------- graphics/cairo/Makefile.common | 53 ++++++++++++++++++++++++++++++++++++++++++ graphics/cairo/PLIST | 12 +++++----- graphics/cairo/buildlink3.mk | 4 +++- graphics/cairo/distinfo | 8 +++---- graphics/cairo/options.mk | 12 ++++------ 6 files changed, 74 insertions(+), 61 deletions(-) create mode 100644 graphics/cairo/Makefile.common (limited to 'graphics/cairo') diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index dfdac8508a5..78933f8e498 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -1,50 +1,12 @@ -# $NetBSD: Makefile,v 1.130 2013/08/18 10:17:14 spz Exp $ +# $NetBSD: Makefile,v 1.131 2013/08/31 22:19:32 adam Exp $ -DISTNAME= cairo-1.12.14 -PKGREVISION= 4 -CATEGORIES= graphics -MASTER_SITES= http://cairographics.org/releases/ -EXTRACT_SUFX= .tar.xz - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://cairographics.org/ -COMMENT= Vector graphics library with cross-device output support -LICENSE= gnu-lgpl-v2.1 AND mpl-1.1 - -USE_LANGUAGES= c99 -USE_LIBTOOL= yes -USE_PKGLOCALEDIR= yes -USE_TOOLS+= pkg-config -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --enable-fc -CONFIGURE_ARGS+= --enable-gl -CONFIGURE_ARGS+= --enable-pdf -CONFIGURE_ARGS+= --enable-ps -CONFIGURE_ARGS+= --enable-tee - -PKGCONFIG_OVERRIDE+= src/cairo.pc.in -PKGCONFIG_OVERRIDE+= src/cairo-features.pc.in - -.include "options.mk" - -.if exists(/System/Library/Frameworks/Carbon.framework) -CONFIGURE_ARGS+= --enable-quartz -CONFIGURE_ARGS+= --enable-quartz-font -CONFIGURE_ARGS+= --enable-quartz-image -PLIST.carbon= yes -.endif - -# For snprintf() and ctime_r() -CPPFLAGS.SunOS+= -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS +.include "../../graphics/cairo/Makefile.common" TEST_TARGET= check -# PR#43928 -.include "../../mk/compiler.mk" -.if ${MACHINE_PLATFORM:MDragonFly-*-x86_64} && ${CC_VERSION:Mgcc-4.1.*} -CONFIGURE_ENV+= ac_cv_type___uint128_t=no -.endif +.include "options.mk" +.include "../../archivers/lzo/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.2.95 .include "../../fonts/fontconfig/buildlink3.mk" diff --git a/graphics/cairo/Makefile.common b/graphics/cairo/Makefile.common new file mode 100644 index 00000000000..3eb3e8ee9b5 --- /dev/null +++ b/graphics/cairo/Makefile.common @@ -0,0 +1,53 @@ +# $NetBSD: Makefile.common,v 1.1 2013/08/31 22:19:32 adam Exp $ +# +# used by graphics/cairo/Makefile +# used by graphics/cairo-gobject/Makefile + +DISTNAME= cairo-1.12.16 +CATEGORIES= graphics +MASTER_SITES= http://cairographics.org/releases/ +EXTRACT_SUFX= .tar.xz + +MAINTAINER?= pkgsrc-users@NetBSD.org +HOMEPAGE= http://cairographics.org/ +COMMENT= Vector graphics library with cross-device output support +LICENSE= gnu-lgpl-v2.1 AND mpl-1.1 + +DISTINFO_FILE= ${.CURDIR}/../../graphics/cairo/distinfo +PATCHDIR= ${.CURDIR}/../../graphics/cairo/patches + +USE_LANGUAGES= c99 +USE_LIBTOOL= yes +USE_PKGLOCALEDIR= yes +USE_TOOLS+= pkg-config +GNU_CONFIGURE= yes +# does not build against NetBSD-5's MesaLib, and is according +# to upstream, only used by "toy applications" +CONFIGURE_ARGS+= --disable-gl +CONFIGURE_ARGS+= --enable-fc +CONFIGURE_ARGS+= --enable-pdf +CONFIGURE_ARGS+= --enable-ps +CONFIGURE_ARGS+= --enable-tee + +PKGCONFIG_OVERRIDE+= src/cairo.pc.in +PKGCONFIG_OVERRIDE+= src/cairo-features.pc.in + +.include "../../mk/bsd.prefs.mk" + +PLIST_VARS+= quartz + +.if ${OPSYS} == "Darwin" +CONFIGURE_ARGS+= --enable-quartz +CONFIGURE_ARGS+= --enable-quartz-font +CONFIGURE_ARGS+= --enable-quartz-image +PLIST.quartz= yes +.endif + +# For snprintf() and ctime_r() +CPPFLAGS.SunOS+= -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS + +# PR#43928 +.include "../../mk/compiler.mk" +.if ${MACHINE_PLATFORM:MDragonFly-*-x86_64} && ${CC_VERSION:Mgcc-4.1.*} +CONFIGURE_ENV+= ac_cv_type___uint128_t=no +.endif diff --git a/graphics/cairo/PLIST b/graphics/cairo/PLIST index d4ad23aebb4..135ba6814aa 100644 --- a/graphics/cairo/PLIST +++ b/graphics/cairo/PLIST @@ -1,12 +1,12 @@ -@comment $NetBSD: PLIST,v 1.33 2012/11/01 08:54:46 wiz Exp $ +@comment $NetBSD: PLIST,v 1.34 2013/08/31 22:19:32 adam Exp $ bin/cairo-trace include/cairo/cairo-deprecated.h include/cairo/cairo-features.h include/cairo/cairo-ft.h include/cairo/cairo-pdf.h include/cairo/cairo-ps.h -${PLIST.carbon}include/cairo/cairo-quartz.h -${PLIST.carbon}include/cairo/cairo-quartz-image.h +${PLIST.quartz}include/cairo/cairo-quartz.h +${PLIST.quartz}include/cairo/cairo-quartz-image.h include/cairo/cairo-script-interpreter.h include/cairo/cairo-script.h include/cairo/cairo-svg.h @@ -25,9 +25,9 @@ lib/pkgconfig/cairo-ft.pc lib/pkgconfig/cairo-pdf.pc lib/pkgconfig/cairo-png.pc lib/pkgconfig/cairo-ps.pc -${PLIST.carbon}lib/pkgconfig/cairo-quartz-font.pc -${PLIST.carbon}lib/pkgconfig/cairo-quartz-image.pc -${PLIST.carbon}lib/pkgconfig/cairo-quartz.pc +${PLIST.quartz}lib/pkgconfig/cairo-quartz-font.pc +${PLIST.quartz}lib/pkgconfig/cairo-quartz-image.pc +${PLIST.quartz}lib/pkgconfig/cairo-quartz.pc lib/pkgconfig/cairo-script.pc lib/pkgconfig/cairo-svg.pc lib/pkgconfig/cairo-tee.pc diff --git a/graphics/cairo/buildlink3.mk b/graphics/cairo/buildlink3.mk index 0a7c7732565..f8e06672e1e 100644 --- a/graphics/cairo/buildlink3.mk +++ b/graphics/cairo/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.49 2013/06/04 22:16:14 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.50 2013/08/31 22:19:32 adam Exp $ BUILDLINK_TREE+= cairo @@ -26,6 +26,8 @@ pkgbase := cairo .include "../../x11/libXrender/buildlink3.mk" .endif +.include "../../archivers/lzo/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo index b1a582e70e1..35707433439 100644 --- a/graphics/cairo/distinfo +++ b/graphics/cairo/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.75 2013/02/12 20:08:29 wiz Exp $ +$NetBSD: distinfo,v 1.76 2013/08/31 22:19:32 adam Exp $ -SHA1 (cairo-1.12.14.tar.xz) = 9106ab09b2e7b9f90521b18dd4a7e9577eba6c15 -RMD160 (cairo-1.12.14.tar.xz) = 8198930d820f91480b69c8736b5b090b1a2e3100 -Size (cairo-1.12.14.tar.xz) = 42132464 bytes +SHA1 (cairo-1.12.16.tar.xz) = 4f6e337d5d3edd7ea79d1426f575331552b003ec +RMD160 (cairo-1.12.16.tar.xz) = 379283c2f5c9690bdfd69c629b8efd59be7a8670 +Size (cairo-1.12.16.tar.xz) = 35889824 bytes SHA1 (patch-aa) = b01bc60f77a7122b0c0d0d9b25ad512bac7c190c SHA1 (patch-ab) = 11f7e0e59bd5c51a8fdacb48dcf2f2fefdf3b768 SHA1 (patch-ac) = 1785bbef6bcab4781bf89e1b986a7eb96e5f2b64 diff --git a/graphics/cairo/options.mk b/graphics/cairo/options.mk index 2ce86421dfd..0ec993c24be 100644 --- a/graphics/cairo/options.mk +++ b/graphics/cairo/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.14 2013/08/18 10:15:36 spz Exp $ +# $NetBSD: options.mk,v 1.15 2013/08/31 22:19:32 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.cairo PKG_SUPPORTED_OPTIONS= x11 xcb @@ -6,7 +6,7 @@ PKG_SUGGESTED_OPTIONS= x11 xcb .include "../../mk/bsd.options.mk" -PLIST_VARS+= carbon x11 xcb +PLIST_VARS+= x11 xcb ### ### X11 and XCB support (XCB implies X11) @@ -14,15 +14,12 @@ PLIST_VARS+= carbon x11 xcb .if !empty(PKG_OPTIONS:Mx11) || !empty(PKG_OPTIONS:Mxcb) CONFIGURE_ARGS+= --enable-xlib CONFIGURE_ARGS+= --enable-xlib-xrender -# does not build against NetBSD-5's MesaLib, and is according -# to upstream, only used by "toy applications" -CONFIGURE_ARGS+= --disable-gl PLIST.x11= yes .include "../../graphics/MesaLib/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" -.include "../../x11/libX11/buildlink3.mk" -BUILDLINK_DEPMETHOD.libXt?= build # only for configure +BUILDLINK_DEPMETHOD.libXt+= build # only for configure .include "../../x11/libXt/buildlink3.mk" . if !empty(PKG_OPTIONS:Mxcb) @@ -34,7 +31,6 @@ CONFIGURE_ARGS+= --enable-xcb=no . endif .else -CONFIGURE_ARGS+= --disable-gl CONFIGURE_ARGS+= --disable-xlib CONFIGURE_ARGS+= --disable-xlib-xrender .endif -- cgit v1.2.3