Fix build with png-1.5.

4 files changed, 52 insertions, 2 deletions

diff --git a/graphics/libwmf/distinfo b/graphics/libwmf/distinfo
index 1f995f1b6cd..d796d17f924 100644
--- a/graphics/libwmf/distinfo
+++ b/graphics/libwmf/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.17 2007/09/21 12:00:11 abs Exp $
+$NetBSD: distinfo,v 1.18 2011/01/14 10:46:28 wiz Exp $
 
 SHA1 (libwmf-0.2.8.4.tar.gz) = 822ab3bd0f5e8f39ad732f2774a8e9f18fc91e89
 RMD160 (libwmf-0.2.8.4.tar.gz) = 98cd631adb5bb332d9224d04bc8a265c105435f2
 Size (libwmf-0.2.8.4.tar.gz) = 2169375 bytes
+SHA1 (patch-aa) = 211bd3d51c98eca64b0915f59492efd1697b1508
 SHA1 (patch-ad) = b74be16c5da490394b86403009f5f35d80ba4bfa
 SHA1 (patch-ae) = f5cbb60757261aaf6084e9fcf16f9074b3013538
diff --git a/graphics/libwmf/patches/patch-aa b/graphics/libwmf/patches/patch-aa
new file mode 100644
index 00000000000..b4fe1e52a2b
--- /dev/null
+++ b/graphics/libwmf/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.6 2011/01/14 10:46:28 wiz Exp $
+
+Fix build with png-1.5.
+
+--- src/ipa/ipa/bmp.h.orig	2001-10-23 11:24:12.000000000 +0000
++++ src/ipa/ipa/bmp.h
+@@ -66,7 +66,7 @@ static void ldr_bmp_png (wmfAPI* API,wmf
+ 		return;
+ 	}
+ 
+-	if (setjmp (png_ptr->jmpbuf))
++	if (setjmp (png_jmpbuf(png_ptr)))
+ 	{	WMF_DEBUG (API,"Failed to write bitmap as PNG! (setjmp failed)");
+ 		png_destroy_write_struct (&png_ptr,&info_ptr);
+ 		wmf_free (API,buffer);
diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo
index ae4c8b15327..06cf3488143 100644
--- a/multimedia/mplayer-share/distinfo
+++ b/multimedia/mplayer-share/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.69 2010/12/05 16:42:16 tsutsui Exp $
+$NetBSD: distinfo,v 1.70 2011/01/14 10:44:27 wiz Exp $
 
 SHA1 (mplayer/mplayer-20100913.tar.bz2) = 6fd3acb29fa8455636bcd86f9f333da4763daa6d
 RMD160 (mplayer/mplayer-20100913.tar.bz2) = 79085d4ebdb824fc34f7bc128070ef11e874897d
@@ -6,6 +6,7 @@ Size (mplayer/mplayer-20100913.tar.bz2) = 9073690 bytes
 SHA1 (patch-aa) = 9eae4563081e370d14560bb407a9b986b0128d7f
 SHA1 (patch-ab) = 1a927d956155a7b9a2daa1a4f522e47d830c5af6
 SHA1 (patch-ac) = 3d037c96537233cdbda582afdb878dcf3f43e923
+SHA1 (patch-ad) = 84ce5a0f5cd8f59831c56b14dd2bc762793427ac
 SHA1 (patch-ae) = 7e1f05cd6e09f8755debfff7061dadf0a8ca3a3f
 SHA1 (patch-ag) = bef25568c913dcb8535afa51976ce7c94a6af5a2
 SHA1 (patch-ah) = 8cbd14c61e74023055770baf27201687aa34fede
diff --git a/multimedia/mplayer-share/patches/patch-ad b/multimedia/mplayer-share/patches/patch-ad
new file mode 100644
index 00000000000..e53e2d6dc19
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-ad
@@ -0,0 +1,33 @@
+$NetBSD: patch-ad,v 1.11 2011/01/14 10:44:27 wiz Exp $
+
+Fix build with png-1.5.
+
+--- libmpcodecs/vd_mpng.c.orig	2010-02-26 15:01:37.000000000 +0000
++++ libmpcodecs/vd_mpng.c
+@@ -74,7 +74,7 @@ static int    pngLength;
+ 
+ static void pngReadFN( png_structp pngstr,png_bytep buffer,png_size_t size )
+ {
+- char * p = pngstr->io_ptr;
++ char * p = png_get_io_ptr(pngstr);
+  if(size>pngLength-pngPointer && pngLength>=pngPointer) size=pngLength-pngPointer;
+  fast_memcpy( buffer,(char *)&p[pngPointer],size );
+  pngPointer+=size;
+@@ -111,7 +111,7 @@ static mp_image_t* decode(sh_video_t *sh
+  png_get_IHDR( png,info,&png_width,&png_height,&depth,&color,NULL,NULL,NULL );
+  png_set_bgr( png );
+ 
+- switch( info->color_type ) {
++ switch( png_get_color_type( png,info ) ) {
+    case PNG_COLOR_TYPE_GRAY_ALPHA:
+       mp_msg( MSGT_DECVIDEO,MSGL_INFO,"Sorry gray scaled png with alpha channel not supported at moment.\n" );
+       break;
+@@ -128,7 +128,7 @@ static mp_image_t* decode(sh_video_t *sh
+       out_fmt=IMGFMT_BGR24;
+       break;
+    default:
+-      mp_msg( MSGT_DECVIDEO,MSGL_INFO,"Sorry, unsupported PNG colorspace: %d.\n" ,info->color_type);
++      mp_msg( MSGT_DECVIDEO,MSGL_INFO,"Sorry, unsupported PNG colorspace: %d.\n" ,png_get_color_type( png,info ));
+  }
+ 
+  // (re)init libvo if image parameters changed (width/height/colorspace)