CVS commit: pkgsrc/graphics/cairo

["Patrick Welche" <prlw1%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   prlw1
Date:           Tue Nov 14 20:43:36 UTC 2023

Modified Files:
        pkgsrc/graphics/cairo: distinfo
Added Files:
        pkgsrc/graphics/cairo/patches: patch-src_cairo-image-surface.c

Log Message:
cairo: _cairo_dither_to_pixman_dither is only defined for pixman >=0.39.0

(Noticeable when building with pixman 0.38.4 from xsrc)


To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 pkgsrc/graphics/cairo/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/cairo/patches/patch-src_cairo-image-surface.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/cairo/distinfo
diff -u pkgsrc/graphics/cairo/distinfo:1.98 pkgsrc/graphics/cairo/distinfo:1.99
--- pkgsrc/graphics/cairo/distinfo:1.98 Tue Nov 14 13:48:19 2023
+++ pkgsrc/graphics/cairo/distinfo      Tue Nov 14 20:43:36 2023
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.98 2023/11/14 13:48:19 wiz Exp $
+$NetBSD: distinfo,v 1.99 2023/11/14 20:43:36 prlw1 Exp $
 
 BLAKE2s (cairo-1.18.0.tar.xz) = d17e3d7a1b32769f02500ff3edaf8a7e18974873a128c61e607f05e5216e8a63
 SHA512 (cairo-1.18.0.tar.xz) = 6366c7d5e3fd3e12df2edc43aa4ed4c3a517de2ef0b1b3b30dfa8b69a7cae1dd55765801228cec308d2e9792037d0704ae49d95b7b12c06f20df092fa0534e1c
 Size (cairo-1.18.0.tar.xz) = 33761148 bytes
 SHA1 (patch-meson.build) = 3187c754af123be69e1b5651165f6310c8786558
+SHA1 (patch-src_cairo-image-surface.c) = 3ae5966abf7851dfdb74742c39d2033b4655d7f7
 SHA1 (patch-test_pdf-structure.c) = dd3e5ee2cdbc19e77c2d5a60dab98195ecbe82bb
 SHA1 (patch-util_cairo-missing_getline.c) = a1068a37113b162ccfe14d7f1bd0baa9df7e5530
 SHA1 (patch-util_meson.build) = 344d29f84114b441bbfede8b77d7a2d02d756ce4

Added files:

Index: pkgsrc/graphics/cairo/patches/patch-src_cairo-image-surface.c
diff -u /dev/null pkgsrc/graphics/cairo/patches/patch-src_cairo-image-surface.c:1.1
--- /dev/null   Tue Nov 14 20:43:36 2023
+++ pkgsrc/graphics/cairo/patches/patch-src_cairo-image-surface.c       Tue Nov 14 20:43:36 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_cairo-image-surface.c,v 1.1 2023/11/14 20:43:36 prlw1 Exp $
+
+Don't call a function which is only defined for pixman>=0.39.0 unconditionally
+
+--- src/cairo-image-surface.c.orig     2023-09-23 14:18:32.000000000 +0000
++++ src/cairo-image-surface.c
+@@ -951,8 +951,10 @@ _cairo_image_surface_paint (void                  *abst
+                           const cairo_clip_t          *clip)
+ {
+     cairo_image_surface_t *surface = abstract_surface;
++#if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0,39,0)
+     pixman_dither_t pixman_dither = _cairo_dither_to_pixman_dither (source->dither);
+     pixman_image_set_dither (surface->pixman_image, pixman_dither);
++#endif
+ 
+     TRACE ((stderr, "%s (surface=%d)\n",
+           __FUNCTION__, surface->base.unique_id));