Patchwork [1/1,V2] cairo : bump version to 1.12.8

login
register
mail settings
Submitter Sagaert Johan
Date Jan. 13, 2013, 5:11 p.m.
Message ID <1358097082-24212-1-git-send-email-sagaert.johan@skynet.be>
Download mbox | patch
Permalink /patch/211641/
State Not Applicable
Headers show

Comments

Sagaert Johan - Jan. 13, 2013, 5:11 p.m.
Patch v2 : The patch for 1.10.2 is no longer needed with cairo version 1.12.8.
Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
---
 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
Thomas Petazzoni - Jan. 13, 2013, 5:56 p.m.
Dear Sagaert Johan,

On Sun, 13 Jan 2013 18:11:22 +0100, Sagaert Johan wrote:
> 
> Patch v2 : The patch for 1.10.2 is no longer needed with cairo version 1.12.8.

Why? Has it been merged upstream?

Also, your commit log is still improperly formatted. Please look
*carefully*:

==
cairo: bump to version 1.12.8

The patch for 1.10.2 is no longer needed with cairo version 1.12.8

Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
---
Changes since v1:
 - Explain why patch is no longer needed
==

So:

 * There must be *ONE* and only *ONE* empty line between the commit
   title ("cairo: bump ...") and the core of the commit log. You always
   put two newlines, this is useless.

 * There must be *ONE* and only *ONE* empty line between the last
   paragraph of the commit log and the Signed-off-by line.

 * The changelog (which explain the change since the previous versions
   of your patch) must be after the --- marker so that the contents of
   the changelog is not kept in history.

Please look carefully at how other do patches, and try to do the same.
This will avoid you the need to send gazillions of versions of the same
patch just because of basic formatting problems.

Thanks!

Thomas
Thomas Petazzoni - Jan. 14, 2013, 9:59 a.m.
Dear Sagaert Johan,

On Sun, 13 Jan 2013 18:11:22 +0100, Sagaert Johan wrote:
> 
> Patch v2 : The patch for 1.10.2 is no longer needed with cairo version 1.12.8.
> Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
> ---
>  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

This apparently breaks the build in certain configurations:

 http://autobuild.buildroot.org/results/0824b98044bba4c8d75195b8ec59582199a5a3d7/build-end.log
 http://autobuild.buildroot.org/results/7b21c60d7ba1a8df8910d104e21d4545cb37a4c6/build-end.log

Could you have a look?

Thanks!

Thomas

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