Revision: 75347 http://trac.macports.org/changeset/75347 Author: ryandesign@macports.org Date: 2011-01-22 17:37:37 -0800 (Sat, 22 Jan 2011) Log Message: ----------- gnofract4d: fix build with libpng 1.4 (#28089); switch to python 2.7; actually use jpeg Modified Paths: -------------- trunk/dports/gnome/gnofract4d/Portfile Added Paths: ----------- trunk/dports/gnome/gnofract4d/files/patch-fract4d-c-imageIO.cpp.diff trunk/dports/gnome/gnofract4d/files/patch-setup.py.diff Modified: trunk/dports/gnome/gnofract4d/Portfile =================================================================== --- trunk/dports/gnome/gnofract4d/Portfile 2011-01-22 23:16:08 UTC (rev 75346) +++ trunk/dports/gnome/gnofract4d/Portfile 2011-01-23 01:37:37 UTC (rev 75347) @@ -1,11 +1,11 @@ # $Id$ PortSystem 1.0 -PortGroup python26 1.0 +PortGroup python27 1.0 name gnofract4d version 3.12 -revision 1 +revision 2 description Gnofract4D is a descendant of gnofract. long_description ${description} maintainers nomaintainer @@ -20,12 +20,18 @@ dist_subdir ${name} -depends_lib-append port:py26-gtk \ +depends_lib-append port:py27-gtk \ port:jpeg \ port:libpng -patchfiles patch-fract4d_fractconfig.py.diff +patchfiles patch-fract4d_fractconfig.py.diff \ + patch-fract4d-c-imageIO.cpp.diff \ + patch-setup.py.diff +post-patch { + reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/setup.py +} + python.link_binaries no post-destroot { ln -s "${python.prefix}/bin/${name}" "${destroot}${prefix}/bin/${name}" Added: trunk/dports/gnome/gnofract4d/files/patch-fract4d-c-imageIO.cpp.diff =================================================================== --- trunk/dports/gnome/gnofract4d/files/patch-fract4d-c-imageIO.cpp.diff (rev 0) +++ trunk/dports/gnome/gnofract4d/files/patch-fract4d-c-imageIO.cpp.diff 2011-01-23 01:37:37 UTC (rev 75347) @@ -0,0 +1,47 @@ +--- fract4d/c/imageIO.cpp.orig 2007-07-03 22:50:02.000000000 -0500 ++++ fract4d/c/imageIO.cpp 2011-01-22 19:25:22.000000000 -0600 +@@ -119,7 +119,7 @@ + info_ptr = png_create_info_struct(png_ptr); + if(NULL == info_ptr) + { +- png_destroy_write_struct(&png_ptr, png_infopp_NULL); ++ png_destroy_write_struct(&png_ptr, (png_infopp)NULL); + return; + } + +@@ -312,7 +312,7 @@ + info_ptr = png_create_info_struct(png_ptr); + if (info_ptr == NULL) + { +- png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL); ++ png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL); + return; + } + +@@ -325,7 +325,7 @@ + //printf("shutdown\n"); + if(ok) + { +- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); ++ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); + } + } + +@@ -351,7 +351,7 @@ + + //printf("get IHDR\n"); + png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, +- &interlace_type, int_p_NULL, int_p_NULL); ++ &interlace_type, (int *)NULL, (int *)NULL); + + //printf("set res(%d,%d)\n",width,height); + if(!im->set_resolution(width, height, -1, -1)) +@@ -372,7 +372,7 @@ + for (int y = 0; y < im->Yres(); y++) + { + png_bytep row = (png_bytep)(im->getBuffer() + im->row_length() * y); +- png_read_rows(png_ptr, &row, png_bytepp_NULL, 1); ++ png_read_rows(png_ptr, &row, NULL, 1); + } + } + return true; Added: trunk/dports/gnome/gnofract4d/files/patch-setup.py.diff =================================================================== --- trunk/dports/gnome/gnofract4d/files/patch-setup.py.diff (rev 0) +++ trunk/dports/gnome/gnofract4d/files/patch-setup.py.diff 2011-01-23 01:37:37 UTC (rev 75347) @@ -0,0 +1,11 @@ +--- setup.py.orig 2009-05-17 18:27:17.000000000 -0500 ++++ setup.py 2011-01-22 19:30:06.000000000 -0600 +@@ -60,7 +60,7 @@ + png_libs = call_package_config("libpng", "--libs", True) + + jpg_lib = "jpeg" +-if os.path.isfile("/usr/include/jpeglib.h"): ++if os.path.isfile("@PREFIX@/include/jpeglib.h"): + extra_macros.append(('JPG_ENABLED', 1)) + jpg_libs = [ jpg_lib ] + else: