diff options
| author | wiz <wiz@pkgsrc.org> | 2011-01-13 17:07:53 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2011-01-13 17:07:53 +0000 |
| commit | 0361306d874d55f43f288a6653d60bcaa59f2208 (patch) | |
| tree | d36d00d9715dd9e374b0e5a053d4ba6324c9ecbc /graphics/gif2png | |
| parent | a26cb2b5d5864289ab7628d25bd9eb7060c27686 (diff) | |
| download | pkgsrc-0361306d874d55f43f288a6653d60bcaa59f2208.tar.gz | |
Fix build with png-1.5.
Diffstat (limited to 'graphics/gif2png')
| -rw-r--r-- | graphics/gif2png/distinfo | 3 | ||||
| -rw-r--r-- | graphics/gif2png/patches/patch-aa | 45 |
2 files changed, 47 insertions, 1 deletions
diff --git a/graphics/gif2png/distinfo b/graphics/gif2png/distinfo index 7fc087b6158..c8f3542c5ec 100644 --- a/graphics/gif2png/distinfo +++ b/graphics/gif2png/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.9 2010/01/20 14:30:28 wiz Exp $ +$NetBSD: distinfo,v 1.10 2011/01/13 17:07:53 wiz Exp $ SHA1 (gif2png-2.5.2.tar.gz) = 0e9e66d6728fe7e2dcde61ad0e398a60894946b3 RMD160 (gif2png-2.5.2.tar.gz) = a361b18af23e59b73121ae25a155b54fb62eb14a Size (gif2png-2.5.2.tar.gz) = 171740 bytes +SHA1 (patch-aa) = ae26b928890c0d7577a0889ae21f6f836faa71b1 diff --git a/graphics/gif2png/patches/patch-aa b/graphics/gif2png/patches/patch-aa new file mode 100644 index 00000000000..2c37ecce01b --- /dev/null +++ b/graphics/gif2png/patches/patch-aa @@ -0,0 +1,45 @@ +$NetBSD: patch-aa,v 1.5 2011/01/13 17:07:53 wiz Exp $ + +Fix build with png-1.5. + +--- gif2png.c.orig 2009-11-11 20:28:02.000000000 +0000 ++++ gif2png.c +@@ -10,6 +10,7 @@ + #include <string.h> + #include <stdlib.h> + #include <unistd.h> /* for isatty() */ ++#include <zlib.h> + + #if !defined(TRUE) + #define FALSE 0 +@@ -120,8 +121,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; +@@ -136,6 +137,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; |