Commit 3fdf2805 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Merge branch 'various-bumps' of git://git.busybox.net/~tpetazzoni/git/buildroot

parents f2860bbc 3c77bab2

package/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -267,6 +267,7 @@ source "package/gtk2-themes/Config.in" 
source "package/jpeg/Config.in"

source "package/libart/Config.in"

source "package/libdrm/Config.in"

source "package/libgail/Config.in"

source "package/libglade/Config.in"

source "package/libgtk12/Config.in"

source "package/libgtk2/Config.in"

package/atk/atk.mk

+4 −2
Original line number Diff line number Diff line
@@ -3,11 +3,13 @@ 
# atk

#

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

ATK_VERSION = 1.22.0

ATK_VERSION_MAJOR = 1.30

ATK_VERSION = $(ATK_VERSION_MAJOR).0

ATK_SOURCE = atk-$(ATK_VERSION).tar.bz2

ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/1.22/

ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR)/

ATK_INSTALL_STAGING = YES

ATK_INSTALL_TARGET = YES

ATK_LIBTOOL_PATCH = NO

ATK_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install



ATK_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes \

package/cairo/cairo-1.6.4-directfb-all.patch

deleted100644 → 0
+0 −1012

File deleted.

Preview size limit exceeded, changes collapsed.

package/cairo/cairo-1.8.10-directfb.patch

0 → 100644
+39 −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

 		     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;

 }

package/cairo/cairo.mk

+2 −1
Original line number Diff line number Diff line
@@ -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 \