Revision: 99159 http://trac.macports.org//changeset/99159 Author: jmr@macports.org Date: 2012-10-28 14:55:05 -0700 (Sun, 28 Oct 2012) Log Message: ----------- vxl: apply upstream patch to fix build with libpng 1.5 (#36320, maintainer timeout) Modified Paths: -------------- trunk/dports/devel/vxl/Portfile Added Paths: ----------- trunk/dports/devel/vxl/files/libpng15.diff Modified: trunk/dports/devel/vxl/Portfile =================================================================== --- trunk/dports/devel/vxl/Portfile 2012-10-28 21:53:32 UTC (rev 99158) +++ trunk/dports/devel/vxl/Portfile 2012-10-28 21:55:05 UTC (rev 99159) @@ -45,7 +45,8 @@ universal_variant no patchfiles patch-v3p__mpeg2__libmpeg2__idct_altivec.c \ - patch-v3p__mpeg2__libmpeg2__motion_comp_altivec.c + patch-v3p__mpeg2__libmpeg2__motion_comp_altivec.c \ + libpng15.diff if {${configure.compiler} == "clang"} { patchfiles-append \ Added: trunk/dports/devel/vxl/files/libpng15.diff =================================================================== --- trunk/dports/devel/vxl/files/libpng15.diff (rev 0) +++ trunk/dports/devel/vxl/files/libpng15.diff 2012-10-28 21:55:05 UTC (rev 99159) @@ -0,0 +1,42 @@ +--- core/vil/file_formats/vil_png.cxx 2012/04/22 11:00:07 34801 ++++ core/vil/file_formats/vil_png.cxx 2012/04/23 02:12:59 34802 +@@ -189,15 +189,15 @@ + + bool alloc_image() + { +- rows = new png_byte* [info_ptr->height]; ++ rows = new png_byte* [png_get_image_height(png_ptr, info_ptr)]; + if (rows == 0) + return ok = problem("couldn't allocate space for image"); + + unsigned long linesize; + if (png_get_bit_depth(png_ptr, info_ptr) == 16) +- linesize = 2 * info_ptr->width; ++ linesize = 2 * png_get_image_width(png_ptr, info_ptr); + else +- linesize = info_ptr->width; ++ linesize = png_get_image_width(png_ptr, info_ptr); + + if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA) + linesize *= 2; +--- core/vil1/file_formats/vil1_png.cxx 2012/04/22 11:00:07 34801 ++++ core/vil1/file_formats/vil1_png.cxx 2012/04/23 02:12:59 34802 +@@ -181,15 +181,15 @@ + + bool alloc_image() + { +- rows = new png_byte* [info_ptr->height]; ++ rows = new png_byte* [png_get_image_height(png_ptr, info_ptr)]; + if (rows == 0) + return ok = problem("couldn't allocate space for image"); + + unsigned long linesize; + if (png_get_bit_depth( png_ptr, info_ptr ) == 16) +- linesize = 2 * info_ptr->width; ++ linesize = 2 * png_get_image_width(png_ptr, info_ptr); + else +- linesize = info_ptr->width; ++ linesize = png_get_image_width(png_ptr, info_ptr); + + if (png_get_color_type( png_ptr, info_ptr ) == PNG_COLOR_TYPE_GRAY_ALPHA) + linesize *= 2;