head 1.7; access; symbols pkgsrc-2013Q2:1.7.0.4 pkgsrc-2013Q2-base:1.7 pkgsrc-2012Q4:1.7.0.2 pkgsrc-2012Q4-base:1.7 pkgsrc-2011Q4:1.5.0.8 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q3:1.5.0.6 pkgsrc-2011Q3-base:1.5 pkgsrc-2011Q2:1.5.0.4 pkgsrc-2011Q2-base:1.5 pkgsrc-2011Q1:1.5.0.2 pkgsrc-2011Q1-base:1.5 pkgsrc-2009Q4:1.3.0.34 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.32 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.30 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.28 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.26 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.24 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.22 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.20 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.18 pkgsrc-2008Q1:1.3.0.16 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.14 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.12 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.10 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.8 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.6 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.4 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.2 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.2.0.20 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.18 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.16 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.14 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.12 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.10 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.8 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.6 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.4 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 buildlink2-base:1.2 comdex-fall-1999:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.7 date 2012.03.08.09.39.04; author wiz; state dead; branches; next 1.6; 1.6 date 2012.03.07.15.28.12; author wiz; state Exp; branches; next 1.5; 1.5 date 2011.01.13.17.07.53; author wiz; state Exp; branches; next 1.4; 1.4 date 2010.01.20.14.30.28; author wiz; state dead; branches; next 1.3; 1.3 date 2006.04.18.12.56.03; author tron; state Exp; branches; next 1.2; 1.2 date 99.10.28.09.22.55; author agc; state dead; branches; next 1.1; 1.1 date 99.10.16.15.01.49; author rh; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 99.10.16.15.01.49; author rh; state Exp; branches; next ; desc @@ 1.7 log @Update to 2.5.6: * 2.5.6 @@ 2012-03-07 Fix patch for builing with png-1.5, by Thomas Klausner . Blink production for visual checking in the regression-test suite. @ text @$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 #include #include /* for isatty() */ +#include #include #include @@@@ -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; @ 1.6 log @Update to 2.5.5. * 2.5.5 @@ 2012-02-28 Added -m (preserve file modification time) option by Steve Ward. web2png is checked with pylint. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 2011/01/13 17:07:53 wiz Exp $ @ 1.5 log @Fix build with png-1.5. @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 --- gif2png.c.orig 2009-11-11 20:28:02.000000000 +0000 d12 2 d15 1 a15 3 #if !defined(TRUE) #define FALSE 0 @@@@ -120,8 +121,8 @@@@ int writefile(struct GIFelement *s,struc d26 1 a26 1 @@@@ -136,6 +137,19 @@@@ int writefile(struct GIFelement *s,struc @ 1.4 log @Update to 2.5.2: 2.5.2 @@ 2009-11-11: * Apply C style tweaks from Glenn Randers-Pehrson, eliminating some deprecated API calls. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 2006/04/18 12:56:03 tron Exp $ d3 26 a28 8 --- gif2png.c.orig 2002-05-10 15:06:02.000000000 +0100 +++ gif2png.c 2006-04-18 13:52:45.000000000 +0100 @@@@ -135,7 +135,7 @@@@ unsigned long hist_maxvalue; int passcount; int errtype, errorcount = 0; - png_text software; + png_text comment, software; d30 13 d45 1 a45 21 @@@@ -517,11 +517,15 @@@@ j = s->size; if (j > 0 && data[j-1] == '\0') /* some apps include a NULL in GIF comment */ --j; - if (j<500) { - png_write_tEXt(png_ptr, "Comment", (png_charp)data, j); - } else { - png_write_zTXt(png_ptr, "Comment", (png_charp)data, j, 0); - } + if (j<1000) + comment.compression = PNG_TEXT_COMPRESSION_NONE; + else + comment.compression = PNG_TEXT_COMPRESSION_zTXt; + comment.key = "Comment"; + comment.text = data; + comment.text_length = j; + + png_set_text(png_ptr, info_ptr, &comment, 1); break; case GIFapplication: @ 1.3 log @- Add missing Python dependence and use standard facility for modifying the interpreter path. - Use new "libpng" API which fixes build problems with the latest "png" package. Bump package revision because of these changes. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Upgrade to version 1.2.2. Changes since version 1.1.1: * Fixed a bug in configure that was preventing it from finding the png library properly. * Fixed a brown-paper-bag bug -- web2png ignored directory arguments. * Added capability to handle BACKGROUND tags and http URLs. Thanks to Rob Reid . @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 1999/10/16 15:01:49 rh Exp $ d3 32 a34 11 --- configure.orig Thu Oct 14 17:47:15 1999 +++ configure Sat Oct 16 16:23:59 1999 @@@@ -1375,7 +1375,7 @@@@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lpng $LIBS" +LIBS="-lpng -lm $LIBS" cat > conftest.$ac_ext <