diff options
author | fredb <fredb> | 2002-03-13 17:43:38 +0000 |
---|---|---|
committer | fredb <fredb> | 2002-03-13 17:43:38 +0000 |
commit | 6b545d90c9b9c3f4b94b0d9853221860bc58730f (patch) | |
tree | c2d9a2dd09ff50a06a95cb04ff064daca158792b | |
parent | 3e16215ca52f8cd61aaaa501d4314bc6004ed4db (diff) | |
download | pkgsrc-6b545d90c9b9c3f4b94b0d9853221860bc58730f.tar.gz |
Update png to 1.2.1. Includes an ABI change and a concommittent bump in the
shared library version, and in the dependendency information for hundreds of
other packages. [Update to png itself was supplied by Thomas Wizner.]
Relevant changes since 1.0.12, extracted from the "CHANGES" file:
Re-enabled PNG_MNG_FEATURES_SUPPORTED and enabled PNG_ASSEMBLER_CODE_SUPPORTED
by default.
Added runtime selection of MMX features.
Added png_set_strip_error_numbers function and related macros.
Added a check for attempts to read or write PLTE in grayscale PNG datastreams.
Enabled user memory function by default.
Modified png_create_struct so it passes user mem_ptr to user memory allocator.
Increased png_mng_features flag from png_byte to png_uint_32.
Check for missing profile length field in iCCP chunk and free chunk_data
in case of truncated iCCP chunk.
Revised contrib/gregbook/rpng*-x.c to avoid a memory leak and to exit cleanly
if user attempts to run it on an 8-bit display.
Updated contrib/gregbook
Use png_malloc instead of png_zalloc to allocate palette in pngset.c
Added some typecasts to eliminate gcc 3.0 warnings. Changed prototypes
of png_write_oFFS width and height from png_uint_32 to png_int_32.
Updated example.c
Revised prototypes for png_debug_malloc and png_debug_free in pngtest.c
Revised contrib/gregbook
Revised pnggccrd.c to conditionally compile some thread-unsafe code only
when PNG_THREAD_UNSAFE_OK is defined.
Added tests to prevent pngwutil.c from writing a bKGD or tRNS chunk with
value exceeding 2^bit_depth-1
Replaced calls to fprintf(stderr,...) with png_warning() in pnggccrd.c
Removed restriction that do_invert_mono only operate on 1-bit opaque files
Changed a png_warning() to png_debug() in pnggccrd.c
Fixed contrib/gregbook/rpng-x.c, rpng2-x.c to avoid crash with XFreeGC().
Include background_1 in png_struct regardless of gamma support.
Revised example.c to provide more details about using row_callback().
Added type cast to each NULL appearing in a function call, except for
WINCE functions.
Removed type casts from all NULLs.
Simplified png_create_struct_2().
Revised png_create_info_struct() and png_creat_struct_2().
Added error message if png_write_info() was omitted.
Type cast NULLs appearing in function calls when _NO_PROTO or
PNG_TYPECAST_NULL is defined.
Type cast NULLs appearing in function calls except when PNG_NO_TYPECAST_NULL
is defined.
Changed typecast of "size" argument to png_size_t in pngmem.c calls to
the user malloc_fn, to agree with the prototype in png.h
Added a pop/push operation to pnggccrd.c, to preserve Eflag (Maxim Sobolev)
Added a pop/push operation to pngvcrd.c, to preserve Eflag.
Always allocate 256-entry internal palette, hist, and trans arrays, to
avoid out-of-bounds memory reference caused by invalid PNG datastreams.
Added a check for prefix_length > data_length in iCCP chunk handler.
-rw-r--r-- | graphics/png/Makefile | 9 | ||||
-rw-r--r-- | graphics/png/PLIST | 6 | ||||
-rw-r--r-- | graphics/png/buildlink.mk | 4 | ||||
-rw-r--r-- | graphics/png/distinfo | 8 | ||||
-rw-r--r-- | graphics/png/patches/patch-aa | 4 |
5 files changed, 16 insertions, 15 deletions
diff --git a/graphics/png/Makefile b/graphics/png/Makefile index be043f3f206..e2f9e28820f 100644 --- a/graphics/png/Makefile +++ b/graphics/png/Makefile @@ -1,13 +1,14 @@ -# $NetBSD: Makefile,v 1.38 2001/08/03 23:19:25 wiz Exp $ +# $NetBSD: Makefile,v 1.39 2002/03/13 17:43:38 fredb Exp $ # On update, don't forget to increase shared library major/minor's in # accordance with changes (patch-aa). -DISTNAME= libpng-1.0.12 +DISTNAME= libpng-1.2.1 PKGNAME= ${DISTNAME:S/lib//} CATEGORIES= graphics -MASTER_SITES= ftp://ftp.libpng.org/pub/png/src/ \ - ftp://ftp.cdrom.com/pub/png/src/ \ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpng/} \ + http://www.libpng.org/pub/png/src/ \ ftp://swrinde.nde.swri.edu/pub/png/src/ \ + ftp://ftp.simplesystems.org/pub/libpng/src/ \ ftp://ftp.fu-berlin.de/unix/graphics/png/src/ MAINTAINER= tron@netbsd.org diff --git a/graphics/png/PLIST b/graphics/png/PLIST index 0b8ee7a4f69..1c4c495750b 100644 --- a/graphics/png/PLIST +++ b/graphics/png/PLIST @@ -1,11 +1,11 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:53:14 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/03/13 17:43:38 fredb Exp $ include/png.h include/pngconf.h lib/libpng.a lib/libpng.la lib/libpng.so -lib/libpng.so.2 -lib/libpng.so.2.1 +lib/libpng.so.3 +lib/libpng.so.3.0 man/man3/libpng.3 man/man3/libpngpf.3 man/man5/png.5 diff --git a/graphics/png/buildlink.mk b/graphics/png/buildlink.mk index a73ad2c6d95..e0416d58123 100644 --- a/graphics/png/buildlink.mk +++ b/graphics/png/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.9 2001/07/27 13:33:31 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.10 2002/03/13 17:43:38 fredb Exp $ # # This Makefile fragment is included by packages that use libpng. # @@ -17,7 +17,7 @@ PNG_BUILDLINK_MK= # defined .include "../../mk/bsd.buildlink.mk" -BUILDLINK_DEPENDS.png?= png>=1.0.11 +BUILDLINK_DEPENDS.png?= png>=1.2.1 DEPENDS+= ${BUILDLINK_DEPENDS.png}:../../graphics/png EVAL_PREFIX+= BUILDLINK_PREFIX.png=png diff --git a/graphics/png/distinfo b/graphics/png/distinfo index 4e718271f55..4f252aeb260 100644 --- a/graphics/png/distinfo +++ b/graphics/png/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.5 2001/08/03 23:19:25 wiz Exp $ +$NetBSD: distinfo,v 1.6 2002/03/13 17:43:38 fredb Exp $ -SHA1 (libpng-1.0.12.tar.gz) = 1ee0ca508a0f6bd4de3b121dd89d026456b06540 -Size (libpng-1.0.12.tar.gz) = 481387 bytes -SHA1 (patch-aa) = 1613f76594ed33705c7ba2e8e517bbd77ad034ba +SHA1 (libpng-1.2.1.tar.gz) = 829dd4e00cc463dd3fa471032a9836cbff07aea5 +Size (libpng-1.2.1.tar.gz) = 493105 bytes +SHA1 (patch-aa) = be98bd25c8597df17bda14567ae2f128247a35e0 diff --git a/graphics/png/patches/patch-aa b/graphics/png/patches/patch-aa index b1aec12c96c..7fc26be6b5e 100644 --- a/graphics/png/patches/patch-aa +++ b/graphics/png/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.17 2001/08/03 23:19:26 wiz Exp $ +$NetBSD: patch-aa,v 1.18 2002/03/13 17:43:38 fredb Exp $ --- scripts/makefile.std.orig Fri Jan 5 19:25:50 2001 +++ scripts/makefile.std Sun May 27 22:36:02 2001 @@ -35,7 +35,7 @@ $NetBSD: patch-aa,v 1.17 2001/08/03 23:19:26 wiz Exp $ - ar rc $@ $(OBJS) - $(RANLIB) $@ +libpng.la: $(OBJS) -+ ${LIBTOOL} --mode=link $(REALCC) -o $@ ${OBJS:.o=.lo} -rpath ${PREFIX}/lib ${LDFLAGS} -lz -lm -version-info 2:1 ++ ${LIBTOOL} --mode=link $(REALCC) -o $@ ${OBJS:.o=.lo} -rpath ${PREFIX}/lib ${LDFLAGS} -lz -lm -version-info 3:0 -pngtest: pngtest.o libpng.a - $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) |