[pkgsrc/trunk]: pkgsrc/graphics/cairo The last fix for pseudocolor displays b...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b6da15d6f27e
branches:  trunk
changeset: 519064:b6da15d6f27e
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Fri Sep 29 13:43:41 2006 +0000

description:
The last fix for pseudocolor displays broke 24-bit troecolor displays.
Use a new patch from https://bugs.freedesktop.org/show_bug.cgi?id=4945
Bump PKGREVISION.

diffstat:

 graphics/cairo/Makefile         |    4 +-
 graphics/cairo/distinfo         |    4 +-
 graphics/cairo/patches/patch-ae |  370 +++++++++------------------------------
 3 files changed, 89 insertions(+), 289 deletions(-)

diffs (truncated from 485 to 300 lines):

diff -r a64fa630f2cb -r b6da15d6f27e graphics/cairo/Makefile
--- a/graphics/cairo/Makefile   Fri Sep 29 01:58:52 2006 +0000
+++ b/graphics/cairo/Makefile   Fri Sep 29 13:43:41 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2006/09/20 12:58:32 joerg Exp $
+# $NetBSD: Makefile,v 1.48 2006/09/29 13:43:41 drochner Exp $
 
 DISTNAME=      cairo-1.2.4
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    graphics
 MASTER_SITES=  http://cairographics.org/releases/
 
diff -r a64fa630f2cb -r b6da15d6f27e graphics/cairo/distinfo
--- a/graphics/cairo/distinfo   Fri Sep 29 01:58:52 2006 +0000
+++ b/graphics/cairo/distinfo   Fri Sep 29 13:43:41 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2006/09/20 12:58:32 joerg Exp $
+$NetBSD: distinfo,v 1.26 2006/09/29 13:43:41 drochner Exp $
 
 SHA1 (cairo-1.2.4.tar.gz) = 5520b771c8b85acea78fa56fc4c39b4dca6bcc7c
 RMD160 (cairo-1.2.4.tar.gz) = dee558b7489aa089de6963d909a8352725e10bdd
@@ -7,5 +7,5 @@
 SHA1 (patch-ab) = 14f3122cea953ad460b96cb2cf2347e5ed007450
 SHA1 (patch-ac) = 71c66c051673a40b816c80cd8a67bfb4d0b6000b
 SHA1 (patch-ad) = 60ebdcbbcd0a7bd97ba4d25e79500547008ede34
-SHA1 (patch-ae) = 31141662ea34bc190443f82ed1ceab826bb98c37
+SHA1 (patch-ae) = 9ce7cab8e4f1394efdd516d5f83d2d53edb02064
 SHA1 (patch-af) = 257e2c4e73842e4a2f236765b9dae1c6f355c8b4
diff -r a64fa630f2cb -r b6da15d6f27e graphics/cairo/patches/patch-ae
--- a/graphics/cairo/patches/patch-ae   Fri Sep 29 01:58:52 2006 +0000
+++ b/graphics/cairo/patches/patch-ae   Fri Sep 29 13:43:41 2006 +0000
@@ -1,54 +1,32 @@
-$NetBSD: patch-ae,v 1.4 2006/08/31 11:17:19 dmcmahill Exp $
-
-Adapted from:
-http://ekyo.nerim.net/software/patch-1.2.0-src_cairo-xlib-surface_c
+$NetBSD: patch-ae,v 1.5 2006/09/29 13:43:41 drochner Exp $
 
 Fixes cairo on 8-bit psuedo color and other 8-bit displays.
-
-The patch listed above is for 1.2.0 and took some minor modification to
-apply to 1.2.4.
+See https://bugs.freedesktop.org/show_bug.cgi?id=4945
 
-See https://bugs.freedesktop.org/show_bug.cgi?id=4945 for more details.
-
---- src/cairo-xlib-surface.c.orig      2006-08-18 14:20:16.000000000 +0000
-+++ src/cairo-xlib-surface.c   2006-08-31 10:53:10.000000000 +0000
-@@ -82,4 +82,6 @@
+--- src/cairo-xlib-surface.c.orig      2006-08-18 16:20:16.000000000 +0200
++++ src/cairo-xlib-surface.c
+@@ -81,6 +81,8 @@ _cairo_xlib_surface_show_glyphs (void   
+ 
  #define CAIRO_ASSUME_PIXMAP   20
  
 +struct clut_r3g3b2;
 +
  struct _cairo_xlib_surface {
      cairo_surface_t base;
-@@ -127,4 +129,7 @@
+ 
+@@ -126,6 +128,8 @@ struct _cairo_xlib_surface {
+     int num_clip_rects;
  
      XRenderPictFormat *xrender_format;
 +
 +    struct clut_r3g3b2 *clut;
-+    int workaround;
  };
  
-@@ -505,4 +510,158 @@
+ #define CAIRO_SURFACE_RENDER_AT_LEAST(surface, major, minor)  \
+@@ -504,6 +508,82 @@ _swap_ximage_to_native (XImage *ximage)
+     }
  }
  
-+#if 0
-+static void _set_optimal_cmap(Display *dpy, Colormap cmap) {
-+    int i, r, g, b;
-+    XColor cm[256];
-+
-+    for (i = 0; i < 256; i++) {
-+      r = i >> 5;
-+      g = (i >> 2) & 0x7;
-+      b = (i << 1) & 0x7;
-+      cm[i].pixel = i;
-+      cm[i].flags = DoRed | DoGreen | DoBlue;
-+      cm[i].red   = r << 13 | r << 10 | r << 7 | r << 4 | r << 1 | r >> 2;
-+      cm[i].green = g << 13 | g << 10 | g << 7 | g << 4 | g << 1 | g >> 2;
-+      cm[i].blue  = b << 13 | b << 10 | b << 7 | b << 4 | b << 1 | b >> 2;
-+    }
-+    XStoreColors(dpy, cmap, cm, 256);
-+}
-+#endif
-+
 +struct clut_r3g3b2 {
 +    struct clut_r3g3b2 *next;
 +    Display            *dpy;
@@ -125,123 +103,27 @@
 +    return clut;
 +}
 +
-+static const char * _visualClass[] = {
-+    "StaticGray",
-+    "GrayScale",
-+    "StaticColor",
-+    "PseudoColor",
-+    "TrueColor",
-+    "DirectColor"
-+};
-+
-+
-+static void _print_visual(Visual *v) {
-+    printf("Visual: class=%s, bpRGB=%i, CM=%i, r=%lx, g=%lx, b=%lx\n",
-+         _visualClass[v->class],
-+         v->bits_per_rgb,
-+         v->map_entries,
-+         v->red_mask, v->green_mask, v->blue_mask);
-+}
-+
-+
-+#if 0
-+static void _print_ximage(XImage *x) {
-+    const char * format[] = { "XYBitmap", "XYPixmap", "ZPixmap" };
-+    printf("XImage: size=(%i,%i), xoffset=%i, format=%s, depth=%i, bpp=%i, stride=%i\n        r=%lx, g=%lx, b=%lx, unit=%i, pad=%i\n",
-+         x->width,
-+         x->height,
-+         x->xoffset,
-+         format[x->format],
-+         x->depth,
-+         x->bits_per_pixel,
-+         x->bytes_per_line,
-+         x->red_mask, x->green_mask, x->blue_mask,
-+         x->bitmap_unit, x->bitmap_pad);
-+}
-+
-+const char * _cairoFormats[] = { "ARGB32", "RGB24", "A8", "A1" };
-+
-+static void _print_cairoimage(cairo_image_surface_t *i) {
-+    
-+    printf("CairoImage: size=(%i,%i), format=%s, depth=%i, stride=%i\n",
-+         i->width,
-+         i->height,
-+         _cairoFormats[i->format],
-+         i->depth,
-+         i->stride);
-+}
-+
-+static void _print_cairomasks(cairo_format_masks_t *m) {
-+    printf("CairoFormatMask: bpp=%i, a=%lx, r=%lx, g=%lx, b=%lx\n",
-+         m->bpp, m->alpha_mask, m->red_mask, m->green_mask, m->blue_mask);
-+}
-+#endif
-+
-+#define WORKAROUND_NONE           0
-+#define WORKAROUND_8BIT_GRAYLEVEL 1
-+#define WORKAROUND_8BIT_PALETTE   2
-+#if 1
-+#define WORKAROUND_R5G6B5         3
-+#endif
-+
  static cairo_status_t
  _get_image_surface (cairo_xlib_surface_t    *surface,
-@@ -659,17 +818,94 @@
+                   cairo_rectangle_int16_t *interest_rect,
+@@ -657,6 +737,35 @@ _get_image_surface (cairo_xlib_surface_t
+     }
+     else
      {
-       /*
--       * XXX This can't work.  We must convert the data to one of the
--       * supported pixman formats.  Pixman needs another function
--       * which takes data in an arbitrary format and converts it
--       * to something supported by that library.
-+       * Otherwise, we construct a buffer containing RGB24 data
-+       * using the specified workaround.
-        */
-+      uint32_t *data, *dst, *clut;
-+      uint8_t  *src8;
-+      uint16_t *src16;
-+      int i,j;
-+      
-+      if(surface->visual == NULL) {
-+          printf("No visual for surface\n");
-+          goto FAIL;
-+      }
-+
-+      if (surface->workaround == WORKAROUND_NONE) {
-+          printf("No workaround for this pixel format: ");
-+          _print_visual(surface->visual);
-+          goto FAIL;
-+      }
 +      
-+      data = (uint32_t*)malloc(ximage->height * ximage->width * 4);
-+      if(data == NULL) {
-+          printf("Cannot allocate RGB buffer\n");
-+          goto FAIL;
-+      }
-+      
-+      switch (surface->workaround) {
++          if(surface->clut != NULL) {
 +          
-+      case WORKAROUND_8BIT_GRAYLEVEL:
++                  /*
++           * Otherwise, we construct a buffer containing RGB24 data
++           * using the specified workaround.
++           */
++          uint32_t *data, *dst, *clut;
++          uint8_t  *src8;
++          int i,j;
 +
-+          dst = data;
-+          for(j = 0; j < ximage->height; j++) {
-+              src8 = (uint8_t *) (ximage->data + ximage->bytes_per_line * j);
-+              for(i = 0; i < ximage->width; i++) {
-+                  *dst++ = (*src8 << 16) | (*src8 << 8) | *src8;
-+                  src8++;
-+              }
-+          }
-+          break;
-+          
-+      case WORKAROUND_8BIT_PALETTE:
-+
-+          if(surface->clut == NULL) {
-+              surface->clut = _get_clut_r3g3b2(
-+                  surface->dpy,
-+                  DefaultColormapOfScreen(surface->screen));
-+          }
-+
-+          if(surface->clut == NULL) {
-+              free(data);
++          data = (uint32_t*)malloc(ximage->height * ximage->width * 4);
++          if(data == NULL) {
++              printf("Cannot allocate RGB buffer\n");
 +              goto FAIL;
 +          }
 +
@@ -253,50 +135,29 @@
 +                  *dst++ = clut[src8[i]];
 +              src8 += ximage->bytes_per_line;
 +          }
-+          break;
-+#if 1
-+      case WORKAROUND_R5G6B5:
-+
-+          src16 = (uint16_t*)ximage->data;
-+          dst = data;
-+          for(j = 0; j < ximage->height; j++) {
-+              for(i = 0; i < ximage->width; i++) {
-+                  *dst++ = ( ( ((src16[i] & 0xf800) << 8) | ((src16[i] & 0xe000) << 3) ) |
-+                             ( ((src16[i] & 0x07e0) << 5) | ((src16[i] & 0x0600) >> 1) ) |
-+                             ( ((src16[i] & 0x001f) << 3) | ((src16[i] & 0x001f) >> 2) ) );
-+              }
-+              src16 += ximage->bytes_per_line / sizeof(*src16);
-+          }
-+          break;
-+#endif
-+      default:
-+          printf("Dunno what to do with: ");
-+          _print_visual(surface->visual);
-+          goto FAIL;
++          free(ximage->data);
++          image = (cairo_image_surface_t*)
++              cairo_image_surface_create_for_data((unsigned char *)data, CAIRO_FORMAT_RGB24, ximage->width, ximage->height, ximage->width*4);
++        } else {
+       /*
+        * XXX This can't work.  We must convert the data to one of the
+        * supported pixman formats.  Pixman needs another function
+@@ -669,6 +778,8 @@ _get_image_surface (cairo_xlib_surface_t
+                                                   ximage->width,
+                                                   ximage->height,
+                                                   ximage->bytes_per_line);
 +      }
-+      free(ximage->data);
-       image = (cairo_image_surface_t*)
--          _cairo_image_surface_create_with_masks ((unsigned char *) ximage->data,
--                                                  &masks,
--                                                  ximage->width,
--                                                  ximage->height,
--                                                  ximage->bytes_per_line);
--      if (image->base.status)
-+          cairo_image_surface_create_for_data((unsigned char *)data, CAIRO_FORMAT_RGB24, ximage->width, ximage->height, ximage->width*4);
 +      
-+      if (image->base.status) {
-+          printf("Failed!\n");
-+          free(data);
+       if (image->base.status)
            goto FAIL;
-+      }
      }
- 
-@@ -744,4 +980,30 @@
+@@ -743,6 +854,32 @@ _cairo_xlib_surface_ensure_gc (cairo_xli
+     _cairo_xlib_surface_set_gc_clip_rects (surface);
  }
  
 +
 +static int
-+make_space_for(unsigned char ** buf, int *size, int *stride, int width, int height, int Bpp)