[pkgsrc/trunk]: pkgsrc/graphics/cairo Make this build on OS X 10.4.x/ppc.

[yyamano <yyamano%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9320442d8fb9
branches:  trunk
changeset: 542144:9320442d8fb9
user:      yyamano <yyamano%pkgsrc.org@localhost>
date:      Mon May 05 06:53:00 2008 +0000

description:
Make this build on OS X 10.4.x/ppc.

diffstat:

 graphics/cairo/distinfo         |   3 ++-
 graphics/cairo/patches/patch-ac |  30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletions(-)

diffs (47 lines):

diff -r 4a423a0e99be -r 9320442d8fb9 graphics/cairo/distinfo
--- a/graphics/cairo/distinfo   Mon May 05 05:25:20 2008 +0000
+++ b/graphics/cairo/distinfo   Mon May 05 06:53:00 2008 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.40 2008/04/21 11:29:33 tnn Exp $
+$NetBSD: distinfo,v 1.41 2008/05/05 06:53:00 yyamano Exp $
 
 SHA1 (cairo-1.6.4.tar.gz) = 9d990fe39a125ceb07221623c237cd7015855d5c
 RMD160 (cairo-1.6.4.tar.gz) = ccae736a40d985b72bda7c2f0a98a0838020658e
 Size (cairo-1.6.4.tar.gz) = 5042623 bytes
 SHA1 (patch-aa) = a6e95dc17dd316236dd7197f5e743c733e57587d
 SHA1 (patch-ab) = 2a0a99846fab962b552efa79c9261927de792dfd
+SHA1 (patch-ac) = 8baca078827ebc7c03eecc14c575a440239c3f03
diff -r 4a423a0e99be -r 9320442d8fb9 graphics/cairo/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/cairo/patches/patch-ac   Mon May 05 06:53:00 2008 +0000
@@ -0,0 +1,30 @@
+$NetBSD: patch-ac,v 1.8 2008/05/05 06:53:00 yyamano Exp $
+
+--- src/cairo-quartz-image-surface.c.orig      2008-04-04 15:45:23.000000000 -0700
++++ src/cairo-quartz-image-surface.c
+@@ -42,6 +42,25 @@
+ 
+ #include "cairo-quartz-private.h"
+ 
++/* XXX The following code is copied from cairo-quartz-surface.c to make this 
++ * build on 10.4.x ppc. Need clean up.
++ */
++/* We need to work with the 10.3 SDK as well (and 10.3 machines; luckily, 10.3.9
++ * has all the stuff we care about, just some of it isn't exported in the SDK.
++ */
++#ifndef kCGBitmapByteOrder32Host
++#define USE_10_3_WORKAROUNDS
++#define kCGBitmapAlphaInfoMask 0x1F
++#define kCGBitmapByteOrderMask 0x7000
++#define kCGBitmapByteOrder32Host 0
++
++typedef uint32_t CGBitmapInfo;
++
++/* public in 10.4, present in 10.3.9 */
++CG_EXTERN void CGContextReplacePathWithStrokedPath (CGContextRef);
++CG_EXTERN CGImageRef CGBitmapContextCreateImage (CGContextRef);
++#endif
++
+ #define SURFACE_ERROR_NO_MEMORY (_cairo_surface_create_in_error(_cairo_error(CAIRO_STATUS_NO_MEMORY)))
+ #define SURFACE_ERROR_INVALID_FORMAT (_cairo_surface_create_in_error(_cairo_error(CAIRO_STATUS_INVALID_FORMAT)))
+