Revision
75517
Author
ryandesign@macports.org
Date
2011-01-28 03:55:35 -0800 (Fri, 28 Jan 2011)

Log Message

pngmeta: replace use of private libpng constants (which are now inaccessible in libpng 1.4) with their values; see #28183

Modified Paths

Added Paths

Diff

Modified: trunk/dports/graphics/pngmeta/Portfile (75516 => 75517)


--- trunk/dports/graphics/pngmeta/Portfile	2011-01-27 21:50:42 UTC (rev 75516)
+++ trunk/dports/graphics/pngmeta/Portfile	2011-01-28 11:55:35 UTC (rev 75517)
@@ -13,6 +13,9 @@
 master_sites     sourceforge:pmt
 checksums        md5 5d495f7668f7ccc64a1576c8cfd15506
 depends_lib      port:libpng port:zlib
+
+patchfiles          patch-pngmeta.c.diff
+
 configure.args   --with-png-includes="${prefix}/include" \
                   --with-png-lib="${prefix}/lib" \
                   --with-png="${prefix}/include" --with-zlib="${prefix}/include" \

Added: trunk/dports/graphics/pngmeta/files/patch-pngmeta.c.diff (0 => 75517)


--- trunk/dports/graphics/pngmeta/files/patch-pngmeta.c.diff	                        (rev 0)
+++ trunk/dports/graphics/pngmeta/files/patch-pngmeta.c.diff	2011-01-28 11:55:35 UTC (rev 75517)
@@ -0,0 +1,49 @@
+--- pngmeta.c.orig	2001-05-16 09:41:06.000000000 -0500
++++ pngmeta.c	2011-01-28 05:36:42.000000000 -0600
+@@ -126,15 +126,15 @@
+ 
+      png_reset_crc(png_ptr);
+      png_crc_read(png_ptr, png_ptr->chunk_name, 4);
+-   } while (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4));
++   } while (!png_memcmp(png_ptr->chunk_name, "IDAT", 4));
+    
+    png_ptr->mode |= PNG_AFTER_IDAT;
+    
+    do
+    {
+-     if (!png_memcmp(png_ptr->chunk_name, png_IHDR, 4))
++     if (!png_memcmp(png_ptr->chunk_name, "IHDR", 4))
+        png_handle_IHDR(png_ptr, info_ptr, length);
+-     else if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
++     else if (!png_memcmp(png_ptr->chunk_name, "IDAT", 4))
+      {
+        /* Zero length IDATs are legal after the last IDAT has been
+         * read, but not after other chunks have been read.
+@@ -145,22 +145,22 @@
+          png_crc_finish(png_ptr, 0);
+      }
+ #if defined(PNG_READ_tIME_SUPPORTED)
+-     else if (!png_memcmp(png_ptr->chunk_name, png_tIME, 4))
++     else if (!png_memcmp(png_ptr->chunk_name, "tIME", 4))
+        png_handle_tIME(png_ptr, info_ptr, length);
+ #endif
+ #if defined(PNG_READ_tEXt_SUPPORTED)
+-     else if (!png_memcmp(png_ptr->chunk_name, png_tEXt, 4))
++     else if (!png_memcmp(png_ptr->chunk_name, "tEXt", 4))
+        png_handle_tEXt(png_ptr, info_ptr, length);
+ #endif
+ #if defined(PNG_READ_zTXt_SUPPORTED)
+-     else if (!png_memcmp(png_ptr->chunk_name, png_zTXt, 4))
++     else if (!png_memcmp(png_ptr->chunk_name, "zTXt", 4))
+        png_handle_zTXt(png_ptr, info_ptr, length);
+ #endif
+ #if defined(PNG_READ_iTXt_SUPPORTED)
+-      else if (!png_memcmp(png_ptr->chunk_name, png_iTXt, 4))
++      else if (!png_memcmp(png_ptr->chunk_name, "iTXt", 4))
+          png_handle_iTXt(png_ptr, info_ptr, length);
+ #endif
+-     else if (!png_memcmp(png_ptr->chunk_name, png_IEND, 4))
++     else if (!png_memcmp(png_ptr->chunk_name, "IEND", 4))
+        png_handle_IEND(png_ptr, info_ptr, length);
+      else
+        png_handle_unknown(png_ptr, info_ptr, length);