[99644] trunk/dports/graphics/flam3

[ryandesign at macports.org]

Revision: 99644
          https://trac.macports.org/changeset/99644
Author:   ryandesign at macports.org
Date:     2012-11-12 20:46:12 -0800 (Mon, 12 Nov 2012)
Log Message:
-----------
flam3: update to 3.0.1; add patch to fix build with libpng 1.5 (#36858)

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

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

Modified: trunk/dports/graphics/flam3/Portfile
===================================================================
--- trunk/dports/graphics/flam3/Portfile	2012-11-13 04:26:02 UTC (rev 99643)
+++ trunk/dports/graphics/flam3/Portfile	2012-11-13 04:46:12 UTC (rev 99644)
@@ -4,10 +4,12 @@
 PortSystem          1.0
 
 name                flam3
-version             2.7.18
-revision            3
+version             3.0.1
 categories          graphics
 maintainers         oxymoronical.com:dtownsend
+# The Google Code page says GPL-2 but source files say GPL-3+
+license             GPL-3+
+
 description         Cosmic Recursive Fractal Flames
 long_description    This is free software to render fractal flames as \
                     described on http://flam3.com. Flam3-animate makes \
@@ -15,15 +17,17 @@
                     Flam3-genome creates and manipulates genomes \
                     (parameter sets).  A C library is also installed.
 homepage            http://flam3.com
-license             GPL
 platforms           darwin
-master_sites        http://flam3.com
+master_sites        googlecode
 
-checksums           md5 052faba777634799b2958205ddf05545 \
-                    sha1 e4b6420bc4c47f489903a0fedf66d39f5ada7aaa \
-                    rmd160 abfea3fcbc7dfb2f671c4645364faa487edeee68
+checksums           rmd160  2e834147deb2edc0ee26054cb4fc8b502bce4986 \
+                    sha256  70810049604527a689ba172670c152b463273255e46f0f04091c867399859aa7
 
 depends_lib         port:libpng \
                     port:jpeg \
                     port:libxml2 \
                     port:zlib
+
+worksrcdir          ${worksrcdir}/src
+
+patchfiles          patch-libpng-1.5.diff

Added: trunk/dports/graphics/flam3/files/patch-libpng-1.5.diff
===================================================================
--- trunk/dports/graphics/flam3/files/patch-libpng-1.5.diff	                        (rev 0)
+++ trunk/dports/graphics/flam3/files/patch-libpng-1.5.diff	2012-11-13 04:46:12 UTC (rev 99644)
@@ -0,0 +1,75 @@
+http://code.google.com/p/flam3/source/detail?r=164
+--- png.c	(revision 163)
++++ png.c	(revision 164)
+@@ -142,7 +142,7 @@
+   }
+   if (setjmp(png_jmpbuf(png_ptr))) {
+      if (png_image) {
+-	 for (y = 0 ; y < info_ptr->height ; y++)
++	 for (y = 0 ; y < png_get_image_height(png_ptr, info_ptr) ; y++)
+ 	     free (png_image[y]);
+ 	 free (png_image);
+      }
+@@ -161,19 +161,19 @@
+   png_set_sig_bytes (png_ptr, SIG_CHECK_SIZE);
+   png_read_info (png_ptr, info_ptr);
+ 
+-  if (8 != info_ptr->bit_depth) {
++  if (8 != png_get_bit_depth(png_ptr, info_ptr)) {
+     fprintf(stderr, "bit depth type must be 8, not %d.\n",
+-	    info_ptr->bit_depth);
++	    png_get_bit_depth(png_ptr, info_ptr));
+     return 0;
+   }
+ 
+-  *width = info_ptr->width;
+-  *height = info_ptr->height;
++  *width = png_get_image_width(png_ptr, info_ptr);
++  *height = png_get_image_height(png_ptr, info_ptr);
+   p = q = malloc(4 * *width * *height);
+-  png_image = (png_byte **)malloc (info_ptr->height * sizeof (png_byte*));
++  png_image = (png_byte **)malloc (*height * sizeof (png_byte*));
+ 
+-  linesize = info_ptr->width;
+-  switch (info_ptr->color_type) {
++  linesize = *width;
++  switch (png_get_color_type(png_ptr, info_ptr)) {
+     case PNG_COLOR_TYPE_RGB:
+       linesize *= 3;
+       break;
+@@ -182,21 +182,21 @@
+       break;
+   default:
+     fprintf(stderr, "color type must be RGB or RGBA not %d.\n",
+-	    info_ptr->color_type);
++	    png_get_color_type(png_ptr, info_ptr)); 
+     return 0;
+   }
+ 
+-  for (y = 0 ; y < info_ptr->height ; y++) {
++  for (y = 0 ; y < *height ; y++) {
+     png_image[y] = malloc (linesize);
+   }
+   png_read_image (png_ptr, png_image);
+   png_read_end (png_ptr, info_ptr);
+ 
+-  for (y = 0 ; y < info_ptr->height ; y++) {
++  for (y = 0 ; y < *height ; y++) {
+     unsigned char *s = png_image[y];
+-    for (x = 0 ; x < info_ptr->width ; x++) {
++    for (x = 0 ; x < *width ; x++) {
+ 
+-      switch (info_ptr->color_type) {
++      switch (png_get_color_type(png_ptr, info_ptr)) {
+       case PNG_COLOR_TYPE_RGB:
+ 	p[0] = s[0];
+ 	p[1] = s[1];
+@@ -217,7 +217,7 @@
+     }
+   }
+ 
+-  for (y = 0 ; y < info_ptr->height ; y++)
++  for (y = 0 ; y < *height ; y++)
+     free (png_image[y]);
+   free (png_image);
+   png_destroy_read_struct (&png_ptr, &info_ptr, (png_infopp)NULL);  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121112/756f2093/attachment.html>