From 1537d1cea7e7241f494bf2737b27acda34ec9d3d Mon Sep 17 00:00:00 2001 From: recht Date: Mon, 9 Aug 2004 07:37:35 +0000 Subject: update to libpng-1.2.6rc2 changes: version 1.2.6rc2 [August 8, 2004] Revised makefile.darwin and makefile.solaris. Removed makefile.macosx. Revised pngtest's png_debug_malloc() to use png_malloc() instead of png_malloc_default() which is not supposed to be exported. Fixed off-by-one error in one of the conversions to PNG_ROWBYTES() in pngpread.c. Bug was introduced in 1.2.6rc1. Fixed bug in RGB to RGBX transformation introduced in 1.2.6rc1. Fixed old bug in RGB to Gray transformation. Fixed problem with 64-bit compilers by casting arguments to abs() to png_int_32. Changed "ln -sf" to "ln -f -s" in three makefiles (solaris, sco, so9). Changed "HANDLE_CHUNK_*" to "PNG_HANDLE_CHUNK_*" (Cosmin) Added "-@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)" to 15 *NIX makefiles. Added code to update the row_info->colortype in png_do_read_filler() (MSB). --- graphics/png/Makefile | 4 ++-- graphics/png/buildlink3.mk | 5 +++-- graphics/png/distinfo | 10 +++++----- graphics/png/patches/patch-ab | 13 +++++++------ graphics/png/patches/patch-ad | 10 +++++----- 5 files changed, 22 insertions(+), 20 deletions(-) (limited to 'graphics') diff --git a/graphics/png/Makefile b/graphics/png/Makefile index e49fd383f23..85bda267e7e 100644 --- a/graphics/png/Makefile +++ b/graphics/png/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.63 2004/08/06 09:25:18 drochner Exp $ +# $NetBSD: Makefile,v 1.64 2004/08/09 07:37:35 recht Exp $ # On update, don't forget to increase shared library major/minor's in # accordance with changes (patch-aa). -DISTNAME= libpng-1.2.6rc1 +DISTNAME= libpng-1.2.6rc2 PKGNAME= ${DISTNAME:S/lib//} CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpng/} \ diff --git a/graphics/png/buildlink3.mk b/graphics/png/buildlink3.mk index 8de41e9f583..a69b5f880a8 100644 --- a/graphics/png/buildlink3.mk +++ b/graphics/png/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2004/08/06 11:22:34 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2004/08/09 07:37:35 recht Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PNG_BUILDLINK3_MK:= ${PNG_BUILDLINK3_MK}+ @@ -11,7 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npng} BUILDLINK_PACKAGES+= png .if !empty(PNG_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.png+= png>=1.2.6rc1 +BUILDLINK_DEPENDS.png+= png>=1.2.6rc1 +BUILDLINK_RECOMMENDED.png?= png>=1.2.6rc2 BUILDLINK_PKGSRCDIR.png?= ../../graphics/png .endif # PNG_BUILDLINK3_MK diff --git a/graphics/png/distinfo b/graphics/png/distinfo index 4241b75a4fb..bfe583c676e 100644 --- a/graphics/png/distinfo +++ b/graphics/png/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.19 2004/08/06 09:25:18 drochner Exp $ +$NetBSD: distinfo,v 1.20 2004/08/09 07:37:35 recht Exp $ -SHA1 (libpng-1.2.6rc1.tar.bz2) = ac2ffd8dd3d2deeff427784bc843eab90a262bed -Size (libpng-1.2.6rc1.tar.bz2) = 377757 bytes +SHA1 (libpng-1.2.6rc2.tar.bz2) = c149c61a2595c9c5ddf4d60d45ed529c47de5c75 +Size (libpng-1.2.6rc2.tar.bz2) = 377856 bytes SHA1 (patch-aa) = 0b3d28e526f8d1530e82c30be46aea19e5a32d6a -SHA1 (patch-ab) = be7dc4a3e21c0056a913c5f1488528558024e6ea -SHA1 (patch-ad) = 609bf8f97d4d4a36340685b95ff84f7960d8706f +SHA1 (patch-ab) = 58b007d8ac0a41118b90e826ec2df32f64b06411 +SHA1 (patch-ad) = 5b880c6d47682349bd994eaea8aeac6c51d264e5 SHA1 (patch-ae) = d5be0cdcfdd6c30a17b9633e28afb868911195aa diff --git a/graphics/png/patches/patch-ab b/graphics/png/patches/patch-ab index 9d29263cae6..38be3ecba78 100644 --- a/graphics/png/patches/patch-ab +++ b/graphics/png/patches/patch-ab @@ -1,7 +1,8 @@ -$NetBSD: patch-ab,v 1.6 2002/11/26 21:39:14 cjep Exp $ ---- pngtest.c.orig Thu Oct 3 13:32:30 2002 -+++ pngtest.c Mon Nov 4 14:44:39 2002 -@@ -567,7 +567,7 @@ +$NetBSD: patch-ab,v 1.7 2004/08/09 07:37:35 recht Exp $ + +--- pngtest.c.orig 2004-08-08 04:42:44.000000000 +0200 ++++ pngtest.c 2004-08-08 12:27:49.000000000 +0200 +@@ -579,7 +579,7 @@ } if (pinfo->next == NULL) { @@ -10,7 +11,7 @@ $NetBSD: patch-ab,v 1.6 2002/11/26 21:39:14 cjep Exp $ break; } ppinfo = &pinfo->next; -@@ -1422,8 +1422,8 @@ +@@ -1438,8 +1438,8 @@ current_allocation); while (pinfo != NULL) { @@ -21,7 +22,7 @@ $NetBSD: patch-ab,v 1.6 2002/11/26 21:39:14 cjep Exp $ pinfo = pinfo->next; } } -@@ -1497,8 +1497,8 @@ +@@ -1513,8 +1513,8 @@ current_allocation); while (pinfo != NULL) { diff --git a/graphics/png/patches/patch-ad b/graphics/png/patches/patch-ad index 15c645e4bc7..494addbe736 100644 --- a/graphics/png/patches/patch-ad +++ b/graphics/png/patches/patch-ad @@ -1,11 +1,11 @@ -$NetBSD: patch-ad,v 1.2 2004/08/06 09:25:18 drochner Exp $ +$NetBSD: patch-ad,v 1.3 2004/08/09 07:37:35 recht Exp $ ---- scripts/libpng.pc.in.orig 2004-08-04 13:34:51.000000000 +0200 -+++ scripts/libpng.pc.in -@@ -7,5 +7,5 @@ includedir=${exec_prefix}/include +--- scripts/libpng.pc.in.orig 2004-08-08 04:42:48.000000000 +0200 ++++ scripts/libpng.pc.in 2004-08-08 12:29:46.000000000 +0200 +@@ -7,5 +7,5 @@ Name: libpng12 Description: Loads and saves PNG files - Version: 1.2.6rc1 + Version: 1.2.6rc2 -Libs: -L${libdir} -lpng12 -lz -lm -Cflags: -I${includedir}/libpng12 +Libs: -L${libdir} -lpng -lz -lm -- cgit v1.2.3