[98806] trunk/dports/devel/camlimages

[jmr at macports.org]

Revision: 98806
          http://trac.macports.org//changeset/98806
Author:   jmr at macports.org
Date:     2012-10-16 22:51:13 -0700 (Tue, 16 Oct 2012)
Log Message:
-----------
camlimages: fix build with libpng 1.5 (#35952), remove fuzzy patch that should no longer be needed

Modified Paths:
--------------
    trunk/dports/devel/camlimages/Portfile

Added Paths:
-----------
    trunk/dports/devel/camlimages/files/patch-pngwrite.c.diff

Removed Paths:
-------------
    trunk/dports/devel/camlimages/files/patch-tiffread.c.diff

Modified: trunk/dports/devel/camlimages/Portfile
===================================================================
--- trunk/dports/devel/camlimages/Portfile	2012-10-17 05:44:55 UTC (rev 98805)
+++ trunk/dports/devel/camlimages/Portfile	2012-10-17 05:51:13 UTC (rev 98806)
@@ -15,7 +15,7 @@
 				to render TrueType fonts.
 homepage			http://gallium.inria.fr/camlimages/
 
-patchfiles			patch-tiffread.c.diff patch-src-jpegread.c.diff
+patchfiles			patch-src-jpegread.c.diff patch-pngwrite.c.diff
 
 platforms			darwin
 

Added: trunk/dports/devel/camlimages/files/patch-pngwrite.c.diff
===================================================================
--- trunk/dports/devel/camlimages/files/patch-pngwrite.c.diff	                        (rev 0)
+++ trunk/dports/devel/camlimages/files/patch-pngwrite.c.diff	2012-10-17 05:51:13 UTC (rev 98806)
@@ -0,0 +1,20 @@
+--- src/pngwrite.c.orig	2011-06-23 04:04:32.000000000 +1000
++++ src/pngwrite.c	2012-10-17 16:39:41.000000000 +1100
+@@ -62,7 +62,7 @@ value write_png_file_rgb( name, buffer, 
+   }
+ 
+   /* error handling */
+-  if (setjmp(png_ptr->jmpbuf)) {
++  if (setjmp(png_jmpbuf(png_ptr))) {
+     /* Free all of the memory associated with the png_ptr and info_ptr */
+     png_destroy_write_struct(&png_ptr, &info_ptr);
+     fclose(fp);
+@@ -171,7 +171,7 @@ value write_png_file_index( name, buffer
+   }
+ 
+   /* error handling */
+-  if (setjmp(png_ptr->jmpbuf)) {
++  if (setjmp(png_jmpbuf(png_ptr))) {
+     /* Free all of the memory associated with the png_ptr and info_ptr */
+     png_destroy_write_struct(&png_ptr, &info_ptr);
+     fclose(fp);

Deleted: trunk/dports/devel/camlimages/files/patch-tiffread.c.diff
===================================================================
--- trunk/dports/devel/camlimages/files/patch-tiffread.c.diff	2012-10-17 05:44:55 UTC (rev 98805)
+++ trunk/dports/devel/camlimages/files/patch-tiffread.c.diff	2012-10-17 05:51:13 UTC (rev 98806)
@@ -1,13 +0,0 @@
---- src/tiffread.c.orig	2004-09-21 23:56:44.000000000 +0200
-+++ src/tiffread.c		2006-03-02 19:33:47.000000000 +0100
-@@ -33,6 +33,10 @@
- #undef int32
- #undef uint32
- 
-+#include <stdint.h>
-+#define uint16 uint16_t
-+#define uint32 uint32_t
-+
- extern value *imglib_error;
- 
- value open_tiff_file_for_read( name )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121016/6dda642d/attachment.html>