[pkgsrc/trunk]: pkgsrc/graphics/cairo Update to cairo-1.6.4.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/graphics/cairo Update to cairo-1.6.4.
From: tnn <tnn%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 06:02:36 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/5416883ae47e
branches:  trunk
changeset: 541362:5416883ae47e
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Mon Apr 21 11:29:33 2008 +0000

description:
Update to cairo-1.6.4.
Major changes between the 1.4 and 1.6 branch:
- Now uses external "pixman" library instead of a bundled one.
- Improvements to PDF, SVG and PostScript output
- New support for arbitrary X server visuals
  (the 8-bit display support patch (patch-ae in pkgsrc) is integrated)
- rendering backend improvements
- various new API additions, while maintaining ABI compatibility
- New Quartz backend
- bug fixes

diffstat:

 graphics/cairo/Makefile         |    6 +-
 graphics/cairo/PLIST            |    7 +-
 graphics/cairo/buildlink3.mk    |    5 +-
 graphics/cairo/distinfo         |   13 +-
 graphics/cairo/patches/patch-aa |   18 +-
 graphics/cairo/patches/patch-ab |   22 +-
 graphics/cairo/patches/patch-ae |  335 ----------------------------------------
 7 files changed, 34 insertions(+), 372 deletions(-)

diffs (truncated from 496 to 300 lines):

diff -r 48d0d8f7cb1f -r 5416883ae47e graphics/cairo/Makefile
--- a/graphics/cairo/Makefile   Mon Apr 21 11:09:07 2008 +0000
+++ b/graphics/cairo/Makefile   Mon Apr 21 11:29:33 2008 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.60 2008/04/12 22:43:01 jlam Exp $
+# $NetBSD: Makefile,v 1.61 2008/04/21 11:29:33 tnn Exp $
 
-DISTNAME=      cairo-1.4.14
+DISTNAME=      cairo-1.6.4
 CATEGORIES=    graphics
 MASTER_SITES=  http://cairographics.org/releases/
 
@@ -31,6 +31,7 @@
 .include "options.mk"
 
 BUILDLINK_API_DEPENDS.glitz+=  glitz>=0.5.1
+BUILDLINK_API_DEPENDS.pixman+= pixman>=0.10.0
 
 # For snprintf()
 CPPFLAGS.SunOS+=               -D__EXTENSIONS__
@@ -43,4 +44,5 @@
 .include "../../graphics/glitz/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+.include "../../x11/pixman/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 48d0d8f7cb1f -r 5416883ae47e graphics/cairo/PLIST
--- a/graphics/cairo/PLIST      Mon Apr 21 11:09:07 2008 +0000
+++ b/graphics/cairo/PLIST      Mon Apr 21 11:29:33 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2008/04/12 22:43:01 jlam Exp $
+@comment $NetBSD: PLIST,v 1.19 2008/04/21 11:29:33 tnn Exp $
 ${PLIST.carbon}include/cairo/cairo-atsui.h
 include/cairo/cairo-deprecated.h
 include/cairo/cairo-features.h
@@ -45,6 +45,8 @@
 share/gtk-doc/html/cairo/cairo-Paths.html
 share/gtk-doc/html/cairo/cairo-Patterns.html
 share/gtk-doc/html/cairo/cairo-PostScript-Surfaces.html
+share/gtk-doc/html/cairo/cairo-Quartz-Fonts.html
+share/gtk-doc/html/cairo/cairo-Quartz-Surfaces.html
 share/gtk-doc/html/cairo/cairo-SVG-Surfaces.html
 share/gtk-doc/html/cairo/cairo-Scaled-Fonts.html
 share/gtk-doc/html/cairo/cairo-Text.html
@@ -65,11 +67,10 @@
 share/gtk-doc/html/cairo/index.sgml
 share/gtk-doc/html/cairo/index-1.2.html
 share/gtk-doc/html/cairo/index-1.4.html
+share/gtk-doc/html/cairo/index-1.6.html
 share/gtk-doc/html/cairo/ix01.html
 share/gtk-doc/html/cairo/language-bindings.html
 share/gtk-doc/html/cairo/left.png
-share/gtk-doc/html/cairo/pt01.html
-share/gtk-doc/html/cairo/pt02.html
 share/gtk-doc/html/cairo/right.png
 share/gtk-doc/html/cairo/style.css
 share/gtk-doc/html/cairo/up.png
diff -r 48d0d8f7cb1f -r 5416883ae47e graphics/cairo/buildlink3.mk
--- a/graphics/cairo/buildlink3.mk      Mon Apr 21 11:09:07 2008 +0000
+++ b/graphics/cairo/buildlink3.mk      Mon Apr 21 11:29:33 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.26 2007/05/30 08:54:30 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2008/04/21 11:29:33 tnn Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 CAIRO_BUILDLINK3_MK:=  ${CAIRO_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@
 BUILDLINK_ORDER:=      ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cairo
 
 .if ${CAIRO_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.0.0nb2
+BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.6.4
 BUILDLINK_ABI_DEPENDS.cairo?=  cairo>=1.0.4nb1
 BUILDLINK_PKGSRCDIR.cairo?=    ../../graphics/cairo
 
@@ -32,5 +32,6 @@
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glitz/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../x11/pixman/buildlink3.mk"
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
diff -r 48d0d8f7cb1f -r 5416883ae47e graphics/cairo/distinfo
--- a/graphics/cairo/distinfo   Mon Apr 21 11:09:07 2008 +0000
+++ b/graphics/cairo/distinfo   Mon Apr 21 11:29:33 2008 +0000
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.39 2008/03/12 20:48:11 drochner Exp $
+$NetBSD: distinfo,v 1.40 2008/04/21 11:29:33 tnn Exp $
 
-SHA1 (cairo-1.4.14.tar.gz) = 63310243ba8af949060b06c01fc28ee5471ed5a4
-RMD160 (cairo-1.4.14.tar.gz) = 9e7c87a292c889b06b29e9622be0a7daa3ddd6fd
-Size (cairo-1.4.14.tar.gz) = 3283608 bytes
-SHA1 (patch-aa) = 79c04674fde56522e1f09e5896fcef4c6b6a0d36
-SHA1 (patch-ab) = c6b98417270f7165aa3499d92d0ca9c19bdd4318
-SHA1 (patch-ae) = 0b5c35720f9b675f132ca4da8c7e6e2b69c2f1a1
+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
diff -r 48d0d8f7cb1f -r 5416883ae47e graphics/cairo/patches/patch-aa
--- a/graphics/cairo/patches/patch-aa   Mon Apr 21 11:09:07 2008 +0000
+++ b/graphics/cairo/patches/patch-aa   Mon Apr 21 11:29:33 2008 +0000
@@ -1,19 +1,13 @@
-$NetBSD: patch-aa,v 1.10 2007/06/08 07:20:53 wiz Exp $
+$NetBSD: patch-aa,v 1.11 2008/04/21 11:29:33 tnn Exp $
 
---- src/Makefile.in.orig       2007-05-01 20:25:14.000000000 +0000
+--- src/Makefile.in.orig       2008-04-11 23:33:41.000000000 +0200
 +++ src/Makefile.in
-@@ -244,7 +244,7 @@ CAIRO_CAN_TEST_PDF_SURFACE_FALSE = @CAIR
- CAIRO_CAN_TEST_PDF_SURFACE_TRUE = @CAIRO_CAN_TEST_PDF_SURFACE_TRUE@
- CAIRO_CAN_TEST_SVG_SURFACE_FALSE = @CAIRO_CAN_TEST_SVG_SURFACE_FALSE@
- CAIRO_CAN_TEST_SVG_SURFACE_TRUE = @CAIRO_CAN_TEST_SVG_SURFACE_TRUE@
+@@ -288,9 +288,9 @@ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ CAIROPERF_LIBS = @CAIROPERF_LIBS@
 -CAIRO_CFLAGS = @CAIRO_CFLAGS@
 +CAIRO_CFLAGS = @CAIRO_CFLAGS@ ${PTHREAD_CFLAGS}
- CAIRO_HAS_ATSUI_FONT_FALSE = @CAIRO_HAS_ATSUI_FONT_FALSE@
- CAIRO_HAS_ATSUI_FONT_TRUE = @CAIRO_HAS_ATSUI_FONT_TRUE@
- CAIRO_HAS_BEOS_SURFACE_FALSE = @CAIRO_HAS_BEOS_SURFACE_FALSE@
-@@ -282,7 +282,7 @@ CAIRO_HAS_XLIB_SURFACE_TRUE = @CAIRO_HAS
- CAIRO_HAS_XLIB_XRENDER_SURFACE_FALSE = @CAIRO_HAS_XLIB_XRENDER_SURFACE_FALSE@
- CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE = @CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@
  CAIRO_LDADD = @CAIRO_LDADD@
 -CAIRO_LIBS = @CAIRO_LIBS@
 +CAIRO_LIBS = @CAIRO_LIBS@ ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
diff -r 48d0d8f7cb1f -r 5416883ae47e graphics/cairo/patches/patch-ab
--- a/graphics/cairo/patches/patch-ab   Mon Apr 21 11:09:07 2008 +0000
+++ b/graphics/cairo/patches/patch-ab   Mon Apr 21 11:29:33 2008 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.8 2007/07/06 18:19:43 drochner Exp $
+$NetBSD: patch-ab,v 1.9 2008/04/21 11:29:33 tnn Exp $
 
---- test/Makefile.in.orig      2007-06-27 23:06:21.000000000 +0200
+--- test/Makefile.in.orig      2008-04-11 23:33:42.000000000 +0200
 +++ test/Makefile.in
-@@ -54,7 +54,7 @@ check_PROGRAMS = imagediff$(EXEEXT) png-
-       $(am__EXEEXT_13) $(am__EXEEXT_14)
- EXTRA_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_11) \
-       $(am__EXEEXT_12)
--@HAVE_PTHREAD_TRUE@am__append_9 = -lpthread
-+@HAVE_PTHREAD_TRUE@am__append_9 = ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
- @CAIRO_CAN_TEST_PDF_SURFACE_TRUE@am__append_10 = pdf2png
- @CAIRO_CAN_TEST_PDF_SURFACE_TRUE@@CAIRO_HAS_SVG_SURFACE_TRUE@am__append_11 = pdf2svg$(EXEEXT)
- @CAIRO_CAN_TEST_SVG_SURFACE_TRUE@am__append_12 = svg2png
+@@ -59,7 +59,7 @@ host_triplet = @host@
+ @CAIRO_HAS_PDF_SURFACE_TRUE@@CAIRO_HAS_PS_SURFACE_TRUE@@CAIRO_HAS_SVG_SURFACE_TRUE@am__append_10 = fallback-resolution$(EXEEXT)
+ check_PROGRAMS = imagediff$(EXEEXT) png-flatten$(EXEEXT) \
+       $(am__EXEEXT_1) $(am__EXEEXT_2)
+-@HAVE_PTHREAD_TRUE@am__append_11 = -lpthread
++@HAVE_PTHREAD_TRUE@am__append_11 = ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
+ @CAIRO_CAN_TEST_PDF_SURFACE_TRUE@am__append_12 = pdf2png
+ @CAIRO_CAN_TEST_SVG_SURFACE_TRUE@am__append_13 = svg2png
+ subdir = test
diff -r 48d0d8f7cb1f -r 5416883ae47e graphics/cairo/patches/patch-ae
--- a/graphics/cairo/patches/patch-ae   Mon Apr 21 11:09:07 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,335 +0,0 @@
-$NetBSD: patch-ae,v 1.9 2007/11/30 20:49:25 drochner Exp $
-
-Fixes cairo on 8-bit pseudo color and other 8-bit displays.
-See https://bugs.freedesktop.org/show_bug.cgi?id=4945
-
---- src/cairo-xlib-surface-private.h.orig      2007-11-27 07:20:12.000000000 +0100
-+++ src/cairo-xlib-surface-private.h
-@@ -39,6 +39,14 @@
- 
- typedef struct _cairo_xlib_surface cairo_xlib_surface_t;
- 
-+struct clut_r3g3b2 {
-+    struct clut_r3g3b2 *next;
-+    Display            *dpy;
-+    Colormap           cmap;
-+    uint32_t           clut[256];
-+    unsigned char      ilut[256];
-+};
-+
- struct _cairo_xlib_surface {
-     cairo_surface_t base;
- 
-@@ -89,6 +97,9 @@ struct _cairo_xlib_surface {
-     cairo_filter_t filter;
-     int repeat;
-     XTransform xtransform;
-+
-+    struct clut_r3g3b2 *clut;
-+    int workaround;
- };
- 
- enum {
---- src/cairo-xlib-surface.c.orig      2007-11-27 07:20:12.000000000 +0100
-+++ src/cairo-xlib-surface.c
-@@ -108,6 +108,10 @@ static const XTransform identity = { {
- #define CAIRO_SURFACE_RENDER_HAS_PICTURE_TRANSFORM(surface)   CAIRO_SURFACE_RENDER_AT_LEAST((surface), 0, 6)
- #define CAIRO_SURFACE_RENDER_HAS_FILTERS(surface)     CAIRO_SURFACE_RENDER_AT_LEAST((surface), 0, 6)
- 
-+#define WORKAROUND_NONE 0
-+#define WORKAROUND_8BIT_PALETTE 1
-+#define WORKAROUND_8BIT_DIRECT 2
-+
- static int
- _CAIRO_FORMAT_DEPTH (cairo_format_t format)
- {
-@@ -494,6 +498,74 @@ _swap_ximage_to_native (XImage *ximage)
-     }
- }
- 
-+static struct clut_r3g3b2 * _get_clut_r3g3b2(Display *dpy, Colormap cmap) {
-+    static struct clut_r3g3b2 *first = NULL;
-+    int i,j, min, d;
-+    struct clut_r3g3b2 *clut;
-+    unsigned char r,g,b, r2,g2,b2;
-+    
-+    clut = first;
-+    while(clut) {
-+      if ( clut->dpy == dpy && clut->cmap == cmap )
-+          return clut;
-+      clut = clut->next;
-+    }
-+    
-+    clut = calloc(1, sizeof(*clut));
-+    if(clut == NULL)
-+      return NULL;
-+    
-+    clut->next = first;
-+    clut->dpy = dpy;
-+    clut->cmap = cmap;
-+    first = clut;
-+
-+    /* Construct the clut from Colormap */
-+    for (i = 0; i < 256; i++) {
-+      XColor xcol;
-+      xcol.pixel = i;
-+      XQueryColor(dpy, cmap, &xcol);
-+      clut->clut[i] = ( ( ((uint32_t)xcol.red   & 0xff00 ) << 8) |
-+                        ( ((uint32_t)xcol.green & 0xff00 ) ) |
-+                        ( ((uint32_t)xcol.blue  & 0xff00 ) >> 8) );
-+    }
-+    /*
-+      
-+    Find the best matching color in the colormap for all r3g3b2
-+    values. The distance is maybe not perceptively valid, but it
-+    should not be too bad.
-+    
-+    */
-+    for (i = 0; i < 256; i++) {
-+      r = i >> 5;
-+      g = (i >> 2) & 0x7;
-+      b = (i << 1) & 0x7;
-+      min = 255;
-+      for(j = 0; j < 256; j++) {
-+          r2 = (clut->clut[j] & 0xff0000) >> 21;
-+          g2 = (clut->clut[j] & 0x00ff00) >> 13;
-+          b2 = (clut->clut[j] & 0x0000ff) >> 5;
-+          if ( r2 == r && g2 == g && (b2 & 0x6) == b ) {
-+              clut->ilut[i] = j;
-+              break;
-+          }
-+          /*
-+            Squares make higher bits much more important than lower
-+            ones.
-+          */
-+          d  = (r2 ^ r) * (r2 ^ r);
-+          d += (g2 ^ g) * (g2 ^ g);
-+          d += (b2 ^ b) * (b2 ^ b);
-+          if(d < min) {
-+              clut->ilut[i] = j;
-+              min = d;
-+          }
-+      }
-+    }
-+    
-+    return clut;
-+}
-+
- static cairo_status_t
- _get_image_surface (cairo_xlib_surface_t    *surface,
-                   cairo_rectangle_int16_t *interest_rect,
-@@ -655,18 +727,77 @@ _get_image_surface (cairo_xlib_surface_t
-     }
-     else
-     {
-+        if ((surface->clut != NULL) && (surface->workaround == WORKAROUND_8BIT_PALETTE)) {
-+          
-+                  /*
-+           * Otherwise, we construct a buffer containing RGB24 data
-+           * using the specified workaround.
-+           */
-+          uint32_t *data, *dst, *clut;
-+          uint8_t  *src8;
-+          int i,j;
-+
-+          data = (uint32_t*)malloc(ximage->height * ximage->width * 4);
-+          if (data == NULL) {
-+              _cairo_error(CAIRO_STATUS_NO_MEMORY);
-+              goto FAIL;
-+          }
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Updated graphics/cairo to 1.6.4
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Updated devel/p5-ExtUtils-Depends to 0.300
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated graphics/cairo to 1.6.4
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated devel/p5-ExtUtils-Depends to 0.300
Indexes:
Home | Main Index | Thread Index | Old Index