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.diff -r1.44 -r1.45 pkgsrc/graphics/pngcrush/Makefile
(adam)
@@ -1,28 +1,27 @@ | @@ -1,28 +1,27 @@ | |||
1 | # $NetBSD: Makefile,v 1.44 2011/01/13 13:38:15 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.45 2011/01/28 20:46:11 adam Exp $ | |
2 | 2 | |||
3 | DISTNAME= pngcrush-1.7.13-nolib | 3 | DISTNAME= pngcrush-1.7.14 | |
4 | PKGNAME= ${DISTNAME:C/-nolib//} | 4 | PKGNAME= ${DISTNAME:C/-nolib//} | |
5 | PKGREVISION= 1 | |||
6 | CATEGORIES= graphics | 5 | CATEGORIES= graphics | |
7 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pmt/} | 6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pmt/} | |
8 | EXTRACT_SUFX= .tar.bz2 | 7 | EXTRACT_SUFX= .tar.bz2 | |
9 | 8 | |||
10 | MAINTAINER= rh@NetBSD.org | 9 | MAINTAINER= rh@NetBSD.org | |
11 | HOMEPAGE= http://pmt.sourceforge.net/pngcrush/index.html | 10 | HOMEPAGE= http://pmt.sourceforge.net/pngcrush/index.html | |
12 | COMMENT= Optimizer for PNG (Portable Network Graphics) files | 11 | COMMENT= Optimizer for PNG (Portable Network Graphics) files | |
13 | 12 | |||
14 | PKG_DESTDIR_SUPPORT= user-destdir | 13 | PKG_DESTDIR_SUPPORT= user-destdir | |
15 | 14 | |||
16 | NO_CONFIGURE= yes | 15 | NO_CONFIGURE= yes | |
17 | INSTALLATION_DIRS= bin | 16 | INSTALLATION_DIRS= bin | |
18 | 17 | |||
19 | do-build: | 18 | #do-build: | |
20 | cd ${WRKSRC} && ${CC} -DPNG_USE_LOCAL_ARRAYS \ | 19 | # cd ${WRKSRC} && ${CC} -DPNG_USE_LOCAL_ARRAYS \ | |
21 | ${CFLAGS} `libpng-config --cflags` -o pngcrush pngcrush.c \ | 20 | # ${CFLAGS} `libpng-config --cflags` -o pngcrush pngcrush.c \ | |
22 | ${LDFLAGS} `libpng-config --ldflags` -lz | 21 | # ${LDFLAGS} `libpng-config --ldflags` -lz | |
23 | 22 | |||
24 | do-install: | 23 | do-install: | |
25 | ${INSTALL_PROGRAM} ${WRKSRC}/pngcrush ${DESTDIR}${PREFIX}/bin | 24 | ${INSTALL_PROGRAM} ${WRKSRC}/pngcrush ${DESTDIR}${PREFIX}/bin | |
26 | 25 | |||
27 | .include "../../graphics/png/buildlink3.mk" | 26 | .include "../../graphics/png/buildlink3.mk" | |
28 | .include "../../mk/bsd.pkg.mk" | 27 | .include "../../mk/bsd.pkg.mk" |
@@ -1,5 +1,6 @@ | @@ -1,5 +1,6 @@ | |||
1 | $NetBSD: distinfo,v 1.28 2010/12/13 16:15:33 adam Exp $ | 1 | $NetBSD: distinfo,v 1.29 2011/01/28 20:46:11 adam Exp $ | |
2 | 2 | |||
3 | SHA1 (pngcrush-1.7.13-nolib.tar.bz2) = 37e38c1e99532b5136ad62b2c3279f0b40ae103b | 3 | SHA1 (pngcrush-1.7.14.tar.bz2) = 266cb0f0ffdfba01ff7141d5871dd2b2cedb757f | |
4 | RMD160 (pngcrush-1.7.13-nolib.tar.bz2) = 51b54f780f07e21bb0b84bedf139e333feab896c | 4 | RMD160 (pngcrush-1.7.14.tar.bz2) = 7ce64d19bb392b4c87515506daa1407323e05ef0 | |
5 | Size (pngcrush-1.7.13-nolib.tar.bz2) = 48793 bytes | 5 | Size (pngcrush-1.7.14.tar.bz2) = 315020 bytes | |
6 | SHA1 (patch-aa) = 5c82c5afc9923110254ac40b607fdff6d6863cc2 |
$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 ---------------------------------------------------------------