Fri Jan 14 10:20:02 2011 UTC ()
Fix build with png-1.5.
(wiz)
diff -r1.5 -r1.6 pkgsrc/graphics/gegl/distinfo
diff -r0 -r1.3 pkgsrc/graphics/gegl/patches/patch-ab
--- pkgsrc/graphics/gegl/distinfo 2010/06/14 18:48:32 1.5
+++ pkgsrc/graphics/gegl/distinfo 2011/01/14 10:20:00 1.6
| @@ -1,7 +1,8 @@ | | | @@ -1,7 +1,8 @@ |
| 1 | $NetBSD: distinfo,v 1.5 2010/06/14 18:48:32 drochner Exp $ | | 1 | $NetBSD: distinfo,v 1.6 2011/01/14 10:20:00 wiz Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (gegl-0.1.2.tar.bz2) = 34b4a6be9e472324d6dd1233713a1f8851fcdc04 | | 3 | SHA1 (gegl-0.1.2.tar.bz2) = 34b4a6be9e472324d6dd1233713a1f8851fcdc04 |
| 4 | RMD160 (gegl-0.1.2.tar.bz2) = e03faeac7ba3024f64ed0c43a22cf433f8e5eb19 | | 4 | RMD160 (gegl-0.1.2.tar.bz2) = e03faeac7ba3024f64ed0c43a22cf433f8e5eb19 |
| 5 | Size (gegl-0.1.2.tar.bz2) = 3128704 bytes | | 5 | Size (gegl-0.1.2.tar.bz2) = 3128704 bytes |
| 6 | SHA1 (patch-aa) = 5eeefaaa80a93eefd73dba81eff88652e5213167 | | 6 | SHA1 (patch-aa) = 5eeefaaa80a93eefd73dba81eff88652e5213167 |
| | | 7 | SHA1 (patch-ab) = d0b931d0b31861655d5dda4db4988b4d126016ce |
| 7 | SHA1 (patch-ac) = b34d1fd99e26dc64fe160076b4ac9dcad48fdc86 | | 8 | SHA1 (patch-ac) = b34d1fd99e26dc64fe160076b4ac9dcad48fdc86 |
$NetBSD: patch-ab,v 1.3 2011/01/14 10:20:01 wiz Exp $
Fix build with png-1.5.
--- operations/external/png-load.c.orig 2010-02-07 14:43:55.000000000 +0000
+++ operations/external/png-load.c
@@ -181,7 +181,7 @@ gegl_buffer_import_png (GeglBuffer *geg
if (interlace_type == PNG_INTERLACE_ADAM7)
number_of_passes = png_set_interlace_handling (load_png_ptr);
- if (load_info_ptr->valid & PNG_INFO_gAMA)
+ if (png_get_valid(load_png_ptr, load_info_ptr, PNG_INFO_gAMA))
{
gdouble gamma;
png_get_gAMA (load_png_ptr, load_info_ptr, &gamma);
@@ -298,7 +298,7 @@ static gint query_png (const gchar *path
*width = w;
*height = h;
- if (load_info_ptr->valid & PNG_INFO_tRNS)
+ if (png_get_valid(load_png_ptr, load_info_ptr, PNG_INFO_tRNS))
color_type |= PNG_COLOR_MASK_ALPHA;
if (color_type & PNG_COLOR_TYPE_RGB)