diff options
author | wiz <wiz> | 2006-04-19 17:00:12 +0000 |
---|---|---|
committer | wiz <wiz> | 2006-04-19 17:00:12 +0000 |
commit | 1519d25bc307f73da74fa6f84f3866925744a39c (patch) | |
tree | 486fc313cea5d6e0e6762cddcc80b2e202459d15 /graphics/pngcrush | |
parent | 14ca210f333d93ac6d47a1f71a5f8fa36e4ca63d (diff) | |
download | pkgsrc-1519d25bc307f73da74fa6f84f3866925744a39c.tar.gz |
Update to 1.6.3, and fix build after png-1.2.9nb2 update:
Version 1.6.3 (built with libpng-1.2.9beta11 and zlib-1.2.3)
Fixed documentation of iTXt input (Shlomi Tal).
Removed #define PNG_INTERNAL and provided prototypes for some
internal libpng functions that are duplicated in pngcrush.c
Diffstat (limited to 'graphics/pngcrush')
-rw-r--r-- | graphics/pngcrush/Makefile | 12 | ||||
-rw-r--r-- | graphics/pngcrush/distinfo | 10 | ||||
-rw-r--r-- | graphics/pngcrush/patches/patch-aa | 33 |
3 files changed, 23 insertions, 32 deletions
diff --git a/graphics/pngcrush/Makefile b/graphics/pngcrush/Makefile index 9573cff2fcf..1c1629a579f 100644 --- a/graphics/pngcrush/Makefile +++ b/graphics/pngcrush/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.22 2006/04/17 13:46:34 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2006/04/19 17:00:12 wiz Exp $ -DISTNAME= pngcrush-1.6.2-nolib -PKGNAME= pngcrush-1.6.2 -PKGREVISION= 1 +DISTNAME= pngcrush-1.6.3-nolib +PKGNAME= pngcrush-1.6.3 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pmt/} EXTRACT_SUFX= .tar.bz2 @@ -15,8 +14,9 @@ NO_CONFIGURE= yes INSTALLATION_DIRS= bin do-build: - cd ${WRKSRC} && ${CC} ${CFLAGS} -o pngcrush pngcrush.c \ - -Wall -Wl,-R${PREFIX}/lib -L${PREFIX}/lib -lm -lz -lpng + cd ${WRKSRC} && ${CC} -DPNG_USE_LOCAL_ARRAYS \ + ${CFLAGS} `libpng-config --cflags` -o pngcrush pngcrush.c \ + `libpng-config --ldflags` do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pngcrush ${PREFIX}/bin diff --git a/graphics/pngcrush/distinfo b/graphics/pngcrush/distinfo index e7352e318db..68c0343d4fa 100644 --- a/graphics/pngcrush/distinfo +++ b/graphics/pngcrush/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.10 2006/02/18 17:39:00 adam Exp $ +$NetBSD: distinfo,v 1.11 2006/04/19 17:00:12 wiz Exp $ -SHA1 (pngcrush-1.6.2-nolib.tar.bz2) = 72b5ef84c5650b912b93ac201dac187326b83f3c -RMD160 (pngcrush-1.6.2-nolib.tar.bz2) = 6603622402916426ff5c408ad5032297432eca38 -Size (pngcrush-1.6.2-nolib.tar.bz2) = 40035 bytes -SHA1 (patch-aa) = 27f768ae5f3a073ed9e39093ae9a958acc1d0628 +SHA1 (pngcrush-1.6.3-nolib.tar.bz2) = 2ed909cd32282fc21eb421d695f5951b97f98c95 +RMD160 (pngcrush-1.6.3-nolib.tar.bz2) = 6672fc72e59b43e476a058b70e0556ce8de56c24 +Size (pngcrush-1.6.3-nolib.tar.bz2) = 40935 bytes +SHA1 (patch-aa) = dabbe1e16b93f7156dba77345d2e12f15e140eff diff --git a/graphics/pngcrush/patches/patch-aa b/graphics/pngcrush/patches/patch-aa index d1da2039090..207a4025baa 100644 --- a/graphics/pngcrush/patches/patch-aa +++ b/graphics/pngcrush/patches/patch-aa @@ -1,26 +1,17 @@ -$NetBSD: patch-aa,v 1.3 2006/02/18 11:07:10 adam Exp $ +$NetBSD: patch-aa,v 1.4 2006/04/19 17:00:12 wiz Exp $ ---- pngcrush.c.orig 2006-02-16 18:57:17.000000000 +0100 +--- pngcrush.c.orig 2006-03-30 15:15:11.000000000 +0200 +++ pngcrush.c -@@ -120,7 +120,20 @@ - */ +@@ -128,10 +128,12 @@ + #define PNG_iCCP const png_byte png_iCCP[5] = {105, 67, 67, 80, '\0'} + #define PNG_IEND const png_byte png_IEND[5] = { 73, 69, 78, 68, '\0'} - #define PNG_INTERNAL --#include "png.h" -+#include <png.h> -+ -+#ifndef HANDLE_CHUNK_AS_DEFAULT -+#define HANDLE_CHUNK_AS_DEFAULT PNG_HANDLE_CHUNK_AS_DEFAULT -+#endif -+#ifndef HANDLE_CHUNK_NEVER -+#define HANDLE_CHUNK_NEVER PNG_HANDLE_CHUNK_NEVER -+#endif -+#ifndef HANDLE_CHUNK_IF_SAFE -+#define HANDLE_CHUNK_IF_SAFE PNG_HANDLE_CHUNK_IF_SAFE -+#endif -+#ifndef HANDLE_CHUNK_ALWAYS -+#define HANDLE_CHUNK_ALWAYS PNG_HANDLE_CHUNK_ALWAYS ++#if 0 + PNG_EXPORT_VAR (const png_byte FARDATA) png_IHDR[5]; + PNG_EXPORT_VAR (const png_byte FARDATA) png_IDAT[5]; + PNG_EXPORT_VAR (const png_byte FARDATA) png_IEND[5]; + PNG_EXPORT_VAR (const png_byte FARDATA) png_iCCP[5]; +#endif - /* we don't need some of the extra libpng transformations - * so they are ifdef'ed out in pngcrush.h, which is included by + #define PNG_FLAG_CRC_CRITICAL_USE 0x0400 + #define PNG_FLAG_CRC_CRITICAL_IGNORE 0x0800 |