From patchwork Sun Jan 13 17:11:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sagaert Johan X-Patchwork-Id: 211641 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id B30652C010A for ; Mon, 14 Jan 2013 04:12:46 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 1E012A00E8; Sun, 13 Jan 2013 17:12:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OyRQYeQSdpn3; Sun, 13 Jan 2013 17:12:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 41AA0A00D5; Sun, 13 Jan 2013 17:12:43 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id E941B8F7A0 for ; Sun, 13 Jan 2013 17:12:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 774388AC67 for ; Sun, 13 Jan 2013 17:12:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LLRcwIxD+Ihf for ; Sun, 13 Jan 2013 17:12:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailrelay009.isp.belgacom.be (mailrelay009.isp.belgacom.be [195.238.6.176]) by whitealder.osuosl.org (Postfix) with ESMTP id 03D368AAEF for ; Sun, 13 Jan 2013 17:12:37 +0000 (UTC) X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av0EACbq8lBR8dwC/2dsb2JhbABEvgMXc4JMUk9LN4gdCLM3jgWDKQOWC4Ecjy2Cdg Received: from 2.220-241-81.adsl-dyn.isp.belgacom.be (HELO debian605.apex) ([81.241.220.2]) by relay.skynet.be with ESMTP; 13 Jan 2013 18:12:36 +0100 From: Sagaert Johan To: buildroot@busybox.net Date: Sun, 13 Jan 2013 18:11:22 +0100 Message-Id: <1358097082-24212-1-git-send-email-sagaert.johan@skynet.be> X-Mailer: git-send-email 1.8.0.1 Cc: Sagaert Johan Subject: [Buildroot] [PATCH 1/1 V2] cairo : bump version to 1.12.8 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Patch v2 : The patch for 1.10.2 is no longer needed with cairo version 1.12.8. Signed-off-by: Sagaert Johan Signed-off-by: Sagaert Johan --- package/cairo/cairo-1.10.2-directfb.patch | 36 ------------------------------- package/cairo/cairo.mk | 6 ++---- 2 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 package/cairo/cairo-1.10.2-directfb.patch diff --git a/package/cairo/cairo-1.10.2-directfb.patch b/package/cairo/cairo-1.10.2-directfb.patch deleted file mode 100644 index 8b4c6f7..0000000 --- a/package/cairo/cairo-1.10.2-directfb.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- 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); -+ surface->dfbsurface->ReleaseSource (surface->dfbsurface); - } - - cairo_surface_destroy (&image->base); -@@ -928,6 +929,9 @@ - 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 */ - -@@ -1584,6 +1588,7 @@ - - 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; -@@ -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); - - return CAIRO_STATUS_SUCCESS; - } diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index bd670d9..6cf910a 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -3,10 +3,8 @@ # cairo # ############################################################# -CAIRO_VERSION = 1.12.8 -CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.xz -CAIRO_LICENSE = LGPLv2.1+ -CAIRO_LICENSE_FILES = COPYING +CAIRO_VERSION = 1.10.2 +CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.gz CAIRO_SITE = http://cairographics.org/releases CAIRO_INSTALL_STAGING = YES