Skip to contentSkip to conversation

cairo : bump version to 1.12.8

PATCH New Sagaert Johan 2 participants 3 messages Jan 13, 2013 – Jan 14, 2013

lore
Share & tools
lore

Sagaert Johan

author
#0 lore raw

PATCH v2 1/1 cairo : bump version to 1.12.8

Patch v2 : The patch for 1.10.2 is no longer needed with cairo version 1.12.8.

Signed-off-by Sagaert Johan <[email protected]>
---
 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
package/cairo/cairo-1.10.2-directfb.patch deleted +0 -36
deleted file mode 100644
index 8b4c6f7..0000000
@@ -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;
- }
package/cairo/cairo.mk +2 -4
index bd670d9..6cf910a 100644
@@ -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
Signature · 1 line
1.8.0.1
#1 lore raw

PATCH v2 1/1 cairo : bump version to 1.12.8

Dear Sagaert Johan,

Quoted 2 lines · Sagaert Johan

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 <[email protected]>

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

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#2 lore raw

PATCH v2 1/1 cairo : bump version to 1.12.8

In reply to Sagaert Johan

Dear Sagaert Johan,

Quoted 8 lines · Sagaert Johan

Patch v2 : The patch for 1.10.2 is no longer needed with cairo version 1.12.8.

Signed-off-by Sagaert Johan <[email protected]>
---
 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

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com