diff options
| author | obache <obache@pkgsrc.org> | 2011-01-14 07:53:39 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2011-01-14 07:53:39 +0000 |
| commit | 3e599d052045c94574d8de1984f66ae3cc85fcc3 (patch) | |
| tree | 2741cebfd32836e56dfd8c17b1fe96c1a1e53651 /multimedia/ming | |
| parent | cf640fef75f5444feffb56786ec33160d615418e (diff) | |
| download | pkgsrc-3e599d052045c94574d8de1984f66ae3cc85fcc3.tar.gz | |
fixes build with png>=1.5.
Diffstat (limited to 'multimedia/ming')
| -rw-r--r-- | multimedia/ming/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/ming/patches/patch-aj | 24 | ||||
| -rw-r--r-- | multimedia/ming/patches/patch-ak | 15 |
3 files changed, 42 insertions, 1 deletions
diff --git a/multimedia/ming/distinfo b/multimedia/ming/distinfo index 49fbf9c16cd..d55a5ee7411 100644 --- a/multimedia/ming/distinfo +++ b/multimedia/ming/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.6 2010/04/09 01:33:43 obache Exp $ +$NetBSD: distinfo,v 1.7 2011/01/14 07:53:39 obache Exp $ SHA1 (ming-0.4.3.tar.gz) = bbdef489b5446f3bc4060d6b808287b0f7f03f37 RMD160 (ming-0.4.3.tar.gz) = a11501d0b49dde332c68c1ff11612fa8ab05cc66 Size (ming-0.4.3.tar.gz) = 14920165 bytes SHA1 (patch-ae) = 7eb187fbd1908b279e60f5ef0e5db46e3bf29f1b SHA1 (patch-ai) = 336b4520e3e1b1024eabfb019c2ceb66ede3e819 +SHA1 (patch-aj) = 1637aaf0d88af49a203b2d3734cda23c28284341 +SHA1 (patch-ak) = 368ea0362a2f6b2d3736e59354c4eea93a164d30 diff --git a/multimedia/ming/patches/patch-aj b/multimedia/ming/patches/patch-aj new file mode 100644 index 00000000000..2226a6c7af6 --- /dev/null +++ b/multimedia/ming/patches/patch-aj @@ -0,0 +1,24 @@ +$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; diff --git a/multimedia/ming/patches/patch-ak b/multimedia/ming/patches/patch-ak new file mode 100644 index 00000000000..e6409e0be7e --- /dev/null +++ b/multimedia/ming/patches/patch-ak @@ -0,0 +1,15 @@ +$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); |