[75955] trunk/dports/science/arb

[ryandesign at macports.org]

Revision: 75955
          http://trac.macports.org/changeset/75955
Author:   ryandesign at macports.org
Date:     2011-02-13 11:12:40 -0800 (Sun, 13 Feb 2011)
Log Message:
-----------
arb: fix build with libpng 1.4 and add dependency; see #28276

Modified Paths:
--------------
    trunk/dports/science/arb/Portfile

Added Paths:
-----------
    trunk/dports/science/arb/files/patch-ARB-glpng.diff

Modified: trunk/dports/science/arb/Portfile
===================================================================
--- trunk/dports/science/arb/Portfile	2011-02-13 18:40:15 UTC (rev 75954)
+++ trunk/dports/science/arb/Portfile	2011-02-13 19:12:40 UTC (rev 75955)
@@ -40,12 +40,14 @@
                         port:mesa \
                         port:glw \
                         port:glew \
-                        port:tiff 
+                        port:tiff \
+                        port:libpng
 
 patchfiles              patch-ARB-config.makefile.diff \
                         patch-ARB-makefile.diff \
                         patch-ARB-RNA3D_GlobalHeader.hxx.diff \
-                        patch-ARB-DARWIN.pl.diff
+                        patch-ARB-DARWIN.pl.diff \
+                        patch-ARB-glpng.diff
                        
 worksrcdir              stable_5.0
 

Added: trunk/dports/science/arb/files/patch-ARB-glpng.diff
===================================================================
--- trunk/dports/science/arb/files/patch-ARB-glpng.diff	                        (rev 0)
+++ trunk/dports/science/arb/files/patch-ARB-glpng.diff	2011-02-13 19:12:40 UTC (rev 75955)
@@ -0,0 +1,38 @@
+--- GL/glpng/glpng.c	2008-07-22 05:11:32.000000000 -0400
++++ GL/glpng/glpng.c	2011-02-12 22:24:54.000000000 -0500
+@@ -270,15 +270,15 @@
+     png_bytep  *row_p;
+     double       fileGamma;
+ 
+-    png_uint_32 width, height;
++    png_size_t width, height;
+     int depth, color;
+ 
+-    png_uint_32 i;
++    png_size_t i;
+ 
+     if (pinfo == NULL) return 0;
+ 
+     fread(header, 1, 8, fp);
+-    if (!png_check_sig(header, 8)) return 0;
++    if (!png_sig_cmp(header, 0, 8)) return 0;
+ 
+     png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+     info = png_create_info_struct(png);
+@@ -377,13 +377,13 @@
+     png_bytep  *row_p;
+     double       fileGamma;
+ 
+-    png_uint_32 width, height, rw, rh;
++    png_size_t width, height, rw, rh;
+     int depth, color;
+ 
+-    png_uint_32 i;
++    png_size_t i;
+ 
+     fread(header, 1, 8, fp);
+-    if (!png_check_sig(header, 8)) return 0;
++    if (!png_sig_cmp(header, 0, 8)) return 0;
+ 
+     png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+     info = png_create_info_struct(png);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110213/74da2cb9/attachment.html>