diff options
author | wiz <wiz@pkgsrc.org> | 2012-03-08 09:39:03 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2012-03-08 09:39:03 +0000 |
commit | db2f1cf037432401db99df1f644a0060879afe09 (patch) | |
tree | 3513518baa4ad271dc7b3bf1485f81c9d0254f34 /graphics/gif2png | |
parent | 780cf7728940ac1399c888bff35e01236ae5a575 (diff) | |
download | pkgsrc-db2f1cf037432401db99df1f644a0060879afe09.tar.gz |
Update to 2.5.6:
* 2.5.6 @ 2012-03-07
Fix patch for builing with png-1.5, by Thomas Klausner <tk@giga.or.at>.
Blink production for visual checking in the regression-test suite.
Diffstat (limited to 'graphics/gif2png')
-rw-r--r-- | graphics/gif2png/Makefile | 4 | ||||
-rw-r--r-- | graphics/gif2png/distinfo | 9 | ||||
-rw-r--r-- | graphics/gif2png/patches/patch-aa | 45 |
3 files changed, 6 insertions, 52 deletions
diff --git a/graphics/gif2png/Makefile b/graphics/gif2png/Makefile index 5f5b25e7e05..7325cee3929 100644 --- a/graphics/gif2png/Makefile +++ b/graphics/gif2png/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.41 2012/03/07 15:29:52 wiz Exp $ +# $NetBSD: Makefile,v 1.42 2012/03/08 09:39:03 wiz Exp $ -DISTNAME= gif2png-2.5.5 +DISTNAME= gif2png-2.5.6 CATEGORIES= graphics converters MASTER_SITES= http://www.catb.org/~esr/gif2png/ diff --git a/graphics/gif2png/distinfo b/graphics/gif2png/distinfo index 921aa3aa175..36a2f1cd0dd 100644 --- a/graphics/gif2png/distinfo +++ b/graphics/gif2png/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.12 2012/03/07 15:28:12 wiz Exp $ +$NetBSD: distinfo,v 1.13 2012/03/08 09:39:04 wiz Exp $ -SHA1 (gif2png-2.5.5.tar.gz) = df38c056ab8441fff3735316fb0fc2c3953f6c93 -RMD160 (gif2png-2.5.5.tar.gz) = 1c1e68553d508bd34a37e0dafc061e39efc42228 -Size (gif2png-2.5.5.tar.gz) = 126884 bytes -SHA1 (patch-aa) = 513f9d79aa3594eea9e3e848911e11f26abcb1dd +SHA1 (gif2png-2.5.6.tar.gz) = 1aaa35ebe419e1a10a5acb23cceeba0c44b773e7 +RMD160 (gif2png-2.5.6.tar.gz) = 7494c392ff275e3466af58e079ccb6bdc36df14a +Size (gif2png-2.5.6.tar.gz) = 127073 bytes diff --git a/graphics/gif2png/patches/patch-aa b/graphics/gif2png/patches/patch-aa deleted file mode 100644 index d05030a3c4d..00000000000 --- a/graphics/gif2png/patches/patch-aa +++ /dev/null @@ -1,45 +0,0 @@ -$NetBSD: patch-aa,v 1.6 2012/03/07 15:28:12 wiz Exp $ - -Fix build with png-1.5. - ---- gif2png.c.orig 2012-01-28 23:02:06.000000000 +0000 -+++ gif2png.c -@@ -10,6 +10,7 @@ - #include <string.h> - #include <stdlib.h> - #include <unistd.h> /* for isatty() */ -+#include <zlib.h> - #include <sys/stat.h> - #include <utime.h> - -@@ -122,8 +123,8 @@ int writefile(struct GIFelement *s,struc - int colors_used = 0; - byte remap[MAXCMSIZE]; - int low_prec; -- png_struct *png_ptr = xalloc(sizeof (png_struct)); -- png_info *info_ptr = xalloc(sizeof (png_info)); -+ png_struct *png_ptr; -+ png_info *info_ptr; - int p; - int gray_bitdepth; - png_color pal_rgb[MAXCMSIZE], *pltep; -@@ -138,6 +139,19 @@ int writefile(struct GIFelement *s,struc - png_text software; - png_text comment; - -+ png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); -+ if (png_ptr == NULL) { -+ fprintf(stderr, "gif2png: fatal error, out of memory\n"); -+ fprintf(stderr, "gif2png: exiting ungracefully\n"); -+ exit(1); -+ } -+ info_ptr = png_create_info_struct(png_ptr); -+ if (info_ptr == NULL) { -+ fprintf(stderr, "gif2png: fatal error, out of memory\n"); -+ fprintf(stderr, "gif2png: exiting ungracefully\n"); -+ exit(1); -+ } -+ - /* these volatile declarations prevent gcc warnings ("variable might be - * clobbered by `longjmp' or `vfork'") */ - volatile int gray = TRUE; |