From 649ed3773a9fef8712733fbdcc9d09a5bae62f99 Mon Sep 17 00:00:00 2001 From: René Neumann Date: Thu, 11 Aug 2011 19:41:33 +0200 Subject: Patched cairo --- .../cairo/files/cairo-1.10.0-buggy_gradients.patch | 17 ++ x11-libs/cairo/files/cairo-1.10.2-interix.patch | 36 +++ .../files/cairo-1.2.4-lcd-cleartype-like.diff | 275 +++++++++++++++++++++ x11-libs/cairo/files/cairo-1.8.10-libpng14.patch | 11 + x11-libs/cairo/files/cairo-1.8.8-interix.patch | 16 ++ .../cairo/files/cairo-respect-fontconfig.patch | 13 + 6 files changed, 368 insertions(+) create mode 100644 x11-libs/cairo/files/cairo-1.10.0-buggy_gradients.patch create mode 100644 x11-libs/cairo/files/cairo-1.10.2-interix.patch create mode 100644 x11-libs/cairo/files/cairo-1.2.4-lcd-cleartype-like.diff create mode 100644 x11-libs/cairo/files/cairo-1.8.10-libpng14.patch create mode 100644 x11-libs/cairo/files/cairo-1.8.8-interix.patch create mode 100644 x11-libs/cairo/files/cairo-respect-fontconfig.patch (limited to 'x11-libs/cairo/files') diff --git a/x11-libs/cairo/files/cairo-1.10.0-buggy_gradients.patch b/x11-libs/cairo/files/cairo-1.10.0-buggy_gradients.patch new file mode 100644 index 0000000..a58c2f8 --- /dev/null +++ b/x11-libs/cairo/files/cairo-1.10.0-buggy_gradients.patch @@ -0,0 +1,17 @@ +http://repos.archlinux.org/wsvn/packages/cairo/trunk/cairo-1.10.0-buggy_gradients.patch +http://bugs.gentoo.org/336696 + +--- src/cairo-xlib-display.c ++++ src/cairo-xlib-display.c +@@ -353,11 +353,7 @@ + /* Prior to Render 0.10, there is no protocol support for gradients and + * we call function stubs instead, which would silently consume the drawing. + */ +-#if RENDER_MAJOR == 0 && RENDER_MINOR < 10 + display->buggy_gradients = TRUE; +-#else +- display->buggy_gradients = FALSE; +-#endif + display->buggy_pad_reflect = FALSE; + display->buggy_repeat = FALSE; + diff --git a/x11-libs/cairo/files/cairo-1.10.2-interix.patch b/x11-libs/cairo/files/cairo-1.10.2-interix.patch new file mode 100644 index 0000000..3333e3e --- /dev/null +++ b/x11-libs/cairo/files/cairo-1.10.2-interix.patch @@ -0,0 +1,36 @@ +commit 95f6f7a174ca096a3d3dbe84ff220d166d1e2baa +Author: Uli Schlachter +Date: Fri Oct 22 11:54:57 2010 +0200 + + Make both versions of _cairo_lround consistent again + + Commit c0008242b0f made cairo use libm's lround instead of its own _cairo_lround + by default. However, since commit ce58f874 from 2006, _cairo_lround does + arithmetic rounding instead of away-from-zero rounding (before said commit, it + was using baker's rounding). + + So to make the rounding of _cairo_lround be independent from + DISABLE_SOME_FLOATING_POINT, we have to use another function. Turns out that + _cairo_round already does the same thing that _cairo_lround does. Their only + difference is the return type. + + Signed-off-by: Uli Schlachter + Signed-off-by: Chris Wilson + +diff --git a/src/cairoint.h b/src/cairoint.h +index 53c87e5..539d92e 100644 +--- a/src/cairoint.h ++++ b/src/cairoint.h +@@ -968,7 +968,11 @@ _cairo_round (double r) + cairo_private int + _cairo_lround (double d) cairo_const; + #else +-#define _cairo_lround lround ++static inline int cairo_const ++_cairo_lround (double r) ++{ ++ return _cairo_round (r); ++} + #endif + + cairo_private uint16_t diff --git a/x11-libs/cairo/files/cairo-1.2.4-lcd-cleartype-like.diff b/x11-libs/cairo/files/cairo-1.2.4-lcd-cleartype-like.diff new file mode 100644 index 0000000..2f908b8 --- /dev/null +++ b/x11-libs/cairo/files/cairo-1.2.4-lcd-cleartype-like.diff @@ -0,0 +1,275 @@ +diff -rup libcairo-1.2.4.orig/src/cairo-ft-font.c libcairo-1.2.4/src/cairo-ft-font.c +--- libcairo-1.2.4.orig/src/cairo-ft-font.c 2006-08-22 21:40:02.802247352 +0800 ++++ libcairo-1.2.4/src/cairo-ft-font.c 2006-08-22 21:40:39.443677008 +0800 +@@ -53,6 +53,8 @@ + #include FT_SYNTHESIS_H + #endif + ++#define FIR_FILTER 1 ++ + #define DOUBLE_TO_26_6(d) ((FT_F26Dot6)((d) * 64.0)) + #define DOUBLE_FROM_26_6(t) ((double)(t) / 64.0) + #define DOUBLE_TO_16_16(d) ((FT_Fixed)((d) * 65536.0)) +@@ -492,6 +494,8 @@ _cairo_ft_unscaled_font_destroy (void *a + } + } + ++static const int fir_filter[5] = { 0x1C, 0x38, 0x55, 0x38, 0x1C }; ++ + static cairo_bool_t + _has_unlocked_face (void *entry) + { +@@ -779,7 +783,220 @@ _get_bitmap_surface (FT_Bitmap *bi + } + format = CAIRO_FORMAT_A8; + break; +- case CAIRO_ANTIALIAS_SUBPIXEL: { ++ case CAIRO_ANTIALIAS_SUBPIXEL: ++#ifdef FIR_FILTER ++ { ++ unsigned char* line; ++ unsigned char* bufBitmap; ++ int pitch; ++ unsigned char *data_rgba; ++ unsigned int width_rgba, stride_rgba; ++ int vmul = 1; ++ int hmul = 1; ++ ++ switch (font_options->subpixel_order) { ++ case CAIRO_SUBPIXEL_ORDER_DEFAULT: ++ case CAIRO_SUBPIXEL_ORDER_RGB: ++ case CAIRO_SUBPIXEL_ORDER_BGR: ++ default: ++ width /= 3; ++ hmul = 3; ++ break; ++ case CAIRO_SUBPIXEL_ORDER_VRGB: ++ case CAIRO_SUBPIXEL_ORDER_VBGR: ++ vmul = 3; ++ height /= 3; ++ break; ++ } ++ /* ++ * Filter the glyph to soften the color fringes ++ */ ++ width_rgba = width; ++ stride = bitmap->pitch; ++ stride_rgba = (width_rgba * 4 + 3) & ~3; ++ data_rgba = calloc (1, stride_rgba * height); ++ ++ /* perform in-place FIR filtering in either the horizontal or ++ * vertical direction. We're going to modify the RGB graymap, ++ * but that's ok, because we either own it, or its part of ++ * the FreeType glyph slot, which will not be used anymore. ++ */ ++ pitch = bitmap->pitch; ++ line = (unsigned char*)bitmap->buffer; ++ if ( pitch < 0 ) ++ line -= pitch*(height-1); ++ ++ bufBitmap = line; ++ ++ switch (font_options->subpixel_order) { ++ case CAIRO_SUBPIXEL_ORDER_DEFAULT: ++ case CAIRO_SUBPIXEL_ORDER_RGB: ++ case CAIRO_SUBPIXEL_ORDER_BGR: ++ { ++ int h; ++ ++ for ( h = height; h > 0; h--, line += pitch ) { ++ int pix[6] = { 0, 0, 0, 0, 0, 0 }; ++ unsigned char* p = line; ++ unsigned char* limit = line + width*3; ++ int nn, val, val2; ++ ++ val = p[0]; ++ for (nn = 0; nn < 3; nn++) ++ pix[2 + nn] += val * fir_filter[nn]; ++ ++ val = p[1]; ++ for (nn = 0; nn < 4; nn++) ++ pix[1 + nn] += val * fir_filter[nn]; ++ ++ p += 2; ++ ++ for ( ; p < limit; p++ ) { ++ val = p[0]; ++ for (nn = 0; nn < 5; nn++) ++ pix[nn] += val * fir_filter[nn]; ++ ++ val2 = pix[0] / 256; ++ val2 |= -(val2 >> 8); ++ p[-2] = (unsigned char)val2; ++ ++ for (nn = 0; nn < 5; nn++) ++ pix[nn] = pix[nn + 1]; ++ } ++ for (nn = 0; nn < 2; nn++ ) { ++ val2 = pix[nn] / 256; ++ val2 |= -(val2 >> 8); ++ p[nn - 2] = (unsigned char)val2; ++ } ++ } ++ } ++ break; ++ case CAIRO_SUBPIXEL_ORDER_VRGB: ++ case CAIRO_SUBPIXEL_ORDER_VBGR: ++ { ++ int w; ++ ++ for (w = 0; w < width; w++ ) { ++ int pix[6] = { 0, 0, 0, 0, 0, 0 }; ++ unsigned char* p = bufBitmap + w; ++ unsigned char* limit = bufBitmap + w + height*3*pitch; ++ int nn, val, val2; ++ ++ val = p[0]; ++ for (nn = 0; nn < 3; nn++) ++ pix[2 + nn] += val*fir_filter[nn]; ++ ++ val = p[pitch]; ++ for (nn = 0; nn < 4; nn++ ) ++ pix[1 + nn] += val * fir_filter[nn]; ++ ++ p += 2*pitch; ++ for ( ; p < limit; p += pitch ) { ++ val = p[0]; ++ for (nn = 0; nn < 5; nn++ ) ++ pix[nn] += val * fir_filter[nn]; ++ ++ val2 = pix[0] / 256; ++ val2 |= -(val2 >> 8); ++ p[-2 * pitch] = (unsigned char)val2; ++ ++ for (nn = 0; nn < 5; nn++) ++ pix[nn] = pix[nn+1]; ++ } ++ ++ for (nn = 0; nn < 2; nn++) { ++ val2 = pix[nn] / 256; ++ val2 |= -(val2 >> 8); ++ p[(nn - 2) * pitch] = (unsigned char)val2; ++ } ++ } ++ } ++ break; ++ default: /* shouldn't happen */ ++ break; ++ } ++ ++ /* now copy the resulting graymap into an ARGB32 image */ ++ { ++ unsigned char* in_line = bufBitmap; ++ unsigned char* out_line = data_rgba; ++ int h = height; ++ ++ switch (font_options->subpixel_order) { ++ case CAIRO_SUBPIXEL_ORDER_DEFAULT: ++ case CAIRO_SUBPIXEL_ORDER_RGB: ++ for ( ; h > 0; h--, in_line += pitch, out_line += stride_rgba) { ++ unsigned char* in = in_line; ++ int* out = (int*)out_line; ++ int w; ++ ++ for (w = width; w > 0; w--, in += 3, out += 1) { ++ int r = in[0]; ++ int g = in[1]; ++ int b = in[2]; ++ ++ out[0] = (g << 24) | (r << 16) | (g << 8) | b; ++ } ++ } ++ break; ++ case CAIRO_SUBPIXEL_ORDER_BGR: ++ for ( ; h > 0; h--, in_line += pitch, out_line += stride_rgba) { ++ unsigned char* in = in_line; ++ int* out = (int*)out_line; ++ int w; ++ ++ for (w = width; w > 0; w--, in += 3, out += 1) { ++ int r = in[2]; ++ int g = in[1]; ++ int b = in[0]; ++ ++ out[0] = (g << 24) | (r << 16) | (g << 8) | b; ++ } ++ } ++ break; ++ case CAIRO_SUBPIXEL_ORDER_VRGB: ++ for ( ; h > 0; h--, in_line += pitch*3, out_line += stride_rgba) { ++ unsigned char* in = in_line; ++ int* out = (int*)out_line; ++ int w; ++ ++ for (w = width; w > 0; w--, in += 1, out += 1) { ++ int r = in[0]; ++ int g = in[pitch]; ++ int b = in[pitch*2]; ++ ++ out[0] = (g << 24) | (r << 16) | (g << 8) | b; ++ } ++ } ++ break; ++ case CAIRO_SUBPIXEL_ORDER_VBGR: ++ for ( ; h > 0; h--, in_line += pitch*3, out_line += stride_rgba) { ++ unsigned char* in = in_line; ++ int* out = (int*)out_line; ++ int w; ++ ++ for (w = width; w > 0; w--, in += 1, out += 1) { ++ int r = in[2*pitch]; ++ int g = in[pitch]; ++ int b = in[0]; ++ ++ out[0] = (g << 24) | (r << 16) | (g << 8) | b; ++ } ++ } ++ break; ++ } ++ } ++ ++ if (own_buffer) ++ free (bitmap->buffer); ++ data = data_rgba; ++ stride = stride_rgba; ++ format = CAIRO_FORMAT_ARGB32; ++ subpixel = TRUE; ++ break; ++ } ++#else /* !FIR_FILTER */ ++ { + int x, y; + unsigned char *in_line, *out_line, *in; + unsigned int *out; +@@ -871,6 +1088,7 @@ _get_bitmap_surface (FT_Bitmap *bi + subpixel = TRUE; + break; + } ++#endif /* !FIR_FILTER */ + } + break; + case FT_PIXEL_MODE_GRAY2: +@@ -986,12 +1204,22 @@ _render_glyph_outline (FT_Face + matrix.xx *= 3; + hmul = 3; + subpixel = TRUE; ++#ifdef FIR_FILTER ++ cbox.xMin -= 64; ++ cbox.xMax += 64; ++ width += 2; ++#endif + break; + case CAIRO_SUBPIXEL_ORDER_VRGB: + case CAIRO_SUBPIXEL_ORDER_VBGR: + matrix.yy *= 3; + vmul = 3; + subpixel = TRUE; ++#ifdef FIR_FILTER ++ cbox.yMin -= 64; ++ cbox.yMax += 64; ++ height += 2; ++#endif + break; + } + FT_Outline_Transform (outline, &matrix); +Only in libcairo-1.2.4/src: cairo-ft-font.c.orig diff --git a/x11-libs/cairo/files/cairo-1.8.10-libpng14.patch b/x11-libs/cairo/files/cairo-1.8.10-libpng14.patch new file mode 100644 index 0000000..1872367 --- /dev/null +++ b/x11-libs/cairo/files/cairo-1.8.10-libpng14.patch @@ -0,0 +1,11 @@ +--- configure.ac ++++ configure.ac +@@ -161,7 +161,7 @@ + AC_ARG_VAR([png_REQUIRES], [module name for libpng to search for using pkg-config]) + if test "x$png_REQUIRES" = x; then + # libpng13 is GnuWin32's libpng-1.2.8 :-( +- for l in libpng12 libpng13 libpng10 libpng; do ++ for l in libpng14 libpng12 libpng13 libpng10 libpng; do + if $PKG_CONFIG --exists $l ; then + png_REQUIRES=$l + use_png=yes diff --git a/x11-libs/cairo/files/cairo-1.8.8-interix.patch b/x11-libs/cairo/files/cairo-1.8.8-interix.patch new file mode 100644 index 0000000..dc20714 --- /dev/null +++ b/x11-libs/cairo/files/cairo-1.8.8-interix.patch @@ -0,0 +1,16 @@ +diff -ru cairo-1.8.8.orig/build/configure.ac.tools cairo-1.8.8/build/configure.ac.tools +--- cairo-1.8.8.orig/build/configure.ac.tools 2009-09-30 13:36:42 +0200 ++++ cairo-1.8.8/build/configure.ac.tools 2009-09-30 13:50:50 +0200 +@@ -21,5 +21,12 @@ + *) PKGCONFIG_REQUIRES="Requires.private"; ;; + esac + ++dnl hmm... on interix, things go really bad with Requires.private, since libpng12 ++dnl is missing on the final link commands, so gtk+'s configure checks for cairo ++dnl fail miserably with unresolved symbols to it. ++case "$host_os" in ++interix*) PKGCONFIG_REQUIRES="Requires" ;; ++esac ++ + AC_SUBST(PKGCONFIG_REQUIRES) + diff --git a/x11-libs/cairo/files/cairo-respect-fontconfig.patch b/x11-libs/cairo/files/cairo-respect-fontconfig.patch new file mode 100644 index 0000000..b0a1b29 --- /dev/null +++ b/x11-libs/cairo/files/cairo-respect-fontconfig.patch @@ -0,0 +1,13 @@ +--- cairo-1.7.6-orig/src/cairo-ft-font.c 2008-09-29 21:43:13.000000000 +0100 ++++ cairo-1.7.6/src/cairo-ft-font.c 2008-09-29 21:52:19.000000000 +0100 +@@ -1705,7 +1705,9 @@ + options->base.subpixel_order = other->base.subpixel_order; + } + +- if (options->base.hint_style == CAIRO_HINT_STYLE_DEFAULT) ++ options->base.hint_style = CAIRO_HINT_STYLE_DEFAULT; ++ ++ if (other->base.hint_style != CAIRO_HINT_STYLE_DEFAULT) + options->base.hint_style = other->base.hint_style; + + if (other->base.hint_style == CAIRO_HINT_STYLE_NONE) -- cgit v1.2.3-70-g09d2