cairo: bump to 1.8.10

This commit bumps Cairo to 1.8.10 and updates the DirectFB support
patch. The work has been done by Lionel Landwerlin
<llandwerlin@gmail.com>.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2010-07-19 10:45:45 +02:00
parent 8a1468be5b
commit ce408ef0af
3 changed files with 41 additions and 1013 deletions

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,39 @@
diff --git a/src/cairo-directfb-surface.c b/src/cairo-directfb-surface.c
index bb02dbf..65f2d55 100644
--- a/src/cairo-directfb-surface.c
+++ b/src/cairo-directfb-surface.c
@@ -609,6 +609,8 @@ _cairo_directfb_surface_release_dest_image (void *abstract_surf
surface->dfbsurface->Blit (surface->dfbsurface,
buffer, NULL,
image_rect->x, image_rect->y));
+
+ surface->dfbsurface->ReleaseSource (surface->dfbsurface);
}
cairo_surface_destroy (&image->base);
@@ -848,6 +850,9 @@ _directfb_finish_composite (cairo_directfb_surface_t *dst,
cairo_surface_attributes_t *src_attr)
{
_cairo_pattern_release_surface (src_pattern, src, src_attr);
+
+ if (dst->dfbsurface)
+ dst->dfbsurface->ReleaseSource( dst->dfbsurface );
}
#endif /* DFB_COMPOSITE || DFB_COMPOSITE_TRAPEZOIDS */
@@ -1555,6 +1560,7 @@ _directfb_acquire_font_cache (cairo_directfb_surface_t *surface,
new_cache->dfbsurface->Blit (new_cache->dfbsurface,
cache->dfbsurface, NULL, 0, 0);
+ new_cache->dfbsurface->ReleaseSource (new_cache->dfbsurface);
_directfb_destroy_font_cache (cache);
scaled_font->surface_private = cache = new_cache;
@@ -1778,6 +1784,7 @@ _cairo_directfb_surface_show_glyphs (void *abstract_dst,
RUN_CLIPPED (dst, NULL,
dst->dfbsurface->BatchBlit (dst->dfbsurface,
cache->dfbsurface, rects, points, num));
+ dst->dfbsurface->ReleaseSource (dst->dfbsurface);
return CAIRO_STATUS_SUCCESS;
}

View File

@ -3,12 +3,13 @@
# cairo
#
#############################################################
CAIRO_VERSION = 1.6.4
CAIRO_VERSION = 1.8.10
CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.gz
CAIRO_SITE = http://cairographics.org/releases
CAIRO_AUTORECONF = NO
CAIRO_INSTALL_STAGING = YES
CAIRO_INSTALL_TARGET = YES
CAIRO_LIBTOOL_PATCH = NO
CAIRO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
glib_cv_uscore=no ac_cv_func_strtod=yes \