Fri Jan 14 07:53:39 2011 UTC ()
fixes build with png>=1.5.


(obache)
diff -r1.6 -r1.7 pkgsrc/multimedia/ming/distinfo
diff -r0 -r1.1 pkgsrc/multimedia/ming/patches/patch-aj
diff -r0 -r1.1 pkgsrc/multimedia/ming/patches/patch-ak

cvs diff -r1.6 -r1.7 pkgsrc/multimedia/ming/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/ming/distinfo 2010/04/09 01:33:43 1.6
+++ pkgsrc/multimedia/ming/distinfo 2011/01/14 07:53:39 1.7
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
1$NetBSD: distinfo,v 1.6 2010/04/09 01:33:43 obache Exp $ 1$NetBSD: distinfo,v 1.7 2011/01/14 07:53:39 obache Exp $
2 2
3SHA1 (ming-0.4.3.tar.gz) = bbdef489b5446f3bc4060d6b808287b0f7f03f37 3SHA1 (ming-0.4.3.tar.gz) = bbdef489b5446f3bc4060d6b808287b0f7f03f37
4RMD160 (ming-0.4.3.tar.gz) = a11501d0b49dde332c68c1ff11612fa8ab05cc66 4RMD160 (ming-0.4.3.tar.gz) = a11501d0b49dde332c68c1ff11612fa8ab05cc66
5Size (ming-0.4.3.tar.gz) = 14920165 bytes 5Size (ming-0.4.3.tar.gz) = 14920165 bytes
6SHA1 (patch-ae) = 7eb187fbd1908b279e60f5ef0e5db46e3bf29f1b 6SHA1 (patch-ae) = 7eb187fbd1908b279e60f5ef0e5db46e3bf29f1b
7SHA1 (patch-ai) = 336b4520e3e1b1024eabfb019c2ceb66ede3e819 7SHA1 (patch-ai) = 336b4520e3e1b1024eabfb019c2ceb66ede3e819
 8SHA1 (patch-aj) = 1637aaf0d88af49a203b2d3734cda23c28284341
 9SHA1 (patch-ak) = 368ea0362a2f6b2d3736e59354c4eea93a164d30

File Added: pkgsrc/multimedia/ming/patches/Attic/patch-aj
$NetBSD: patch-aj,v 1.1 2011/01/14 07:53:39 obache Exp $

* Use API instead of direct access, for png>=1.5.

--- src/blocks/pngdbl.c.orig	2008-12-22 13:33:58.000000000 +0000
+++ src/blocks/pngdbl.c
@@ -61,7 +61,7 @@ static png_structp openPngFromFile(FILE 
 }
 
 static int pngReadFunc(png_structp png, unsigned char *buf, int len)
-{	SWFInput input = (SWFInput) png->io_ptr;
+{	SWFInput input = (SWFInput) png_get_io_ptr(png);
 	return SWFInput_read(input, buf, len);
 }
 
@@ -127,7 +127,7 @@ static int readPNG(png_structp png_ptr, 
 		return 0;
 	}
 
-	if(setjmp(png_ptr->jmpbuf))
+	if(setjmp(png_jmpbuf(png_ptr)))
 	{
 		png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
     	return 0;

File Added: pkgsrc/multimedia/ming/patches/Attic/patch-ak
$NetBSD: patch-ak,v 1.1 2011/01/14 07:53:39 obache Exp $

* Use API instead of direct access, for png>=1.5.

--- util/png2dbl.c.orig	2008-12-22 13:33:59.000000000 +0000
+++ util/png2dbl.c
@@ -91,7 +91,7 @@ struct pngdata readPNG(FILE *fp)
     error("Couldn't create end_info\n");
   }
 
-  if(setjmp(png_ptr->jmpbuf))
+  if(setjmp(png_jmpbuf(png_ptr)))
   {
     png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
     fclose(fp);