Commit dfa93b47 authored by Will Newton's avatar Will Newton Committed by Peter Korsgaard
Browse files

cairo: Bump version to 1.10.2 



Update the DirectFB patch as it no longer applied cleanly.

[Peter: drop redundant AUTORECONF = NO line]
Signed-off-by: default avatarWill Newton <will.newton@imgtec.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent a2a9f635

package/cairo/cairo-1.8.10-directfb.patch→package/cairo/cairo-1.10.2-directfb.patch

+36 −0
Original line number Diff line number Diff line 
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

--- cairo-1.10.2/src/cairo-directfb-surface.c	2010-06-18 12:47:12.000000000 +0100

+++ cairo-1.10.2.mod/src/cairo-directfb-surface.c	2012-02-02 11:40:57.835273391 +0000

@@ -700,6 +700,7 @@

 	surface->dfbsurface->Blit (surface->dfbsurface,

 				   buffer, NULL,

 						image_rect->x, image_rect->y));

+

 				   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,

@@ -928,6 +929,9 @@

                             cairo_surface_attributes_t *src_attr)

 {

     _cairo_pattern_release_surface (src_pattern, src, src_attr);
@@ -21,7 +18,7 @@ index bb02dbf..65f2d55 100644 
 }

 #endif /* DFB_COMPOSITE || DFB_COMPOSITE_TRAPEZOIDS */

 

@@ -1555,6 +1560,7 @@ _directfb_acquire_font_cache (cairo_directfb_surface_t     *surface,

@@ -1584,6 +1588,7 @@

 

 	    new_cache->dfbsurface->Blit (new_cache->dfbsurface,

 					 cache->dfbsurface, NULL, 0, 0);
@@ -29,8 +26,8 @@ index bb02dbf..65f2d55 100644 
 

 	    _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,

@@ -1809,6 +1814,7 @@

     RUN_CLIPPED (dst, clip_region, NULL,

 		 dst->dfbsurface->BatchBlit (dst->dfbsurface,

 					     cache->dfbsurface, rects, points, num));

+    dst->dfbsurface->ReleaseSource (dst->dfbsurface);

package/cairo/cairo.mk

+1 −3
Original line number Diff line number Diff line
@@ -3,12 +3,10 @@ 
# cairo

#

#############################################################

CAIRO_VERSION = 1.8.10

CAIRO_VERSION = 1.10.2

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_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \

		glib_cv_uscore=no ac_cv_func_strtod=yes \