[97333] trunk/dports/graphics/autotrace

[ryandesign at macports.org]

Revision: 97333
          https://trac.macports.org/changeset/97333
Author:   ryandesign at macports.org
Date:     2012-09-03 22:44:44 -0700 (Mon, 03 Sep 2012)
Log Message:
-----------
autotrace: fix build with libpng 1.5 (#35953)

Modified Paths:
--------------
    trunk/dports/graphics/autotrace/Portfile

Added Paths:
-----------
    trunk/dports/graphics/autotrace/files/patch-libpng-1.5.diff

Modified: trunk/dports/graphics/autotrace/Portfile
===================================================================
--- trunk/dports/graphics/autotrace/Portfile	2012-09-04 05:12:20 UTC (rev 97332)
+++ trunk/dports/graphics/autotrace/Portfile	2012-09-04 05:44:44 UTC (rev 97333)
@@ -29,7 +29,8 @@
 	xinstall ${filespath}/pstoedit-config ${workpath}/bin
 }
 
-patchfiles			patch-autotrace.m4.diff
+patchfiles			patch-autotrace.m4.diff \
+					patch-libpng-1.5.diff
 
 configure.args		--mandir=${prefix}/share/man \
 					--with-magick \

Added: trunk/dports/graphics/autotrace/files/patch-libpng-1.5.diff
===================================================================
--- trunk/dports/graphics/autotrace/files/patch-libpng-1.5.diff	                        (rev 0)
+++ trunk/dports/graphics/autotrace/files/patch-libpng-1.5.diff	2012-09-04 05:44:44 UTC (rev 97333)
@@ -0,0 +1,59 @@
+Fix build with libpng 1.5
+--- input-png.c.orig	2002-10-10 20:44:14.000000000 +0000
++++ input-png.c
+@@ -42,17 +42,17 @@ static png_bytep * read_png(png_structp 
+ 
+ static void handle_warning(png_structp png, const at_string message) {
+         LOG1("PNG warning: %s", message);
+-	at_exception_warning((at_exception_type *)png->error_ptr,
++	at_exception_warning((at_exception_type *)png_get_error_ptr(png),
+ 			     message);
+-	/* at_exception_fatal((at_exception_type *)at_png->error_ptr,
++	/* at_exception_fatal((at_exception_type *)png_get_error_ptr(at_png),
+ 	   "PNG warning"); */
+ }
+ 
+ static void handle_error(png_structp png, const at_string message) {
+ 	LOG1("PNG error: %s", message);
+-	at_exception_fatal((at_exception_type *)png->error_ptr,
++	at_exception_fatal((at_exception_type *)png_get_error_ptr(png),
+ 			   message);
+-	/* at_exception_fatal((at_exception_type *)at_png->error_ptr,
++	/* at_exception_fatal((at_exception_type *)png_get_error_ptr(at_png),
+ 	   "PNG error"); */
+ 	
+ }
+@@ -157,8 +157,8 @@ read_png(png_structp png_ptr, png_infop 
+ 
+ 	png_set_strip_16(png_ptr);
+ 	png_set_packing(png_ptr);
+-	if ((png_ptr->bit_depth < 8) ||
+-	    (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ||
++	if ((png_get_bit_depth(png_ptr, info_ptr) < 8) ||
++	    (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE) ||
+ 	    (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)))
+ 		png_set_expand(png_ptr);
+ 
+@@ -181,20 +181,10 @@ read_png(png_structp png_ptr, png_infop 
+ 				   PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
+ 	} else
+ 		png_set_strip_alpha(png_ptr);
++	png_set_interlace_handling(png_ptr);
+ 	png_read_update_info(png_ptr, info_ptr);
+ 
+-
+-	info_ptr->row_pointers = (png_bytepp)png_malloc(png_ptr,
+-							info_ptr->height * sizeof(png_bytep));
+-#ifdef PNG_FREE_ME_SUPPORTED
+-	info_ptr->free_me |= PNG_FREE_ROWS;
+-#endif
+-	for (row = 0; row < (int)info_ptr->height; row++)
+-		info_ptr->row_pointers[row] = (png_bytep)png_malloc(png_ptr,
+-								    png_get_rowbytes(png_ptr, info_ptr));
+-	
+-	png_read_image(png_ptr, info_ptr->row_pointers);
+-	info_ptr->valid |= PNG_INFO_IDAT;
++	png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, NULL);
+ 	png_read_end(png_ptr, info_ptr);
+ 	return png_get_rows(png_ptr, info_ptr);
+ }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120903/136118f6/attachment-0001.html>