summaryrefslogtreecommitdiff
path: root/graphics/evas
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2011-01-31 10:17:41 +0000
committerwiz <wiz@pkgsrc.org>2011-01-31 10:17:41 +0000
commitdda8d0e229838de0689f1f10972a8919ab1203b4 (patch)
tree3430c4195502c5e4a484d08e2273d3827a63a740 /graphics/evas
parenta70ebcd5cb104732117ba25d38e5200d1812f466 (diff)
downloadpkgsrc-dda8d0e229838de0689f1f10972a8919ab1203b4.tar.gz
Fix build with png-1.5.
Diffstat (limited to 'graphics/evas')
-rw-r--r--graphics/evas/Makefile.common3
-rw-r--r--graphics/evas/distinfo3
-rw-r--r--graphics/evas/patches/patch-aa58
3 files changed, 62 insertions, 2 deletions
diff --git a/graphics/evas/Makefile.common b/graphics/evas/Makefile.common
index 4a286ab14dd..cb0eeea55ba 100644
--- a/graphics/evas/Makefile.common
+++ b/graphics/evas/Makefile.common
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile.common,v 1.8 2010/01/09 15:33:07 joerg Exp $
+# $NetBSD: Makefile.common,v 1.9 2011/01/31 10:17:41 wiz Exp $
+# used by graphics/evas-png/Makefile
DISTNAME= evas-0.9.9.063
CATEGORIES= graphics
diff --git a/graphics/evas/distinfo b/graphics/evas/distinfo
index 26a2cdbabda..0121e1917ec 100644
--- a/graphics/evas/distinfo
+++ b/graphics/evas/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2009/12/17 00:48:43 joerg Exp $
+$NetBSD: distinfo,v 1.6 2011/01/31 10:17:41 wiz Exp $
SHA1 (evas-0.9.9.063.tar.gz) = b729028600dcdbd3d567725497cd0b174667a368
RMD160 (evas-0.9.9.063.tar.gz) = 58e867827b4180f4f4f71b7296221a4cfb0a4123
Size (evas-0.9.9.063.tar.gz) = 4946611 bytes
+SHA1 (patch-aa) = 40f243c8a07006f13535e8eb5cb784214b4590ee
diff --git a/graphics/evas/patches/patch-aa b/graphics/evas/patches/patch-aa
new file mode 100644
index 00000000000..777bf9e1bb8
--- /dev/null
+++ b/graphics/evas/patches/patch-aa
@@ -0,0 +1,58 @@
+$NetBSD: patch-aa,v 1.1 2011/01/31 10:17:41 wiz Exp $
+
+Fix build with png-1.5.
+
+--- src/modules/savers/png/evas_image_save_png.c.orig 2009-06-18 08:02:54.000000000 +0000
++++ src/modules/savers/png/evas_image_save_png.c
+@@ -40,7 +40,7 @@ save_image_png(RGBA_Image *im, const cha
+ png_structp png_ptr;
+ png_infop info_ptr;
+ DATA32 *ptr, *data = NULL;
+- int x, y, j;
++ int x, y, j, p_interlace;
+ png_bytep row_ptr, png_data = NULL;
+ png_color_8 sig_bit;
+ int num_passes = 1, pass;
+@@ -68,11 +68,11 @@ save_image_png(RGBA_Image *im, const cha
+ goto close_file;
+ }
+
++ p_interlace = PNG_INTERLACE_NONE;
+ if (interlace)
+ {
+ #ifdef PNG_WRITE_INTERLACING_SUPPORTED
+- png_ptr->interlaced = PNG_INTERLACE_ADAM7;
+- num_passes = png_set_interlace_handling(png_ptr);
++ p_interlace = PNG_INTERLACE_ADAM7;
+ #endif
+ }
+
+@@ -89,7 +89,7 @@ save_image_png(RGBA_Image *im, const cha
+ evas_common_convert_argb_unpremul(data, im->cache_entry.w * im->cache_entry.h);
+ png_init_io(png_ptr, f);
+ png_set_IHDR(png_ptr, info_ptr, im->cache_entry.w, im->cache_entry.h, 8,
+- PNG_COLOR_TYPE_RGB_ALPHA, png_ptr->interlaced,
++ PNG_COLOR_TYPE_RGB_ALPHA, p_interlace,
+ PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+ #ifdef WORDS_BIGENDIAN
+ png_set_swap_alpha(png_ptr);
+@@ -102,7 +102,7 @@ save_image_png(RGBA_Image *im, const cha
+ data = im->image.data;
+ png_init_io(png_ptr, f);
+ png_set_IHDR(png_ptr, info_ptr, im->cache_entry.w, im->cache_entry.h, 8,
+- PNG_COLOR_TYPE_RGB, png_ptr->interlaced,
++ PNG_COLOR_TYPE_RGB, p_interlace,
+ PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+ png_data = alloca(im->cache_entry.w * 3 * sizeof(char));
+ }
+@@ -117,6 +117,10 @@ save_image_png(RGBA_Image *im, const cha
+ png_set_shift(png_ptr, &sig_bit);
+ png_set_packing(png_ptr);
+
++#ifdef PNG_WRITE_INTERLACING_SUPPORTED
++ num_passes = png_set_interlace_handling(png_ptr);
++#endif
++
+ for (pass = 0; pass < num_passes; pass++)
+ {
+ ptr = data;