From 683d3f15288f87256d5b5382e366fd366f3ceb69 Mon Sep 17 00:00:00 2001 From: adam Date: Sat, 6 May 2006 08:48:43 +0000 Subject: Changes 0.5.1: * Implemented bit depth reduction for palette images. * Upgraded libpng to version 1.2.10-optipng [private] * Improved the BMP support. * Added a Unix man page. * Allowed abbreviation of command-line options. * Changed user option -log to accept a file name as an argument. * Changed user option -no to -simulate. * Fixed an error in handling .bak files on Unix. * Fixed a small typo in the help screen. * Added the GUIDE and THANKS documents. * Converted some text document files to HTML. --- graphics/optipng/Makefile | 9 ++++----- graphics/optipng/distinfo | 13 +++++++------ graphics/optipng/patches/patch-aa | 7 ++++--- graphics/optipng/patches/patch-ab | 10 +++++----- graphics/optipng/patches/patch-ad | 22 ++++++++++++++++++++++ 5 files changed, 42 insertions(+), 19 deletions(-) create mode 100644 graphics/optipng/patches/patch-ad (limited to 'graphics/optipng') diff --git a/graphics/optipng/Makefile b/graphics/optipng/Makefile index 2fb39656260..525b59e04f5 100644 --- a/graphics/optipng/Makefile +++ b/graphics/optipng/Makefile @@ -1,12 +1,11 @@ -# $NetBSD: Makefile,v 1.8 2006/04/19 17:02:22 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2006/05/06 08:48:43 adam Exp $ -DISTNAME= optipng-0.5 -PKGREVISION= 2 +DISTNAME= optipng-0.5.1 CATEGORIES= graphics -MASTER_SITES= http://www.cs.toronto.edu/~cosmin/pngtech/optipng/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=optipng/} MAINTAINER= adam@NetBSD.org -HOMEPAGE= http://www.cs.toronto.edu/~cosmin/pngtech/optipng/ +HOMEPAGE= http://optipng.sourceforge.net/ COMMENT= Advanced PNG Optimizer BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.2 diff --git a/graphics/optipng/distinfo b/graphics/optipng/distinfo index c5c1dcb3e82..17a9bb0447d 100644 --- a/graphics/optipng/distinfo +++ b/graphics/optipng/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.3 2006/04/19 17:02:22 wiz Exp $ +$NetBSD: distinfo,v 1.4 2006/05/06 08:48:43 adam Exp $ -SHA1 (optipng-0.5.tar.gz) = c724e52802ea7419874ba7b4d3dfa55abf964ed6 -RMD160 (optipng-0.5.tar.gz) = 6bd7594856b31f42aef4811b4b6a52d18e7803c5 -Size (optipng-0.5.tar.gz) = 746749 bytes -SHA1 (patch-aa) = 025087f864936fb727f7fc4d9e0032526a09cea7 -SHA1 (patch-ab) = 5608933a0725a7c0ac0f68e3de77d57dc6f0569a +SHA1 (optipng-0.5.1.tar.gz) = 9e1300aff4579d72889af8997a0eda215e2fb5ef +RMD160 (optipng-0.5.1.tar.gz) = a0ff76be9515670fd9d16ebb43f86f6a905b8862 +Size (optipng-0.5.1.tar.gz) = 1081251 bytes +SHA1 (patch-aa) = 6c881f5e47b9a3cb7defb68e2199fb10fb3194c0 +SHA1 (patch-ab) = 2bc61b45e6f71fbb3c4fa5101cbd7b4bd2a1e760 SHA1 (patch-ac) = fb4eb567b5a24b2d26bf357061be80c57b4d4a3c +SHA1 (patch-ad) = c6b570f35911deee857e2bc9eda4c9d8c990e813 diff --git a/graphics/optipng/patches/patch-aa b/graphics/optipng/patches/patch-aa index 0405c3b978c..1d2c35e86a9 100644 --- a/graphics/optipng/patches/patch-aa +++ b/graphics/optipng/patches/patch-aa @@ -1,12 +1,12 @@ -$NetBSD: patch-aa,v 1.3 2006/04/19 17:02:22 wiz Exp $ +$NetBSD: patch-aa,v 1.4 2006/05/06 08:48:43 adam Exp $ --- Makefile.orig 2006-04-19 14:47:12.000000000 +0200 +++ Makefile -@@ -0,0 +1,27 @@ +@@ -0,0 +1,28 @@ +OBJS= optipng.o opngio.o opngreduc.o cbitset.o osys.o \ + pngxread.o pngxrbmp.o pngxrgif.o pngxrpnm.o \ + gifread.o pnmerror.o pnmread.o pnmwrite.o \ -+ png_write_sig.o ++ strutil.o png_write_sig.o + +CPPFLAGS= `libpng-config --cflags` -Ilib/pngxtern -Isrc + @@ -18,6 +18,7 @@ $NetBSD: patch-aa,v 1.3 2006/04/19 17:02:22 wiz Exp $ +opngreduc.o: src/opngreduc.c src/opng.h +cbitset.o: src/cbitset.c src/cbitset.h +osys.o: src/osys.c src/osys.h ++strutil.o: src/strutil.c src/strutil.h + +gifread.o: lib/pngxtern/gif/gifread.c lib/pngxtern/gif/gifread.h +pnmerror.o: lib/pngxtern/pnm/pnmerror.c lib/pngxtern/pnm/pnmio.h diff --git a/graphics/optipng/patches/patch-ab b/graphics/optipng/patches/patch-ab index 82fe671484f..a882f7cb9b9 100644 --- a/graphics/optipng/patches/patch-ab +++ b/graphics/optipng/patches/patch-ab @@ -1,14 +1,14 @@ -$NetBSD: patch-ab,v 1.2 2006/01/19 11:18:41 adam Exp $ +$NetBSD: patch-ab,v 1.3 2006/05/06 08:48:43 adam Exp $ ---- src/opng.h.orig 2006-01-19 08:59:26.000000000 +0100 +--- src/opng.h.orig 2006-04-15 16:45:00.000000000 +0200 +++ src/opng.h -@@ -34,9 +34,6 @@ +@@ -16,9 +16,6 @@ + #include "png.h" - #include "pngxtern.h" -#if !(PNG_LIBPNG_BUILD_TYPE & PNG_LIBPNG_BUILD_PRIVATE) -#error This program requires the BUNDLED libpng version 1.2.x-optipng -#endif - #define OPNG_IMAGE_REDUCTIONS_SUPPORTED /* implemented here */ + #define OPNG_IO_STATE_SUPPORTED /* implemented here */ diff --git a/graphics/optipng/patches/patch-ad b/graphics/optipng/patches/patch-ad new file mode 100644 index 00000000000..e60d64ad7d4 --- /dev/null +++ b/graphics/optipng/patches/patch-ad @@ -0,0 +1,22 @@ +$NetBSD: patch-ad,v 1.1 2006/05/06 08:48:43 adam Exp $ + +--- src/strutil.c.orig 2006-04-05 09:45:00.000000000 +0200 ++++ src/strutil.c +@@ -36,7 +36,7 @@ int string_case_cmp(const char *str1, co + ch1 = toupper(*str1++); + ch2 = toupper(*str2++); + if (ch1 != ch2) +- return c1 - ch2; ++ return ch1 - ch2; + if (ch1 == 0) /* no need to check if ch2 == 0 */ + return 0; + } +@@ -64,7 +64,7 @@ int string_num_case_cmp(const char *str1 + ch1 = toupper(*str1++); + ch2 = toupper(*str2++); + if (ch1 != ch2) +- return c1 - ch2; ++ return ch1 - ch2; + if (ch1 == 0) /* no need to check if ch2 == 0 */ + return 0; + } -- cgit v1.2.3