Fix build with png-1.5.

4 files changed, 102 insertions, 2 deletions

diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo
index f4a1fa23c9b..f961c429181 100644
--- a/graphics/opencv/distinfo
+++ b/graphics/opencv/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2010/12/06 16:55:23 wiz Exp $
+$NetBSD: distinfo,v 1.6 2011/01/14 11:22:37 wiz Exp $
 
 SHA1 (OpenCV-2.2.0.tar.bz2) = 984ed71672d50391d0617fce2ef58e7590ec0fd7
 RMD160 (OpenCV-2.2.0.tar.bz2) = 57aedb7678964f43af3f1c838a8266c7b4869b01
 Size (OpenCV-2.2.0.tar.bz2) = 19800873 bytes
 SHA1 (patch-aa) = 58ac9aef394eedaf0be9afd725820b1acf54cd36
+SHA1 (patch-ab) = 58686f3ced10cdb432671031528825cb7dae02de
diff --git a/graphics/opencv/patches/patch-ab b/graphics/opencv/patches/patch-ab
new file mode 100644
index 00000000000..3e48f3addd0
--- /dev/null
+++ b/graphics/opencv/patches/patch-ab
@@ -0,0 +1,59 @@
+$NetBSD: patch-ab,v 1.4 2011/01/14 11:22:37 wiz Exp $
+
+Fix build with png-1.5.
+
+--- modules/highgui/src/grfmt_png.cpp.orig	2010-12-05 03:35:25.000000000 +0000
++++ modules/highgui/src/grfmt_png.cpp
+@@ -56,6 +56,7 @@
+ #else
+ #include <png.h>
+ #endif
++#include <zlib.h>
+ #include "grfmt_png.hpp"
+ 
+ namespace cv
+@@ -107,7 +108,7 @@ void  PngDecoder::close()
+ void  PngDecoder::readDataFromBuf( void* _png_ptr, uchar* dst, size_t size )
+ {
+     png_structp png_ptr = (png_structp)_png_ptr;
+-    PngDecoder* decoder = (PngDecoder*)(png_ptr->io_ptr);
++    PngDecoder* decoder = (PngDecoder*)(png_get_io_ptr(png_ptr));
+     CV_Assert( decoder );
+     const Mat& buf = decoder->m_buf;
+     if( decoder->m_buf_pos + size > buf.cols*buf.rows*buf.elemSize() )
+@@ -138,7 +139,7 @@ bool  PngDecoder::readHeader()
+ 
+         if( info_ptr && end_info )
+         {
+-            if( setjmp( png_ptr->jmpbuf ) == 0 )
++            if( setjmp( png_jmpbuf( png_ptr ) ) == 0 )
+             {
+                 if( !m_buf.empty() )
+                     png_set_read_fn(png_ptr, this, (png_rw_ptr)readDataFromBuf );
+@@ -200,7 +201,7 @@ bool  PngDecoder::readData( Mat& img )
+         png_infop info_ptr = (png_infop)m_info_ptr;
+         png_infop end_info = (png_infop)m_end_info;
+ 
+-        if( setjmp(png_ptr->jmpbuf) == 0 )
++        if( setjmp( png_jmpbuf ( png_ptr ) ) == 0 )
+         {
+             int y;
+ 
+@@ -280,7 +281,7 @@ void PngEncoder::writeDataToBuf(void* _p
+     if( size == 0 )
+         return;
+     png_structp png_ptr = (png_structp)_png_ptr;
+-    PngEncoder* encoder = (PngEncoder*)(png_ptr->io_ptr);
++    PngEncoder* encoder = (PngEncoder*)(png_get_io_ptr(png_ptr));
+     CV_Assert( encoder && encoder->m_buf );
+     size_t cursz = encoder->m_buf->size();
+     encoder->m_buf->resize(cursz + size);
+@@ -322,7 +323,7 @@ bool  PngEncoder::write( const Mat& img,
+ 
+         if( info_ptr )
+         {
+-            if( setjmp( png_ptr->jmpbuf ) == 0 )
++            if( setjmp( png_jmpbuf ( png_ptr ) ) == 0 )
+             {
+                 if( m_buf )
+                 {
diff --git a/graphics/plotutils/distinfo b/graphics/plotutils/distinfo
index d11ff643748..21e51fbb913 100644
--- a/graphics/plotutils/distinfo
+++ b/graphics/plotutils/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2010/05/02 13:28:43 wiz Exp $
+$NetBSD: distinfo,v 1.6 2011/01/14 11:30:36 wiz Exp $
 
 SHA1 (plotutils-2.6.tar.gz) = 7921301d9dfe8991e3df2829bd733df6b2a70838
 RMD160 (plotutils-2.6.tar.gz) = 2a32244eb20e00b82a0742dde7b690f688e82774
 Size (plotutils-2.6.tar.gz) = 3657562 bytes
+SHA1 (patch-aa) = 953805bbe32d8e049cdd4de79cd8b4a77a49fc04
diff --git a/graphics/plotutils/patches/patch-aa b/graphics/plotutils/patches/patch-aa
new file mode 100644
index 00000000000..6123223d255
--- /dev/null
+++ b/graphics/plotutils/patches/patch-aa
@@ -0,0 +1,39 @@
+$NetBSD: patch-aa,v 1.6 2011/01/14 11:30:36 wiz Exp $
+
+Fix build with png-1.5.
+
+--- libplot/z_write.c.orig	2008-07-16 00:54:10.000000000 +0000
++++ libplot/z_write.c
+@@ -164,7 +164,7 @@ _pl_z_maybe_output_image (S___(Plotter *
+     }
+ 
+   /* cleanup after libpng errors (error handler does a longjmp) */
+-  if (setjmp (png_ptr->jmpbuf))
++  if (setjmp (png_jmpbuf (png_ptr)))
+     {
+       png_destroy_write_struct (&png_ptr, (png_info **)NULL);
+       return -1;
+@@ -444,7 +444,11 @@ _our_error_fn_stdio (png_struct *png_ptr
+ #endif
+     }
+ 
++#if (PNG_LIBPNG_VER < 10500)
+   longjmp (png_ptr->jmpbuf, 1);
++#else
++  png_longjmp (png_ptr, 1);
++#endif
+ }
+ 
+ static void 
+@@ -515,7 +519,11 @@ _our_error_fn_stream (png_struct *png_pt
+ #endif
+     }
+ 
++#if (PNG_LIBPNG_VER < 10500)
+   longjmp (png_ptr->jmpbuf, 1);
++#else
++  png_longjmp (png_ptr, 1);
++#endif
+ }
+ 
+ static void