diff options
| author | adam <adam> | 2011-01-28 20:46:11 +0000 |
|---|---|---|
| committer | adam <adam> | 2011-01-28 20:46:11 +0000 |
| commit | 0753661d1e6ba5f8859e808fb4fb85b218579323 (patch) | |
| tree | fbdd2ceed3b5e6440b39ef22eb336e8b96f9a67b /graphics/pngcrush | |
| parent | 26fc95ae32cbdafd70f140e590e7f16fa36c2304 (diff) | |
| download | pkgsrc-0753661d1e6ba5f8859e808fb4fb85b218579323.tar.gz | |
Changes 1.7.14:
* Built with libpng-1.5.1beta06 and zlib-1.2.5
* Removed WIN32_WCE support (libpng has dropped it already)
* Include zlib.h and define png_memcpy, etc., and revise the
png_get_iCCP() and png_set_iCCP() calls to be able to build
with bundled libpng-1.5.x. Pngcrush cannot be built yet with
a system libpng-1.5.x.
Diffstat (limited to 'graphics/pngcrush')
| -rw-r--r-- | graphics/pngcrush/Makefile | 13 | ||||
| -rw-r--r-- | graphics/pngcrush/distinfo | 9 | ||||
| -rw-r--r-- | graphics/pngcrush/patches/patch-aa | 31 |
3 files changed, 42 insertions, 11 deletions
diff --git a/graphics/pngcrush/Makefile b/graphics/pngcrush/Makefile index 9257d079dfc..f34cda2c11b 100644 --- a/graphics/pngcrush/Makefile +++ b/graphics/pngcrush/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.44 2011/01/13 13:38:15 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2011/01/28 20:46:11 adam Exp $ -DISTNAME= pngcrush-1.7.13-nolib +DISTNAME= pngcrush-1.7.14 PKGNAME= ${DISTNAME:C/-nolib//} -PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pmt/} EXTRACT_SUFX= .tar.bz2 @@ -16,10 +15,10 @@ PKG_DESTDIR_SUPPORT= user-destdir NO_CONFIGURE= yes INSTALLATION_DIRS= bin -do-build: - cd ${WRKSRC} && ${CC} -DPNG_USE_LOCAL_ARRAYS \ - ${CFLAGS} `libpng-config --cflags` -o pngcrush pngcrush.c \ - ${LDFLAGS} `libpng-config --ldflags` -lz +#do-build: +# cd ${WRKSRC} && ${CC} -DPNG_USE_LOCAL_ARRAYS \ +# ${CFLAGS} `libpng-config --cflags` -o pngcrush pngcrush.c \ +# ${LDFLAGS} `libpng-config --ldflags` -lz do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pngcrush ${DESTDIR}${PREFIX}/bin diff --git a/graphics/pngcrush/distinfo b/graphics/pngcrush/distinfo index 39af9074bd3..e66f2b30df9 100644 --- a/graphics/pngcrush/distinfo +++ b/graphics/pngcrush/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.28 2010/12/13 16:15:33 adam Exp $ +$NetBSD: distinfo,v 1.29 2011/01/28 20:46:11 adam Exp $ -SHA1 (pngcrush-1.7.13-nolib.tar.bz2) = 37e38c1e99532b5136ad62b2c3279f0b40ae103b -RMD160 (pngcrush-1.7.13-nolib.tar.bz2) = 51b54f780f07e21bb0b84bedf139e333feab896c -Size (pngcrush-1.7.13-nolib.tar.bz2) = 48793 bytes +SHA1 (pngcrush-1.7.14.tar.bz2) = 266cb0f0ffdfba01ff7141d5871dd2b2cedb757f +RMD160 (pngcrush-1.7.14.tar.bz2) = 7ce64d19bb392b4c87515506daa1407323e05ef0 +Size (pngcrush-1.7.14.tar.bz2) = 315020 bytes +SHA1 (patch-aa) = 5c82c5afc9923110254ac40b607fdff6d6863cc2 diff --git a/graphics/pngcrush/patches/patch-aa b/graphics/pngcrush/patches/patch-aa new file mode 100644 index 00000000000..c545e702870 --- /dev/null +++ b/graphics/pngcrush/patches/patch-aa @@ -0,0 +1,31 @@ +$NetBSD: patch-aa,v 1.10 2011/01/28 20:46:11 adam Exp $ + +--- Makefile.orig 2011-01-28 20:28:50.000000000 +0000 ++++ Makefile +@@ -14,17 +14,13 @@ + #ZINC = ../../zlib + #ZLIB = ../../zlib + +-CC = gcc +-LD = gcc + RM = rm -f + #CFLAGS = -I. -O -Wall + #CFLAGS = -I. -O2 -fomit-frame-pointer -Wall + #CFLAGS = -I. -O3 -fomit-frame-pointer -Wall + #CFLAGS = -I. -Os -fomit-frame-pointer -Wall +-CFLAGS = -I. -O3 -funroll-loops -fomit-frame-pointer -Wall -Wshadow + #CFLAGS = -I${ZINC} -I. -O3 -fomit-frame-pointer -Wall + # [note that -Wall is a gcc-specific compilation flag ("all warnings on")] +-LDFLAGS = + O = .o + E = + +@@ -63,7 +59,7 @@ pngcrush$(O): pngcrush.c png.h pngconf.h + $(CC) -c $(CFLAGS) $< + + $(PNGCRUSH)$(E): $(OBJS) +- $(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) ++ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) + + # maintenance --------------------------------------------------------------- + |