head 1.34; access; symbols pkgsrc-2013Q4:1.33.0.8 pkgsrc-2013Q4-base:1.33 pkgsrc-2013Q3:1.33.0.6 pkgsrc-2013Q3-base:1.33 pkgsrc-2013Q2:1.33.0.4 pkgsrc-2013Q2-base:1.33 pkgsrc-2013Q1:1.33.0.2 pkgsrc-2013Q1-base:1.33 pkgsrc-2012Q4:1.32.0.10 pkgsrc-2012Q4-base:1.32 pkgsrc-2012Q3:1.32.0.8 pkgsrc-2012Q3-base:1.32 pkgsrc-2012Q2:1.32.0.6 pkgsrc-2012Q2-base:1.32 pkgsrc-2012Q1:1.32.0.4 pkgsrc-2012Q1-base:1.32 pkgsrc-2011Q4:1.32.0.2 pkgsrc-2011Q4-base:1.32 pkgsrc-2011Q3:1.30.0.6 pkgsrc-2011Q3-base:1.30 pkgsrc-2011Q2:1.30.0.4 pkgsrc-2011Q2-base:1.30 pkgsrc-2011Q1:1.30.0.2 pkgsrc-2011Q1-base:1.30 pkgsrc-2010Q4:1.29.0.4 pkgsrc-2010Q4-base:1.29 pkgsrc-2010Q3:1.29.0.2 pkgsrc-2010Q3-base:1.29 pkgsrc-2010Q2:1.28.0.2 pkgsrc-2010Q2-base:1.28 pkgsrc-2010Q1:1.27.0.26 pkgsrc-2010Q1-base:1.27 pkgsrc-2009Q4:1.27.0.24 pkgsrc-2009Q4-base:1.27 pkgsrc-2009Q3:1.27.0.22 pkgsrc-2009Q3-base:1.27 pkgsrc-2009Q2:1.27.0.20 pkgsrc-2009Q2-base:1.27 pkgsrc-2009Q1:1.27.0.18 pkgsrc-2009Q1-base:1.27 pkgsrc-2008Q4:1.27.0.16 pkgsrc-2008Q4-base:1.27 pkgsrc-2008Q3:1.27.0.14 pkgsrc-2008Q3-base:1.27 cube-native-xorg:1.27.0.12 cube-native-xorg-base:1.27 pkgsrc-2008Q2:1.27.0.10 pkgsrc-2008Q2-base:1.27 cwrapper:1.27.0.8 pkgsrc-2008Q1:1.27.0.6 pkgsrc-2008Q1-base:1.27 pkgsrc-2007Q4:1.27.0.4 pkgsrc-2007Q4-base:1.27 pkgsrc-2007Q3:1.27.0.2 pkgsrc-2007Q3-base:1.27 pkgsrc-2007Q2:1.26.0.6 pkgsrc-2007Q2-base:1.26 pkgsrc-2007Q1:1.26.0.4 pkgsrc-2007Q1-base:1.26 pkgsrc-2006Q4:1.26.0.2 pkgsrc-2006Q4-base:1.26 pkgsrc-2006Q3:1.25.0.4 pkgsrc-2006Q3-base:1.25 pkgsrc-2006Q2:1.25.0.2 pkgsrc-2006Q2-base:1.25 pkgsrc-2006Q1:1.22.0.16 pkgsrc-2006Q1-base:1.22 pkgsrc-2005Q4:1.22.0.14 pkgsrc-2005Q4-base:1.22 pkgsrc-2005Q3:1.22.0.12 pkgsrc-2005Q3-base:1.22 pkgsrc-2005Q2:1.22.0.10 pkgsrc-2005Q2-base:1.22 pkgsrc-2005Q1:1.22.0.8 pkgsrc-2005Q1-base:1.22 pkgsrc-2004Q4:1.22.0.6 pkgsrc-2004Q4-base:1.22 pkgsrc-2004Q3:1.22.0.4 pkgsrc-2004Q3-base:1.22 pkgsrc-2004Q2:1.22.0.2 pkgsrc-2004Q2-base:1.22 pkgsrc-2004Q1:1.20.0.6 pkgsrc-2004Q1-base:1.20 pkgsrc-2003Q4:1.20.0.4 pkgsrc-2003Q4-base:1.20 netbsd-1-6-1:1.20.0.2 netbsd-1-6-1-base:1.20 netbsd-1-6:1.19.0.6 netbsd-1-6-RELEASE-base:1.19 pkgviews:1.19.0.2 pkgviews-base:1.19 buildlink2:1.18.0.2 buildlink2-base:1.19 netbsd-1-5-PATCH003:1.18 netbsd-1-5-PATCH001:1.14 netbsd-1-5-RELEASE:1.11 netbsd-1-4-PATCH003:1.11 netbsd-1-4-PATCH002:1.8 comdex-fall-1999:1.7 netbsd-1-4-PATCH001:1.7 netbsd-1-4-RELEASE:1.7 netbsd-1-3-PATCH003:1.6 netbsd-1-3-PATCH002:1.3 FreeBSD-current-1997-10-05:1.1.1.1 FREEBSD:1.1.1; locks; strict; comment @# @; 1.34 date 2014.02.06.18.24.11; author wiz; state dead; branches; next 1.33; commitid cIxa7vESzQXKm4ox; 1.33 date 2013.01.24.08.15.51; author wiz; state Exp; branches 1.33.8.1; next 1.32; 1.32 date 2011.11.06.23.53.46; author wiz; state Exp; branches; next 1.31; 1.31 date 2011.10.05.16.23.39; author hans; state Exp; branches; next 1.30; 1.30 date 2011.01.13.13.27.22; author wiz; state Exp; branches 1.30.6.1; next 1.29; 1.29 date 2010.09.24.08.58.41; author wiz; state Exp; branches; next 1.28; 1.28 date 2010.06.13.22.42.10; author wiz; state Exp; branches; next 1.27; 1.27 date 2007.08.29.20.58.26; author wiz; state Exp; branches; next 1.26; 1.26 date 2006.11.28.21.58.17; author drochner; state Exp; branches; next 1.25; 1.25 date 2006.05.17.21.48.57; author wiz; state Exp; branches; next 1.24; 1.24 date 2006.04.16.23.19.15; author wiz; state dead; branches; next 1.23; 1.23 date 2006.04.16.19.39.46; author wiz; state Exp; branches; next 1.22; 1.22 date 2004.04.27.22.40.35; author tv; state Exp; branches; next 1.21; 1.21 date 2004.04.27.19.36.27; author tv; state Exp; branches; next 1.20; 1.20 date 2002.08.25.18.39.22; author jlam; state Exp; branches; next 1.19; 1.19 date 2002.07.19.14.33.09; author fredb; state Exp; branches; next 1.18; 1.18 date 2002.03.13.17.43.38; author fredb; state Exp; branches 1.18.2.1; next 1.17; 1.17 date 2001.08.03.23.19.26; author wiz; state Exp; branches; next 1.16; 1.16 date 2001.05.28.02.41.55; author jlam; state Exp; branches; next 1.15; 1.15 date 2001.05.21.21.39.14; author wiz; state Exp; branches; next 1.14; 1.14 date 2001.03.04.07.53.34; author tron; state Exp; branches; next 1.13; 1.13 date 2001.01.18.18.10.50; author wiz; state Exp; branches; next 1.12; 1.12 date 2001.01.13.01.33.20; author tron; state Exp; branches; next 1.11; 1.11 date 2000.10.06.01.38.51; author jlam; state Exp; branches; next 1.10; 1.10 date 2000.06.03.19.46.44; author wiz; state Exp; branches; next 1.9; 1.9 date 2000.03.21.22.07.59; author tron; state Exp; branches; next 1.8; 1.8 date 2000.02.09.15.46.29; author tron; state Exp; branches; next 1.7; 1.7 date 99.03.04.13.50.49; author tron; state Exp; branches; next 1.6; 1.6 date 98.08.07.10.40.53; author agc; state Exp; branches; next 1.5; 1.5 date 98.07.15.11.45.55; author tv; state Exp; branches; next 1.4; 1.4 date 98.06.26.21.12.06; author tron; state Exp; branches; next 1.3; 1.3 date 97.10.31.12.33.59; author mycroft; state Exp; branches; next 1.2; 1.2 date 97.10.06.13.42.03; author agc; state Exp; branches; next 1.1; 1.1 date 97.10.06.13.29.39; author agc; state Exp; branches 1.1.1.1; next ; 1.33.8.1 date 2014.02.27.15.54.45; author tron; state dead; branches; next ; commitid 8Tgot65jQmR2SKqx; 1.30.6.1 date 2011.10.06.08.08.58; author tron; state Exp; branches; next ; 1.18.2.1 date 2002.08.22.11.11.39; author jlam; state Exp; branches; next ; 1.1.1.1 date 97.10.06.13.29.39; author agc; state Exp; branches; next ; desc @@ 1.34 log @Update to 1.6.9, getting rid of the final two patches after discussion with very helpful upstream. Changes: Version 1.6.9beta01 [December 26, 2013] Bookkeeping: Moved functions around (no changes). Moved transform function definitions before the place where they are called so that they can be masde static. Move the intrapixel functions and the grayscale palette builder out of the png?tran.c files. The latter isn't a transform function and is no longer used internally, and the former MNG specific functions are better placed in pngread/pngwrite.c Made transform implementation functions static. This makes the internal functions called by png_do_{read|write}_transformations static. On an x86-64 DLL build (Gentoo Linux) this reduces the size of the text segment of the DLL by 1208 bytes, about 0.6%. It also simplifies maintenance by removing the declarations from pngpriv.h and allowing easier changes to the internal interfaces. Rebuilt configure scripts with automake-1.14.1 and autoconf-2.69 in the tar distributions. Version 1.6.9beta02 [January 1, 2014] Added checks for libpng 1.5 to pngvalid.c. This supports the use of this version of pngvalid in libpng 1.5 Merged with pngvalid.c from libpng-1.7 changes to create a single pngvalid.c Removed #error macro from contrib/tools/pngfix.c (Thomas Klausner). Merged pngrio.c, pngtrans.c, pngwio.c, and pngerror.c with libpng-1.7.0 Merged libpng-1.7.0 changes to make no-interlace configurations work with test programs. Revised pngvalid.c to support libpng 1.5, which does not support the PNG_MAXIMUM_INFLATE_WINDOW option, so #define it out when appropriate in pngvalid.c Allow unversioned links created on install to be disabled in configure. In configure builds 'make install' changes/adds links like png.h and libpng.a to point to the newly installed, versioned, files (e.g. libpng17/png.h and libpng17.a). Three new configure options and some rearrangement of Makefile.am allow creation of these links to be disabled. Version 1.6.9beta03 [January 10, 2014] Removed potentially misleading warning from png_check_IHDR(). Version 1.6.9beta04 [January 20, 2014] Updated scripts/makefile.* to use CPPFLAGS (Cosmin). Added clang attribute support (Cosmin). Version 1.6.9rc01 [January 28, 2014] No changes. Version 1.6.9rc02 [January 30, 2014] Quiet an uninitialized memory warning from VC2013 in png_get_png(). Version 1.6.9 [February 6, 2014] @ text @$NetBSD: patch-aa,v 1.33 2013/01/24 08:15:51 wiz Exp $ Don't install compat links to libpng. Programs should use the pkg-config or libpng-config scripts to get the correct png library name. --- Makefile.in.orig 2013-01-24 02:59:12.000000000 +0000 +++ Makefile.in @@@@ -1526,15 +1526,6 @@@@ install-exec-hook: cd '$(DESTDIR)$(bindir)'; rm -f libpng-config cd '$(DESTDIR)$(bindir)';\ $(LN_S) $(PNGLIB_BASENAME)-config libpng-config - @@set -x;\ - cd '$(DESTDIR)$(libdir)';\ - for ext in a la so so.@@PNGLIB_MAJOR@@@@PNGLIB_MINOR@@.@@PNGLIB_RELEASE@@\ - sl dylib dll.a; do\ - rm -f libpng.$$ext;\ - if test -f $(PNGLIB_BASENAME).$$ext; then\ - $(LN_S) $(PNGLIB_BASENAME).$$ext libpng.$$ext;\ - fi;\ - done uninstall-hook: cd '$(DESTDIR)$(includedir)'; rm -f png.h pngconf.h pnglibconf.h @ 1.33 log @Update to 1.5.14: Changes since the last public release (1.5.13): Added -DZ_SOLO to contrib/pngminim/*/makefile to work with zlib-1.2.7 Warn about the incorrect runtime library setting for VS2010 debug DLL builds. Fixed build when using #define PNG_NO_READ_GAMMA in png_do_compose() in pngrtran.c (Domani Hannes). Check for png_ptr==NULL earlier in png_zalloc(). Ignore, with a warning, out-of-range value of num_trans in png_set_tRNS(). Rearranged building of ARM NEON optimizations. The ARM specific code is split out entirely to the arm subdirectory and changes to configure.acand Makefile.am to add new stuff are reduced. Now material code changes, although for build test purposes, --enable-arm-neon now builds on non-ARM systems. Rebuilt Makefile.in, configure, etc., with autoconf-2.69 and automake-1.12.5. Fixed cases of unquoted DESTDIR in Makefile.am Fixed a minor bug in types to malloc and major bug in handling compressed iTXt. Compressed iTXt could not be handled. Cleaned up whitespace in the synopsis portion of the manpage "libpng.3" Disassembled the version number in scripts/options.awk (necessary for building on SunOs). Fixed Windows build issues, enabled ARM compilation. Various warnings issued by earlier versions of GCC fixed for Cygwin and Min/GW (which both use old GCCs.) ARM support is enabled by default in zlib.props (unsupported by Microsoft) and ARM compilation is made possible by deleting the check for x86. The test programs cannot be run because they are not signed. Fixed 'make distcheck' on SUN OS - libpng.so was not being removed Replaced AM_CONFIG_HEADER(config.h) with AC_CONFIG_HEADERS([config.h]) in configure.ac De-configured build fixes to make a range of deconfiguration options (such as switching off read or write support) work in more cases. Also upgraded pngtest and pngvalid to the libpng 1.6 versions (with some modifications) which provide more extensive testing. Replaced pngtest.png because pngtest writes the ancillary chunks in a different order. Check validity of "num_unknowns" parameter of png_set_unknown_chunks() (Bug report from yuris). Check the validity of the "nentries" parameter of png_set_sPLT() and the "num_text" parameter of png_set_text_2(). @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.32 2011/11/06 23:53:46 wiz Exp $ @ 1.33.8.1 log @Pullup ticket #4334 - requested by wiz graphics/png: security update Revisions pulled up: - graphics/png/Makefile 1.166-1.168 - graphics/png/distinfo 1.111-1.113 - graphics/png/patches/patch-aa deleted - graphics/png/patches/patch-contrib_tools_pngfix.c deleted --- Module Name: pkgsrc Committed By: wiz Date: Tue Dec 31 17:27:48 UTC 2013 Modified Files: pkgsrc/graphics/png: Makefile distinfo Log Message: Update to 1.6.8: Version 1.6.8beta01 [November 24, 2013] Moved prototype for png_handle_unknown() in pngpriv.h outside of the #ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED/#endif block. Added "-Wall" to CFLAGS in contrib/pngminim/*/makefile Conditionally compile some unused functions reported by -Wall in pngminim. Fixed 'minimal' builds. Various obviously useful minimal configurations don't build because of missing contrib/libtests test programs and overly complex dependencies in scripts/pnglibconf.dfa. This change adds contrib/conftest/*.dfa files that can be used in automatic build scripts to ensure that these configurations continue to build. Enabled WRITE_INVERT and WRITE_PACK in contrib/pngminim/encoder. Fixed pngvalid 'fail' function declaration on the Intel C Compiler. This reverts to the previous 'static' implementation and works round the 'unused static function' warning by using PNG_UNUSED(). Version 1.6.8beta02 [November 30, 2013] Removed or marked PNG_UNUSED some harmless "dead assignments" reported by clang scan-build. Changed tabs to 3 spaces in png_debug macros and changed '"%s"m' to '"%s" m' to improve portability among compilers. Changed png_free_default() to free() in pngtest.c Version 1.6.8rc01 [December 12, 2013] Tidied up pngfix inits and fixed pngtest no-write builds. Version 1.6.8rc02 [December 14, 2013] Handle zero-length PLTE chunk or NULL palette with png_error() instead of png_chunk_report(), which by default issues a warning rather than an error, leading to later reading from a NULL pointer (png_ptr->palette) in png_do_expand_palette(). This is CVE-2013-6954 and VU#650142. Version 1.6.8 [December 19, 2013] --- Module Name: pkgsrc Committed By: wiz Date: Thu Feb 6 18:24:11 UTC 2014 Modified Files: pkgsrc/graphics/png: Makefile distinfo Removed Files: pkgsrc/graphics/png/patches: patch-aa patch-contrib_tools_pngfix.c Log Message: Update to 1.6.9, getting rid of the final two patches after discussion with very helpful upstream. Changes: Version 1.6.9beta01 [December 26, 2013] Bookkeeping: Moved functions around (no changes). Moved transform function definitions before the place where they are called so that they can be masde static. Move the intrapixel functions and the grayscale palette builder out of the png?tran.c files. The latter isn't a transform function and is no longer used internally, and the former MNG specific functions are better placed in pngread/pngwrite.c Made transform implementation functions static. This makes the internal functions called by png_do_{read|write}_transformations static. On an x86-64 DLL build (Gentoo Linux) this reduces the size of the text segment of the DLL by 1208 bytes, about 0.6%. It also simplifies maintenance by removing the declarations from pngpriv.h and allowing easier changes to the internal interfaces. Rebuilt configure scripts with automake-1.14.1 and autoconf-2.69 in the tar distributions. Version 1.6.9beta02 [January 1, 2014] Added checks for libpng 1.5 to pngvalid.c. This supports the use of this version of pngvalid in libpng 1.5 Merged with pngvalid.c from libpng-1.7 changes to create a single pngvalid.c Removed #error macro from contrib/tools/pngfix.c (Thomas Klausner). Merged pngrio.c, pngtrans.c, pngwio.c, and pngerror.c with libpng-1.7.0 Merged libpng-1.7.0 changes to make no-interlace configurations work with test programs. Revised pngvalid.c to support libpng 1.5, which does not support the PNG_MAXIMUM_INFLATE_WINDOW option, so #define it out when appropriate in pngvalid.c Allow unversioned links created on install to be disabled in configure. In configure builds 'make install' changes/adds links like png.h and libpng.a to point to the newly installed, versioned, files (e.g. libpng17/png.h and libpng17.a). Three new configure options and some rearrangement of Makefile.am allow creation of these links to be disabled. Version 1.6.9beta03 [January 10, 2014] Removed potentially misleading warning from png_check_IHDR(). Version 1.6.9beta04 [January 20, 2014] Updated scripts/makefile.* to use CPPFLAGS (Cosmin). Added clang attribute support (Cosmin). Version 1.6.9rc01 [January 28, 2014] No changes. Version 1.6.9rc02 [January 30, 2014] Quiet an uninitialized memory warning from VC2013 in png_get_png(). Version 1.6.9 [February 6, 2014] --- Module Name: pkgsrc Committed By: wiz Date: Thu Feb 27 15:07:09 UTC 2014 Modified Files: pkgsrc/graphics/png: Makefile distinfo Log Message: Update to 1.6.10rc01: This fixes CERT VU#684412 and CVE-2014-0333. Version 1.6.10beta01 [February 9, 2014] Backported changes from libpng-1.7.0beta30 and beta31: Fixed a large number of instances where PNGCBAPI was omitted from function definitions. Added pngimage test program for png_read_png() and png_write_png() with two new test scripts. Removed dependence on !PNG_READ_EXPAND_SUPPORTED for calling png_set_packing() in png_read_png(). Fixed combination of ~alpha with shift. On read invert alpha, processing occurred after shift processing, which causes the final values to be outside the range that should be produced by the shift. Reversing the order on read makes the two transforms work together correctly and mirrors the order used on write. Do not read invalid sBIT chunks. Previously libpng only checked sBIT values on write, so a malicious PNG writer could therefore cause the read code to return an invalid sBIT chunk, which might lead to application errors or crashes. Such chunks are now skipped (with chunk_benign_error). Make png_read_png() and png_write_png() prototypes in png.h depend upon PNG_READ_SUPPORTED and PNG_WRITE_SUPPORTED. Support builds with unsupported PNG_TRANSFORM_* values. All of the PNG_TRANSFORM_* values are always defined in png.h and, because they are used for both read and write in some cases, it is not reliable to #if out ones that are totally unsupported. This change adds error detection in png_read_image() and png_write_image() to do a png_app_error() if the app requests something that cannot be done and it adds corresponding code to pngimage.c to handle such options by not attempting to test them. Version 1.6.10beta02 [February 23, 2014] Moved redefines of png_error(), png_warning(), png_chunk_error(), and png_chunk_warning() from pngpriv.h to png.h to make them visible to libpng-calling applications. Moved OS dependent code from arm/arm_init.c, to allow the included implementation of the ARM NEON discovery function to be set at build-time and provide sample implementations from the current code in the contrib/arm-neon subdirectory. The __linux__ code has also been changed to compile and link on Android by using /proc/cpuinfo, and the old linux code is in contrib/arm-neon/linux-auxv.c. The new code avoids POSIX and Linux dependencies apart from opening /proc/cpuinfo and is C90 compliant. Check for info_ptr == NULL early in png_read_end() so we don't need to run all the png_handle_*() and depend on them to return if info_ptr == NULL. This improves the performance of png_read_end(png_ptr, NULL) and makes it more robust against future programming errors. Check for __has_extension before using it in pngconf.h, to support older Clang versions (Jeremy Sequoia). Treat CRC error handling with png_set_crc_action(), instead of with png_set_benign_errors(), which has been the case since libpng-1.6.0beta18. Use a user warning handler in contrib/gregbook/readpng2.c instead of default, so warnings will be put on stderr even if libpng has CONSOLE_IO disabled. Added png_ptr->process_mode = PNG_READ_IDAT_MODE in png_push_read_chunk after recognizing the IDAT chunk, which avoids an infinite loop while reading a datastream whose first IDAT chunk is of zero-length. This fixes CERT VU#684412 and CVE-2014-0333. Don't recognize known sRGB profiles as sRGB if they have been hacked, but don't reject them and don't issue a copyright violation warning. Version 1.6.10beta03 [February 25, 2014] Moved some documentation from png.h to libpng.3 and libpng-manual.txt Minor editing of contrib/arm-neon/README and contrib/examples/*.c Version 1.6.10rc01 [February 27, 2014] Fixed typos in the manual and in scripts/pnglibconf.dfa (CFLAGS -> CPPFLAGS and PNG_USR_CONFIG -> PNG_USER_CONFIG). @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.33 2013/01/24 08:15:51 wiz Exp $ @ 1.32 log @Update to 1.5.6, which integrated part of patch-aa (see beta04). Version 1.5.6beta01 [September 22, 2011] Fixed some 64-bit type conversion warnings in pngrtran.c Moved row_info from png_struct to a local variable. The various interlace mask arrays have been made into arrays of bytes and made PNG_CONST and static (previously some arrays were marked PNG_CONST and some weren't). Additional checks have been added to the transform code to validate the pixel depths after the transforms on both read and write. Removed some redundant code from pngwrite.c, in png_destroy_write_struct(). Changed chunk reading/writing code to use png_uint_32 instead of png_byte[4]. This removes the need to allocate temporary strings for chunk names on the stack in the read/write code. Unknown chunk handling still uses the string form because this is exposed in the API. Version 1.5.6beta02 [September 26, 2011] Added a note in the manual the png_read_update_info() must be called only once with a particular info_ptr. Fixed a typo in the definition of the new PNG_STRING_FROM_CHUNK(s,c) macro. Version 1.5.6beta03 [September 28, 2011] Revised test-pngtest.sh to report FAIL when pngtest fails. Added "--strict" option to pngtest, to report FAIL when the failure is only because the resulting valid files are different. Revised CMakeLists.txt to work with mingw and removed some material from CMakeLists.txt that is no longer useful in libpng-1.5. Version 1.5.6beta04 [October 5, 2011] Fixed typo in Makefile.in and Makefile.am ("-M Wl" should be "-M -Wl")." Version 1.5.6beta05 [October 12, 2011] Speed up png_combine_row() for interlaced images. This reduces the generality of the code, allowing it to be optimized for Adam7 interlace. The masks passed to png_combine_row() are now generated internally, avoiding some code duplication and localizing the interlace handling somewhat. Align png_struct::row_buf - previously it was always unaligned, caused by a bug in the code that attempted to align it; the code needs to subtract one from the pointer to take account of the filter byte prepended to each row. Optimized png_combine_row() when rows are aligned. This gains a small percentage for 16-bit and 32-bit pixels in the typical case where the output row buffers are appropriately aligned. The optimization was not previously possible because the png_struct buffer was always misaligned. Fixed bug in png_write_chunk_header() debug print, introduced in 1.5.6beta01. Version 1.5.6beta06 [October 17, 2011] Removed two redundant tests for unitialized row. Fixed a relatively harmless memory overwrite in compressed text writing with a 1 byte zlib buffer. Add ability to call png_read_update_info multiple times to pngvalid.c. Fixes for multiple calls to png_read_update_info. These fixes attend to most of the errors revealed in pngvalid, however doing the gamma work twice results in inaccuracies that can't be easily fixed. There is now a warning in the code if this is going to happen. Turned on multiple png_read_update_info in pngvalid transform tests. Prevent libpng from overwriting unused bits at the end of the image when it is not byte aligned, while reading. Prior to libpng-1.5.6 libpng would overwrite the partial byte at the end of each row if the row width was not an exact multiple of 8 bits and the image is not interlaced. Version 1.5.6beta07 [October 21, 2011] Made png_ptr->prev_row an aligned pointer into png_ptr->big_prev_row (Mans Rullgard). Version 1.5.6rc01 [October 26, 2011] Changed misleading "Missing PLTE before cHRM" warning to "Out of place cHRM" Version 1.5.6rc02 [October 27, 2011] Added LSR() macro to defend against buggy compilers that evaluate non-taken code branches and complain about out-of-range shifts. Version 1.5.6rc03 [October 28, 2011] Renamed the LSR() macro to PNG_LSR() and added PNG_LSL() macro. Fixed compiler warnings with Intel and MSYS compilers. The logical shift fix for Microsoft Visual C is required by other compilers, so this enables that fix for all compilers when using compile-time constants. Under MSYS 'byte' is a name declared in a system header file, so we changed the name of a local variable to avoid the warnings that result. Added #define PNG_ALIGN_TYPE PNG_ALIGN_NONE to contrib/pngminim/*/pngusr.h Version 1.5.6 [November 3, 2011] No changes. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.31 2011/10/05 16:23:39 hans Exp $ d7 1 a7 1 --- Makefile.in.orig 2011-11-03 03:43:00.000000000 +0000 d9 4 a12 4 @@@@ -1356,14 +1356,6 @@@@ install-data-hook: install-exec-hook: cd $(DESTDIR)$(bindir); rm -f libpng-config cd $(DESTDIR)$(bindir); $(LN_S) $(PNGLIB_BASENAME)-config libpng-config d14 3 a16 2 - cd $(DESTDIR)$(libdir);\ - for ext in a la so so.@@PNGLIB_MAJOR@@@@PNGLIB_MINOR@@.@@PNGLIB_RELEASE@@ sl dylib dll.a; do\ d24 1 a24 1 cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h pnglibconf.h @ 1.31 log @Fix typo to make this build again on SunOS. @ text @d1 1 a1 3 $NetBSD: patch-aa,v 1.30 2011/01/13 13:27:22 wiz Exp $ It's -Wl, not Wl. d7 1 a7 1 --- Makefile.in.orig 2011-01-06 13:02:45.000000000 +0000 d9 1 a9 10 @@@@ -43,7 +43,7 @@@@ host_triplet = @@host@@ check_PROGRAMS = pngtest$(EXEEXT) pngvalid$(EXEEXT) # Versioned symbols and restricted exports -@@HAVE_LD_VERSION_SCRIPT_TRUE@@@@HAVE_SOLARIS_LD_TRUE@@am__append_1 = -Wl,-M Wl,libpng.vers +@@HAVE_LD_VERSION_SCRIPT_TRUE@@@@HAVE_SOLARIS_LD_TRUE@@am__append_1 = -Wl,-M -Wl,libpng.vers @@HAVE_LD_VERSION_SCRIPT_TRUE@@@@HAVE_SOLARIS_LD_FALSE@@am__append_2 = -Wl,--version-script=libpng.vers # Only restricted exports when possible @@HAVE_LD_VERSION_SCRIPT_FALSE@@am__append_3 = -export-symbols libpng.sym @@@@ -1342,14 +1342,6 @@@@ install-data-hook: @ 1.30 log @Update to 1.5.1beta01: 1.5.1beta01 contains a security fix for 1.5.0. The current public release, libpng 1.5.0, continues the evolution of the libpng API, finally hiding the contents of the venerable and hoary png_struct and png_info data structures inside private (i.e., non-installed) header files. (Apps that compiled with libpng 1.4 without warnings about deprecated features should happily compile with 1.5, too.) It also includes a new, more thorough test program (pngvalid.c), a new pnglibconf.h header file that tracks what features were enabled or disabled when libpng was built, and huge thanks to John Bowler, who did most of the work. Complete differences relative to libpng 1.4.x are detailed at http://www.libpng.org/pub/png/src/libpng-1.4.x-to-1.5.x-summary.txt . Since the shlib name changed, next up: PKGREVISION++ all across pkgsrc. @ text @d1 3 a3 1 $NetBSD: patch-aa,v 1.29 2010/09/24 08:58:41 wiz Exp $ d11 9 @ 1.30.6.1 log @Pullup ticket #3530 - requested by hans graphics/png: build fix Revisions pulled up: - graphics/png/distinfo 1.87 - graphics/png/patches/patch-aa 1.31 --- Module Name: pkgsrc Committed By: hans Date: Wed Oct 5 16:23:39 UTC 2011 Modified Files: pkgsrc/graphics/png: distinfo pkgsrc/graphics/png/patches: patch-aa Log Message: Fix typo to make this build again on SunOS. @ text @d1 1 a1 3 $NetBSD$ It's -Wl, not Wl. a8 9 @@@@ -43,7 +43,7 @@@@ host_triplet = @@host@@ check_PROGRAMS = pngtest$(EXEEXT) pngvalid$(EXEEXT) # Versioned symbols and restricted exports -@@HAVE_LD_VERSION_SCRIPT_TRUE@@@@HAVE_SOLARIS_LD_TRUE@@am__append_1 = -Wl,-M Wl,libpng.vers +@@HAVE_LD_VERSION_SCRIPT_TRUE@@@@HAVE_SOLARIS_LD_TRUE@@am__append_1 = -Wl,-M -Wl,libpng.vers @@HAVE_LD_VERSION_SCRIPT_TRUE@@@@HAVE_SOLARIS_LD_FALSE@@am__append_2 = -Wl,--version-script=libpng.vers # Only restricted exports when possible @@HAVE_LD_VERSION_SCRIPT_FALSE@@am__append_3 = -export-symbols libpng.sym @ 1.29 log @Update to 1.4.4: version 1.4.4beta01 [July 12, 2010] Removed extraneous new_push_process_row.c file. Revised the "SEE ALSO" style of libpng.3, libpngpf.3, and png.5 Removed some newly-added TAB characters from pngpread.c. Fixed some indentation in pngpread.c and pngrutil.c Changed "extern PNG_EXPORT" to "PNG_EXPORT" in png.h (Jan Nijtmans) Changed "extern" to "PNG_EXTERN" in pngpriv.h (except for the 'extern "C" {') Put "#ifndef PNG_EXTERN, #endif" around "#define PNG_EXTERN" in pngpriv.h version 1.4.4beta02 [July 24, 2010] Added -DNO_PNG_SNPRINTF to CFLAGS in scripts/makefile.dj2 Moved the definition of png_snprintf() outside of the enclosing #ifdef blocks in pngconf.h Added a special case typedef of png_longjmp_ptr for WATCOM. version 1.4.4beta03 [July 24, 2010] Removed reference to cbuilder5/* from Makefile.in and Makefile.am Eliminated the new special case typedef of png_longjmp_ptr for WATCOM and made a special case "#define PNGAPI" in pngconf.h instead. version 1.4.4beta04 [July 31, 2010] Updated the read macros and functions from 1.5.0beta38. version 1.4.4beta05 [August 6, 2010] Updated projects/visualc71 so it can find scripts/pnglibconf.h Removed unused png_mem_* defines from pngconf.h. Correct use of _WINDOWS_ in pngconf.h version 1.4.4beta06 [August 11, 2010] Don't try to use version-script with cygwin/mingw. Revised contrib/gregbook to work under cygwin/mingw. version 1.4.4beta07 [August 26, 2010] Updated prebuilt aclocal.m4 and ltmain.sh Add .dll.a to the list of extensions to be symlinked by Makefile.am (Yaakov) Updated CMakeLists.txt to use CMAKE_INSTALL_LIBDIR variable; useful for installing libpng in /usr/lib64 (Funda Wang). Revised CMakeLists.txt to put the man pages in share/man/man* not man/man* Revised CMakeLists.txt to make symlinks instead of copies when installing. Changed PNG_LIB_NAME from pngNN to libpngNN in CMakeLists.txt (Philip Lowman) Moved "#include pngusr.h" ahead of PNG_USER_PRIVATEBUILD test in pngconf.h Eliminated a deprecated reference to png_ptr->io_ptr in pngtest.c Eliminated new unnecessary #if tests regarding the sCAL chunk from pngrutil.c version 1.4.4beta08 [September 2, 2010] Updated the xcode project to work with libpng-1.4.x and added iOS targets for simulator and device (Philippe Hausler). version 1.4.4rc01 [September 10, 2010] No changes. version 1.4.4rc02 [September 13, 2010] Revised CMakeLists.txt (Philip Lowman). version 1.4.4rc03 [September 14, 2010] Removed an extraneous close-double-quote from CMakeLists.txt Eliminated another deprecated reference to png_ptr->io_ptr in pngtest.c version 1.4.4rc04 [September 16, 2010] Fixed indentation and removed debugging message from CMakeLists.txt Revised autogen.sh to recognize and use $AUTOCONF, $AUTOMAKE, $AUTOHEADER, $AUTOPOINT, $ACLOCAL and $LIBTOOLIZE version 1.4.4rc05 [September 20, 2010] Rebuilt configure scripts with automake-1.11.1 instead of automake-1.11. Removed unused mkinstalldirs file. version 1.4.4 [September 23, 2010] No changes. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.28 2010/06/13 22:42:10 wiz Exp $ d7 1 a7 1 --- Makefile.in.orig 2010-09-23 12:18:43.000000000 +0000 d9 1 a9 1 @@@@ -1242,14 +1242,6 @@@@ install-data-hook: d23 1 a23 1 cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h @ 1.28 log @Update to 1.4.2. Shared library name changes from libpn12.* to libpng14.*, so bump ABI depends. Remove libpng.* from package, instead use buildlink to help some packages that are looking for the library themselves instead of using pkg-config or libpng-config. Changes: version 1.4.2: Restored the macro definition of png_check_sig(). Conditionally compile an "else" statement in png_decompress_chunk(). Documented the fact that png_set_dither() was disabled since libpng-1.4.0. Reenabled png_set_dither() but renamed it to png_set_quantize() to reflect more accurately what it actually does. At the same time, renamed the PNG_DITHER_[RED,GREEN_BLUE]_BITS macros to PNG_QUANTIZE_[RED,GREEN,BLUE]_BITS. Added some "(long)" typecasts to printf calls in png_handle_cHRM(). Relaxed the overly-restrictive permissions of some files. Added the "vstudio" project to replace "visualc6" and "visualc71" which will be removed from libpng-1.5.0. Demonstrate in example.c that lang_key should be initialized. Set PNG_NO_READ_BGR, PNG_NO_IO_STATE, and PNG_NO_TIME_RFC1123 in contrib/pngminim/decoder/pngusr.h to make a smaller decoder application. Include png_reset_zstream() in png.c only when PNG_READ_SUPPORTED is defined. Removed dummy_inflate.c and uncompr.c from contrib/pngminim/encoder Corrected PNG_UNKNOWN_CHUNKS_SUPPORTED to PNG_HANDLE_AS_UNKNOWN_SUPPORTED in gregbook/readpng2.c Corrected protection of png_get_user_transform_ptr. The API declaration in png.h is removed if both READ and WRITE USER_TRANSFORM are turned off but was left defined in pngtrans.c Moved declarations of umsg[] inside the proper #ifdef blocks in pngrutil.c version 1.4.1 [February 25, 2010] Updated CMakeLists.txt for consistent indentation and to avoid an unclosed if-statement warning (Philip Lowman). Revised Makefile.am and Makefile.in to remove references to Y2KINFO, KNOWNBUG, and libpng.la (Robert Schwebel). Revised the makefiles to install the same files and symbolic except for libpng.la and libpng14.la. Make png_set|get_compression_buffer_size() available even when PNG_WRITE_SUPPORTED is not enabled. Revised Makefile.am and Makefile.in to simplify their maintenance. Revised the makefiles to install a link to libpng14.so.14.1 Removed png_set_premultiply_alpha() from scripts/*.def Revised png_decompress_chunk() to improve speed and memory usage when decoding large chunks, using a two-pass method suggested by John Bowler. Added png_set|get_chunk_malloc_max() functions. Relocated "int k" declaration in pngtest.c to minimize its scope. Folded some long lines in the source files. Added defineable PNG_USER_CHUNK_CACHE_MAX and PNG_USER_CHUNK_MALLOC_MAX Eliminated use of png_ptr->irowbytes and reused the slot in png_ptr as png_ptr->png_user_chunk_malloc_max. Return allocated "old_buffer" in png_push_save_buffer() before calling png_error(), to avoid a potential memory leak. Removed the cbuilder5 project, which has not been updated to 1.4.0. Complete rewrite of two-pass png_decompress_chunk() by John Bowler. Removed obsolete unused MMX-querying support from contrib/gregbook Removed the AIX redefinition of jmpbuf in png.h Define _ALL_SOURCE in configure.ac, makefile.aix, and CMakeLists.txt when using AIX compiler. Removed unused gzio.c from contrib/pngminim gather and makefile scripts Changes to Libpng from version 1.2.42 to 1.4.0 (January 4, 2010) Libpng-1.4.0 was released by the PNG Development Group on January 3, 2010. Important new features include support for the iTXt chunk and a function for limiting the amount of memory that a possibly malicious compressed chunk can consume. Some long-deprecated functions and features have been removed. A new private header file that is not visible to applications has been created, to improve our ability to maintain binary compatibility among future libpng versions. Specifically, 1. Private libpng prototypes and macro definitions were moved from png.h and pngconf.h into a new pngpriv.h header file that is not visible to applications. 2. Some obsolete/deprecated macros and functions have been removed. a. We eliminated the obsolete, unused pnggccrd.c and pngvcrd.c files and related makefiles. b. We removed the typecasted NULL definitions such as #define png_voidp_NULL (png_voidp)NULL If you used these in your application, just use NULL instead. c. We eliminated the PNG_1_0_X and PNG_1_2_X macros. d. We eliminated the PNG_LEGACY_SUPPORTED macro. e. We removed many WIN32_WCE #ifdefs. f. We removed the functions png_read_init(info_ptr), png_write_init(info_ptr), png_info_init(info_ptr), png_read_destroy(), and png_write_destroy(). They have been deprecated since libpng-0.95. g. We removed the png_permit_empty_plte() function. It has been deprecated since libpng-1.0.9. Use png_permit_mng_features() instead. h. We removed the obsolete stub functions png_get_mmx_flagmask(), png_set_mmx_thresholds(), png_get_asm_flags(), png_get_mmx_bitdepth_threshold(), png_get_mmx_rowbytes_threshold(), png_set_asm_flags(), and png_mmx_supported() i. We removed the obsolete png_check_sig(), png_memcpy_check(), and png_memset_check() functions. Instead use !png_sig_cmp(), png_memcpy(), and png_memset(), respectively, i.e., replace png_check_sig(buf, 8) with png_sig_cmp(buf, 0, 8) == 0 replace png_memcpy_check(png_ptr, dest, src, length) with png_memcpy(dest, src, length) and replace png_memset_check(png_ptr, dest, value, length) with png_memset(dest, value, length) j. We removed support for global arrays to improve thread safety. k. We removed support for numbered error messages by default, since we never got around to actually numbering the error messages. The function png_set_strip_error_numbers() was removed from the library by default. l. The png_zalloc() and png_zfree() functions are no longer exported. The png_zalloc() function no longer zeroes out the memory that it allocates. m. The function png_set_gray_1_2_4_to_8() was removed. It has been deprecated since libpng-1.0.18 and 1.2.9, when it was replaced with png_set_expand_gray_1_2_4_to_8() because the former function also expanded palette images. 3. Several function prototypes were changed. a. We changed the prototype for png_malloc() from png_malloc(png_structp png_ptr, png_uint_32 size) to png_malloc(png_structp png_ptr, png_alloc_size_t size) b. We changed the prototypes of png_get_compression_buffer_size() and png_set_compression_buffer_size() to work with png_size_t instead of png_uint_32. 4. We added some new features: a. We enabled iTXt chunk support by default. This changes the png_text structure by adding the itxt_length, lang, and lang_key members. b. We added the functions png_set_benign_errors(), png_benign_error(), and png_chunk_benign_error(). With these, you can choose to treat certain normally fatal errors as nonfatal. c. Support for setting the maximum amount of memory that the application will allocate for reading chunks was added, as a security measure. The functions png_set_chunk_cache_max() and png_get_chunk_cache_max() were added to the library. d. We added the png_calloc() function and used it in place of of "png_malloc(); png_memset();" except in the case in png_read_png() where the array consists of pointers; in this case a "for" loop is used after the png_malloc() to set the pointers to NULL, to give robust. behavior in case the application runs out of memory part-way through the process. e. We implemented support for I/O states by adding png_ptr member io_state and functions png_get_io_chunk_name() and png_get_io_state() in pngget.c f. We added PNG_TRANSFORM_GRAY_TO_RGB to the available high-level input transforms. 5. Other changes a. We changed the names of the png_struct and info_struct members "trans" and "trans_values" to "trans_alpha" and "trans_color", respectively. b. Checking for and reporting of errors in the IHDR chunk is more thorough. c. We removed the trailing '.' from the warning and error messages. d. Direct access to png_ptr->jmpbuf has been deprecated since libpng version 1.0.6, and libpng now generates a warning about it. To avoid such warnings, change setjmp(png_ptr->jmpbuf) to setjmp(png_jmpbuf(png_ptr)) @ text @d1 1 a1 1 $NetBSD$ d3 5 a7 1 --- Makefile.in.orig 2010-05-06 10:30:19.000000000 +0000 d9 1 a9 1 @@@@ -1243,14 +1243,6 @@@@ install-data-hook: d15 1 a15 1 - for ext in a la so so.@@PNGLIB_MAJOR@@@@PNGLIB_MINOR@@.@@PNGLIB_RELEASE@@ sl dylib; do\ @ 1.27 log @Update to 1.2.19: version 1.2.19beta1 [May 18, 2007] Changed "const static" to "static PNG_CONST" everywhere, mostly undoing change of libpng-1.2.17beta2. Changed other "const" to "PNG_CONST" Changed some handling of unused parameters, to avoid compiler warnings. "if (unused == NULL) return;" becomes "unused = unused". version 1.2.19beta2 [May 18, 2007] Only use the valid bits of tRNS value in png_do_expand() (Brian Cartier) version 1.2.19beta3 [May 19, 2007] Add some "png_byte" typecasts in png_check_keyword() and write new_key instead of key in zTXt chunk (Kevin Ryde). version 1.2.19beta4 [May 21, 2007] Add png_snprintf() function and use it in place of sprint() for improved defense against buffer overflows. version 1.2.19beta5 [May 21, 2007] Fixed png_handle_tRNS() to only use the valid bits of tRNS value. Changed handling of more unused parameters, to avoid compiler warnings. Removed some PNG_CONST in pngwutil.c to avoid compiler warnings. version 1.2.19beta6 [May 22, 2007] Added some #ifdef PNG_MMX_CODE_SUPPORTED where needed in pngvcrd.c Added a special "_MSC_VER" case that defines png_snprintf to _snprintf version 1.2.19beta7 [May 22, 2007] Squelched png_squelch_warnings() in pnggccrd.c and added an #ifdef PNG_MMX_CODE_SUPPORTED block around the declarations that caused the warnings that png_squelch_warnings was squelching. version 1.2.19beta8 [May 22, 2007] Removed __MMX__ from test in pngconf.h. version 1.2.19beta9 [May 23, 2007] Made png_squelch_warnings() available via PNG_SQUELCH_WARNINGS macro. Revised png_squelch_warnings() so it might work. Updated makefile.sgcc and makefile.solaris; added makefile.solaris-x86. version 1.2.19beta10 [May 24, 2007] Resquelched png_squelch_warnings(), use "__attribute__((used))" instead. version 1.2.19beta11 [May 28, 2007] Return 0 from png_get_sPLT() and png_get_unknown_chunks() if png_ptr is NULL; changed three remaining instances of png_strcpy() to png_strncpy() (David Hill). Make test for NULL row_buf at the beginning of png_do_read_transformations unconditional. version 1.2.19beta12 [May 28, 2007] Revised pnggccrd.c. version 1.2.19beta13 [June 14, 2007] Prefer PNG_USE_PNGVCRD when _MSC_VER is defined in pngconf.h version 1.2.19beta14 [June 16, 2007] Fix bug with handling of 16-bit transparency, introduced in 1.2.19beta2 version 1.2.19beta15 [June 17, 2007] Revised pnggccrd.c. version 1.2.19beta16 [June 18, 2007] Revised pnggccrd.c again. Updated contrib/gregbook. Changed '#include "pnggccrd.c"' to 'include "$srcdir/pnggccrd.c"' in configure.ac version 1.2.19beta17 [June 19, 2007] Revised many of the makefiles, to set -DPNG_NO_MMX_CODE where needed and to not use -O3 unless -DPNG_NO_MMX_CODE is also set. version 1.2.19beta18 [June 23, 2007] Replaced some C++ style comments with C style comments in pnggccrd.c. Copied optimized C code from pnggccrd.c to pngrutil.c, removed dependency on pnggccrd.o from many makefiles. Added sl and dylib to list of extensions be installed by Makefile.am version 1.2.19beta19 [June 28, 2007] Fixed testing PNG_RGB_TO_GRAY_ERR & PNG_RGB_TO_GRAY_WARN in pngrtran.c More cleanup of pnggccrd.c and pngvcrd.c version 1.2.19beta20 [June 29, 2007] Rebuilt Makefile.in and configure using libtool-1.5.24. Fixed typo in pnggccrd.c version 1.2.19beta21 [June 30, 2007] More revision of pnggccrd.c Added "test" target to Makefile.in and Makefile.am version 1.2.19beta22 [July 3, 2007] Added info about pngrutil/pnggccrd/pngvcrd to png_get_header_version() Fix type definition of dummy_value_a, b in pnggccrd.c version 1.2.19beta23 [July 10, 2007] Revert change to type definition of dummy_value_a, b in pnggccrd.c Make sure __PIC__ is defined in pnggccrd.c when PIC is defined. Require gcc-4.1 or better to use PNG_HAVE_MMX_FILTER_ROW on x86_64 platforms version 1.2.19beta24 [July 14, 2007] Added PNG_NO_READ_FILTER, PNG_NO_WRITE_FILTER, PNG_NO_WARNING macros. Added contrib/pngminim to demonstrate building minimal encoder and decoder version 1.2.19beta25 [July 15, 2007] Removed the new PNG_NO_READ_FILTER macro since it would make the library unable to read valid PNG files, and filtering is at the heart of the PNG format. version 1.2.19beta26 [July 16, 2007] Changed "png_free(str)" to "png_free(png_ptr,str)" in pngrutil.c WinCE code (Yves Piguet). This bug was introduced in libpng-1.2.14. Updated scripts/CMakeLists.txt Relocated a misplaced #endif in pnggccrd.c version 1.2.19beta27 [July 17, 2007] Fixed incorrect stride and number of bytes copied (was 4 instead of 6 bytes) in the cleanup loop of pnggccrd.c and pngvcrd.c for handling the end of 48-bit interlaced rows (Glenn R-P). version 1.2.19beta28 [July 19, 2007] Removed requirement for gcc-4.1 or better to use PNG_HAVE_MMX_FILTER_ROW on x86_64 platforms Added png_warning() in pngrutil.c for short iCCP, iTXt, sPLT, or zTXT chunks. Revised pngtest.c so warnings are displayed regardless of PNG_NO_STDIO. version 1.2.19beta29 [July 20, 2007] Fix typo in pnggccrd.c (%%eax should be %%ax in secondloop48) version 1.2.19beta30 [July 26, 2007] Revised pnggccrd.c version 1.2.19beta31 [July 27, 2007] Fix typos in pnggccrd.c version 1.0.27rc1 and 1.2.19rc1 [July 31, 2007] Disable PNG_MMX_CODE_SUPPORTED when PNG_ASSEMBLER_CODE_SUPPORTED is off. Enable PNG_MMX_READ_FILTER_* by default, except when gcc-3.x is being used (they were inadvertently disabled in libpng-1.2.19beta23). Fix some debugging statements in pnggccrd.c and pngrutil.c Added information about disabling the MMX code in libpng documentation. version 1.0.27rc2 and 1.2.19rc2 [August 4, 2007] Removed some "#if 0" blocks. Made a global struct local in pngvcrd.c to make it thread safe. Issue a png_error() if application attempts to transform a row tht has not been initialized. version 1.0.27rc3 and 1.2.19rc3 [August 9, 2007] Slightly revised pngvcrd.c version 1.0.27rc4 and 1.2.19rc4 [August 9, 2007] Revised pnggccrd.c debugging change of rc1, which was broken. Revised scripts/CMakeLists.txt Change default to PNG_NO_GLOBAL_ARRAYS for MSVC. Turn off PNG_FLAG_ROW_INIT flag when setting transforms that expand pixels. version 1.0.27rc5 and 1.2.19rc5 [August 10, 2007] Fix typo (missing '"') in pnggccrd.c Revise handling of png_strtod in recent versions of WINCE version 1.0.27rc6 and 1.2.19rc6 [August 15, 2007] Fix typo (missing ',') in contrib/gregbook/readpng2.c Undid row initialization error exit added to rc2 and rc4. version 1.0.27 and 1.2.19 [August 18, 2007] Conditionally restored row initialization error exit. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.26 2006/11/28 21:58:17 drochner Exp $ d3 1 a3 1 --- Makefile.in.orig 2007-08-18 10:34:04.000000000 +0000 d5 3 a7 1 @@@@ -1275,6 +1275,7 @@@@ install-exec-hook: d9 11 a19 6 @@set -x;\ cd $(DESTDIR)$(libdir);\ + mv libpng.la libpngcompat.la;\ for ext in a la so sl dylib; do\ rm -f libpng.$$ext;\ if test -f $(PNGLIB_BASENAME).$$ext; then\ @ 1.26 log @update to 1.2.14 changes: -Relocated three misplaced tests for NULL png_ptr -build fixes @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- Makefile.in.orig 2006-11-27 17:11:15.000000000 +0100 d5 1 a5 1 @@@@ -1271,6 +1271,7 @@@@ install-exec-hook: d10 1 a10 1 for ext in a la so; do\ @ 1.25 log @Update to 1.2.10: Package change: install old compat library as libpngcompat (pkgsrc specific, will probably be changed in the future). Makes package handling quite a bit easier. version 1.2.10beta1 [April 15, 2006] Renamed "config.h" to "png_conf.h" and revised Makefile.am to add -DPNG_BUILDING_LIBPNG to compile directive, and modified pngconf.h to include png_conf.h only when PNG_BUILDING_LIBPNG is defined. version 1.2.10beta2 [April 15, 2006] Manually updated Makefile.in and configure. Changed png_conf.h.in back to config.h. version 1.2.10beta3 [April 15, 2006] Change png_conf.h back to config.h in pngconf.h. version 1.2.10beta4 [April 16, 2006] Change PNG_BUILDING_LIBPNG to PNG_CONFIGURE_LIBPNG in config/Makefile*. version 1.2.10beta5 [April 16, 2006] Added a configure check for compiling assembler code in pnggccrd.c version 1.2.10beta6 [April 17, 2006] Revised the configure check for pnggccrd.c Moved -DPNG_CONFIGURE_LIBPNG into @@LIBPNG_DEFINES@@ Added @@LIBPNG_DEFINES@@ to arguments when building libpng.sym version 1.2.10beta7 [April 18, 2006] Change "exec_prefix=$prefix" to "exec_prefix=$(prefix)" in makefiles. version 1.2.10rc1 [April 19, 2006] Ensure pngconf.h doesn't define both PNG_USE_PNGGCCRD and PNG_USE_PNGVCRD Fixed "LN_FS" typo in makefile.sco and makefile.solaris. version 1.2.10rc2 [April 20, 2006] Added a backslash between -DPNG_CONFIGURE_LIBPNG and -DPNG_NO_ASSEMBLER_CODE in configure.ac and configure Made the configure warning about versioned symbols less arrogant. version 1.2.10rc3 [April 21, 2006] Added a note in libpng.txt that png_set_sig_bytes(8) can be used when writing an embedded PNG without the 8-byte signature. Revised makefiles and configure to avoid making links to libpng.so.* version 1.2.10 [April 23, 2006] Reverted configure to "rc2" state. @ text @d3 1 a3 3 Install old library .la file so that PLIST is correct. --- Makefile.in.orig 2006-04-23 18:46:00.000000000 +0000 d5 1 a5 1 @@@@ -1264,6 +1264,7 @@@@ install-exec-hook: d12 1 a12 1 $(LN_S) $(PNGLIB_BASENAME).$$ext libpng.$$ext;\ @ 1.24 log @Update to 1.2.9nb1: . pngconf.h included "config.h" if HAVE_CONFIG_H is defined -- really not a good idea, patch it out. broke at least libwmf, reported by veego@@ . install some libpng12 files -- IIUC, libpng12* is the future and libpng* is becoming obsolete -- at least according to the wishes of the authors. Don't follow this completely yet, but still patch the pkg-config file to link against -lpng instead of -lpng12, which would require a recursive PKGREVISION bump. We should probably do this at some future time. . switch pkgconfig file to look for headers in include/libpng12 -- the headers still exist in include/ for backwards compatibility. . switch to using GNU_CONFIGURE and the included libtool handling instead of patching in our own into a Makefile. Gets rid of patches and pkgsrc Makefile code. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.23 2006/04/16 19:39:46 wiz Exp $ d3 12 a14 69 --- scripts/makefile.std.orig 2006-03-06 17:06:28.000000000 +0000 +++ scripts/makefile.std @@@@ -4,7 +4,7 @@@@ # For conditions of distribution and use, see copyright notice in png.h # where make install puts libpng.a and png.h -prefix=/usr/local +prefix=${PREFIX} INCPATH=$(prefix)/include LIBPATH=$(prefix)/lib @@@@ -24,45 +24,34 @@@@ DESTDIR= ZLIBLIB=../zlib ZLIBINC=../zlib -CC=cc +CC=${LIBTOOL} --mode=compile ${REALCC} AR_RC=ar rc MKDIR_P=mkdir LN_SF=ln -sf RANLIB=ranlib RM_F=rm -f -CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=5 -LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm +#CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=5 +#LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ pngwtran.o pngmem.o pngerror.o pngpread.o -all: libpng.a pngtest +all: libpng.la pngtest -libpng.a: $(OBJS) - $(AR_RC) $@@ $(OBJS) - $(RANLIB) $@@ - -pngtest: pngtest.o libpng.a - $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) +libpng.la: $(OBJS) + ${LIBTOOL} --mode=link $(REALCC) -o $@@ ${OBJS:.o=.lo} -rpath $(LIBPATH) ${LDFLAGS} -lz -lm -version-info ${LIBPNG_SO_MAJOR}:${LIBPNG_SO_MINOR} + +pngtest: pngtest.o libpng.la + ${LIBTOOL} --mode=link $(REALCC) -o pngtest $(CFLAGS) pngtest.o ${LDFLAGS} libpng.la -lz -lm test: pngtest ./pngtest -install: libpng.a - -@@$(MKDIR_P) $(DESTDIR)$(INCPATH) - -@@$(MKDIR_P) $(DESTDIR)$(INCPATH)/libpng - -@@$(MKDIR_P) $(DESTDIR)$(LIBPATH) - -@@$(RM_F) $(DESTDIR)$(INCPATH)/png.h - -@@$(RM_F) $(DESTDIR)$(INCPATH)/pngconf.h - cp png.h $(DESTDIR)$(INCPATH)/libpng - cp pngconf.h $(DESTDIR)$(INCPATH)/libpng - chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h - chmod 644 $(DESTDIR)$(INCPATH)/libpng/pngconf.h - (cd $(DESTDIR)$(INCPATH); ln -f -s libpng/* .) - cp libpng.a $(DESTDIR)$(LIBPATH) - chmod 644 $(DESTDIR)$(LIBPATH)/libpng.a +install: libpng.la + ${BSD_INSTALL_DATA} png.h pngconf.h $(INCPATH) + ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libpng.la $(LIBPATH) clean: $(RM_F) *.o libpng.a pngtest pngout.png @ 1.23 log @Update to 1.2.9: Changes since the last public release (1.2.8): version 1.2.9 [April 14, 2006] Initialized some structure members in pngwutil.c to avoid gcc-4.0.0 complaints Fixed an incorrect typecast in pngrutil.c Added PNG_NO_READ_SUPPORTED conditionals for making a write-only library. Added PNG_NO_WRITE_INTERLACING_SUPPORTED conditional. Optimized alpha-inversion loops in pngwtran.c Moved test for nonzero gamma outside of png_build_gamma_table() in pngrtran.c Make sure num_trans is <= 256 before copying data in png_set_tRNS(). Make sure num_palette is <= 256 before copying data in png_set_PLTE(). Interchanged order of write_swap_alpha and write_invert_alpha transforms. Added parentheses in the definition of PNG_LIBPNG_BUILD_TYPE (Cosmin). Exported png_get_uint_32, png_save_uint_32, png_get_uint_16, png_save_uint_16, png_get_int_32, png_save_int_32, png_get_uint_31 (Cosmin). Added parentheses in the definition of PNG_LIBPNG_BUILD_TYPE (Cosmin). Added type cast (png_byte) in png_write_sCAL() (Cosmin). Fixed scripts/makefile.cygwin (Cosmin). Updated scripts/makefile.bc32 for Borland C++ 5.6 (Cosmin). Updated scripts/pngos2.def, scripts/pngw32.def (Cosmin). Updated references to png-mng-implement mailing list. Revised man page and libpng.txt to make it clear that one should not call png_read_end or png_write_end after png_read_png or png_write_png. Optimized zlib window flag (CINFO) in contrib/pngsuite/*.png (Cosmin). Check for png_rgb_to_gray and png_gray_to_rgb read transformations before checking for png_read_dither in pngrtran.c Revise checking of chromaticity limits to accommodate extended RGB colorspace (John Denker). Changed line endings in some of the project files to CRLF, even in the "Unix" tar distributions (Cosmin). Make png_get_int_32 and png_save_int_32 always available (Cosmin). Updated scripts/pngos2.def, scripts/pngw32.def and projects/wince/png32ce.def with the newly exported functions. Eliminated distributions without the "configure" script. Updated INSTALL instructions. Make libpng.pc respect EXEC_PREFIX (D.P.Kreil) Remove reference to pngasmrd.h from Makefile.am Change definition of PKGCONFIG from $prefix/lib to $libdir in configure.ac Removed newline from the end of some error and warning messages. Removed test for sqrt() from configure.ac and configure. Made swap tables in pngtrans.c PNG_CONST (Carlo Bramix). Added "OS2" to list of systems that don't need underscores, in pnggccrd.c Removed libpng version and date from *.c files. Removed trailing blanks from source files. Put version and date of latest change in each source file, and changed copyright year accordingly. Restored scripts/makefile.elf which was inadvertently deleted. Removed libpng.vers and libpng.sym from libpng12_la_SOURCES in Makefile.am Fixed inconsistent #ifdef's around png_sig_bytes() and png_set_sCAL_s() in png.h. Updated makefile.elf as suggested by debian. Added LN_SF, MKDIR_P, and other macros to some of the makefiles. Made some makefiles accept "exec_prefix". Simplified some makefiles by using LIBSO, LIBSOMAJ, and LIBSOVER macros. Fixed some "#ifdef defined (..." which should be "#ifdef defined(..." Bug introduced in libpng-1.2.8. Fixed inconsistency in definition of png_default_read_data() Revised calculation of "current" and "major" for irix in ltmain.sh Separated PNG_EXPAND and PNG_EXPAND_tRNS. Added png_set_expand_gray_1_2_4_to_8() and deprecated png_set_gray_1_2_4_to_8() which also expands tRNS to alpha. Include "config.h" in pngconf.h when available. Added some checks for NULL png_ptr or NULL info_ptr (Coverity) Made pnggccrd.c PIC-compliant (Christian Aichinger). Added makefile.mingw (Wolfgang Glas) Revised pngconf.h MMX checking. Defined PNG_USER_PRIVATEBUILD when including "pngusr.h" (Cosmin). Removed nonsensical assertion check from pngtest.c (Cosmin). Revised makefile.beos and added "none" selector in ltmain.sh @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.22 2004/04/27 22:40:35 tv Exp $ @ 1.22 log @Convert INSTALL_SCRIPT to INSTALL_LIB. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.21 2004/04/27 19:36:27 tv Exp $ d3 1 a3 1 --- scripts/makefile.std.orig Thu May 23 08:29:59 2002 d14 1 a14 1 @@@@ -24,9 +24,9 @@@@ d19 7 d28 1 a28 2 +CC=${LIBTOOL} --mode=compile $(REALCC) +#CFLAGS+=-O # -g -DPNG_DEBUG=5 d31 1 a31 3 #RANLIB=echo RANLIB=ranlib @@@@ -35,31 +35,20 @@@@ d39 1 a39 1 - ar rc $@@ $(OBJS) d41 3 d46 1 a46 3 -pngtest: pngtest.o libpng.a - $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) d54 5 a58 5 - -@@mkdir $(DESTDIR)$(INCPATH) - -@@mkdir $(DESTDIR)$(INCPATH)/libpng - -@@mkdir $(DESTDIR)$(LIBPATH) - -@@rm -f $(DESTDIR)$(INCPATH)/png.h - -@@rm -f $(DESTDIR)$(INCPATH)/pngconf.h d71 1 a71 1 rm -f *.o libpng.a pngtest pngout.png @ 1.21 log @Shared objects must be installed as executable on some platforms. Convert BSD_INSTALL_DATA to BSD_INSTALL_SCRIPT. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.20 2002/08/25 18:39:22 jlam Exp $ d63 1 a63 1 + ${LIBTOOL} --mode=install ${BSD_INSTALL_SCRIPT} libpng.la $(LIBPATH) @ 1.20 log @Merge changes in packages from the buildlink2 branch that have buildlink2.mk files back into the main trunk. This provides sufficient buildlink2 infrastructure to start merging other packages from the buildlink2 branch that have already been converted to use the buildlink2 framework. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.18.2.1 2002/08/22 11:11:39 jlam Exp $ d63 1 a63 1 + ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libpng.la $(LIBPATH) @ 1.19 log @Update to version 1.2.4. Two new functions since 1.2.1, png_malloc_warn() and png_set_text_2(), call for a minor version bump in the shared library. Update "BUILDLINK_DEPENDS" to current level. Also make the shared library versions visible in the top-level "Makefile", and add a top-level "test" target to invoke "pngtest" in ${WRKSRC}. The following is culled from the extensive "CHANGES" file, ommitting all make system and doc changes, and some bug fixes for bugs that weren't present in 1.2.1. See "CHANGES" for complete details: Added setjmp() at the end of png_create_*_struct_2() in case user forgets to put one in their application. Exported png_zalloc(), png_zfree(), png_default_read(), png_default_write(), png_default_flush(), and png_push_fill_buffer() and included them in module definition files. Revised prototype for png_default_flush() Typos in *.def files (png_default_read|write -> png_default_read|write_data) Once more restored png_zalloc and png_zfree to regular nonexported form. Restored png_default_read|write_data, png_default_flush, png_read_fill_buffer to nonexported form, but with PNGAPI, and removed them from module def files. Removed "PNGAPI" from png_zalloc() and png_zfree() in png.c Plugged various memory leaks; added png_malloc_warn() and png_set_text_2() functions. Plugged memory leak of png_ptr->current_text (Matt Holgate). Check for buffer overflow before reading CRC in pngpread.c (Warwick Allison) Plugged memory leak of row_buf in pngtest.c when there is a png_error(). Detect buffer overflow in pngpread.c when IDAT is corrupted with extra data. Changed png_warning() to png_error() when width is too large to process. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.18 2002/03/13 17:43:38 fredb Exp $ @ 1.18 log @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. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.17 2001/08/03 23:19:26 wiz Exp $ d3 3 a5 3 --- scripts/makefile.std.orig Fri Jan 5 19:25:50 2001 +++ scripts/makefile.std Sun May 27 22:36:02 2001 @@@@ -3,7 +3,7 @@@@ d11 2 d14 1 a14 3 # Where the zlib library and include files are located #ZLIBLIB=/usr/local/lib @@@@ -11,9 +11,9 @@@@ d27 1 a27 1 @@@@ -22,27 +22,20 @@@@ d38 1 a38 1 + ${LIBTOOL} --mode=link $(REALCC) -o $@@ ${OBJS:.o=.lo} -rpath ${PREFIX}/lib ${LDFLAGS} -lz -lm -version-info 3:0 d43 1 a43 1 + ${LIBTOOL} --mode=link $(REALCC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) libpng.la -lz -lm d49 12 a60 8 - -@@mkdir $(prefix)/include - -@@mkdir $(prefix)/lib - cp png.h $(prefix)/include - cp pngconf.h $(prefix)/include - chmod 644 $(prefix)/include/png.h - chmod 644 $(prefix)/include/pngconf.h - cp libpng.a $(prefix)/lib - chmod 644 $(prefix)/lib/libpng.a d62 2 a63 2 + ${BSD_INSTALL_DATA} png.h pngconf.h $(prefix)/include + ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libpng.la $(prefix)/lib @ 1.18.2.1 log @Merge changes from pkgsrc-current into the buildlink2 branch for the packages that have buildlink2.mk files. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.19 2002/07/19 14:33:09 fredb Exp $ d3 3 a5 3 --- scripts/makefile.std.orig Thu May 23 08:29:59 2002 +++ scripts/makefile.std @@@@ -4,7 +4,7 @@@@ a10 2 INCPATH=$(prefix)/include LIBPATH=$(prefix)/lib d12 3 a14 1 @@@@ -24,9 +24,9 @@@@ d27 1 a27 1 @@@@ -35,31 +35,20 @@@@ d38 1 a38 1 + ${LIBTOOL} --mode=link $(REALCC) -o $@@ ${OBJS:.o=.lo} -rpath $(LIBPATH) ${LDFLAGS} -lz -lm -version-info ${LIBPNG_SO_MAJOR}:${LIBPNG_SO_MINOR} d43 1 a43 1 + ${LIBTOOL} --mode=link $(REALCC) -o pngtest $(CFLAGS) pngtest.o ${LDFLAGS} libpng.la -lz -lm d49 8 a56 12 - -@@mkdir $(DESTDIR)$(INCPATH) - -@@mkdir $(DESTDIR)$(INCPATH)/libpng - -@@mkdir $(DESTDIR)$(LIBPATH) - -@@rm -f $(DESTDIR)$(INCPATH)/png.h - -@@rm -f $(DESTDIR)$(INCPATH)/pngconf.h - cp png.h $(DESTDIR)$(INCPATH)/libpng - cp pngconf.h $(DESTDIR)$(INCPATH)/libpng - chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h - chmod 644 $(DESTDIR)$(INCPATH)/libpng/pngconf.h - (cd $(DESTDIR)$(INCPATH); ln -f -s libpng/* .) - cp libpng.a $(DESTDIR)$(LIBPATH) - chmod 644 $(DESTDIR)$(LIBPATH)/libpng.a d58 2 a59 2 + ${BSD_INSTALL_DATA} png.h pngconf.h $(INCPATH) + ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libpng.la $(LIBPATH) @ 1.17 log @Update to 1.0.12. Extract of changes since 1.0.11: . Added some never-to-be-executed code in pnggccrd.c to quiet compiler warnings. . Added a check for attempts to read or write PLTE in grayscale PNG datastreams. . Eliminated the png_error about apps using png_read|write_init(). Instead, libpng will reallocate the png_struct and info_struct if they are too small. This achieves future binary compatibility for old applications written for libpng-0.88 and earlier. Expanded the warnings about incompatible library and application. . Modified png_create_struct so it passes user mem_ptr to user memory allocator. . Check for missing profile length field in iCCP chunk and free the chunk_data in case of truncated iCCP chunk. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.16 2001/05/28 02:41:55 jlam Exp $ d38 1 a38 1 + ${LIBTOOL} --mode=link $(REALCC) -o $@@ ${OBJS:.o=.lo} -rpath ${PREFIX}/lib ${LDFLAGS} -lz -lm -version-info 2:1 @ 1.16 log @png depends on zlib, so add dependency on zlib for those platforms without in the base system. Make sure that libz.so is found during the build. @ text @d1 1 a1 1 $NetBSD$ d38 1 a38 1 + ${LIBTOOL} --mode=link $(REALCC) -o $@@ ${OBJS:.o=.lo} -rpath ${PREFIX}/lib ${LDFLAGS} -lz -lm -version-info 2:0 @ 1.15 log @Update libpng to 1.0.11. pkgsrc change: bump shared library major like it happened in libpng some time ago -- our libtool'ified build didn't reflect this. Fixes pkg/12856 by Thor Simon. Note necessity of manual major/minor handling in Makefile, to decrease chance that this will repeat in the future. Changes since 1.0.10: Added type casts on several png_malloc() calls (Dimitri Papadapoulos). Removed a no-longer needed AIX work-around from pngconf.h Changed several "//" single-line comments to C-style in pnggccrd.c Removed PNGAPI from several functions whose prototypes did not have PNGAPI. Updated scripts/pngos2.def Added a check for NULL return from user's malloc_fn(). Removed some useless type casts of the NULL pointer. Added makefile.netbsd [not used, since we're using libtool instead] @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.14 2001/03/04 07:53:34 tron Exp $ d3 2 a4 2 --- scripts/makefile.std.orig Wed Dec 8 18:44:40 1999 +++ scripts/makefile.std d23 1 a23 1 +LDFLAGS=libpng.la -lz -lm d38 1 a38 1 + ${LIBTOOL} --mode=link $(REALCC) -o $@@ ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -lz -lm -version-info 2:0 d43 1 a43 1 + ${LIBTOOL} --mode=link $(REALCC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) @ 1.14 log @As point by Johnny C. Lam in private e-mail a new function was added in this release of the PNG library. So increase the shared library minor number and bump the package version to "1.0.9nb1". @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.13 2001/01/18 18:10:50 wiz Exp $ d38 1 a38 1 + ${LIBTOOL} --mode=link $(REALCC) -o $@@ ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -lz -lm -version-info 1:4 @ 1.13 log @Don't force '-O'. Noted by Adam Ciarcinski. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.12 2001/01/13 01:33:20 tron Exp $ d38 1 a38 1 + ${LIBTOOL} --mode=link $(REALCC) -o $@@ ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -lz -lm -version-info 1:3 @ 1.12 log @Make this build if "${CC}" is not "cc". @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.11 2000/10/06 01:38:51 jlam Exp $ d22 1 a22 1 +CFLAGS+=-O # -g -DPNG_DEBUG=5 @ 1.11 log @Honor CFLAGS passed in from environment. @ text @d1 1 a1 1 $NetBSD$ d21 1 a21 1 +CC=${LIBTOOL} --mode=compile cc d38 1 a38 1 + ${LIBTOOL} --mode=link cc -o $@@ ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -lz -lm -version-info 1:3 d43 1 a43 1 + ${LIBTOOL} --mode=link cc -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) @ 1.10 log @Fix library dependencies (on libm and libz). USE_LIBTOOL instead of USE_PKGLIBTOOL. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.9 2000/03/21 22:07:59 tron Exp $ d3 2 a4 2 --- scripts/makefile.std.orig Fri Jul 31 17:15:22 1998 +++ scripts/makefile.std Thu Mar 4 14:15:31 1999 d22 1 a22 1 +CFLAGS=-O # -g -DPNG_DEBUG=5 @ 1.9 log @Update "png" package to version 1.0.6. Changes since version 1.0.5: - Added contrib/pngsuite and contrib/pngminus (Willem van Schaik) - Fixed a typo in the png_set_sRGB() function call in example.c (Jan Nijtmans) - Further optimization and bugfix of pngvcrd.c - Revised pngset.c so that it does not allocate or free memory in the user's text_ptr structure.- Instead, it makes its own copy. - Added code in pngwrite.c to free info_ptr->text[i].key to stop a memory leak. - Created separate write_end_info_struct in pngtest.c for a more severe test. - Moved PNG_FLAG_HAVE_CHUNK_HEADER, PNG_FLAG_BACKGROUND_IS_GRAY and PNG_FLAG_WROTE_tIME from flags to mode. - Added png_write_info_before_PLTE() function. - Fixed some typecasting in contrib/gregbook/*.c - Updated scripts/makevms.com (Martin Zinser) - Moved png_get_header_version from png.h to png.c, to accomodate ansi2knr. - Removed all global arrays (according to PNG_NO_GLOBAL_ARRAYS macro), to accomodate making DLL's: Moved usr_png_ver from global variable to function png_get_header_ver() in png.c.- Moved png_sig to png_sig_bytes in png.c and eliminated use of png_sig in pngwutil.c.- Moved the various png_CHNK arrays into local arrays.- Eliminated use of global png_pass arrays.- Declared the png_CHNK and png_pass arrays to be "const".- Made the global arrays available to applications when PNG_NO_GLOBAL_ARRAYS is not defined or when PNG_USE_GLOBAL_ARRAYS is defined.- Made available to applications a macro "PNG_USE_LOCAL_ARRAYS". - Changed the PNG_sRGB_INTENT macros in png.h to be consistent with PNG-1.2. - Change PNG_SRGB_INTENT to PNG_sRGB_INTENT in libpng.txt and libpng.3 - Added PNG_EXPORT_VAR macro to accommodate making DLL's. - Refactored the inflate/deflate support to make adding new chunks with trailing compressed parts easier in the future (Eric S. Raymond). - Added iCCP, iTXt, sCAL, and sPLT support; added "lang", "lang_key", and itxt_length" members to the png_text structure (Eric S. Raymond, Glenn R-P) - Changed png_get_oFFs() and png_set_oFFs() to use signed rather than unsigned offsets (Eric S. Raymond). - Combined PNG_READ_cHNK_SUPPORTED and PNG_WRITE_cHNK_SUPPORTED macros into PNG_cHNK_SUPPORTED and combined the three types of PNG_text_SUPPORTED macros, leaving the separate macros also available. - Removed comments on #endifs at the end of many short, non-nested #if-blocks. - Changed makefile.solaris to issue a warning about potential problems when the ucb "ld" is in the path ahead of the ccs "ld". - Removed "- [date]" from the "synopsis" line in libpng.3 and libpngpf.3. - Added code in pngwrite.c to work around a newly discovered zlib bug. - Unknown chunk handling is now supported (Eric S. Raymond). - Option to eliminate all floating point support was added.- Some new fixed-point functions such as png_set_gAMA_fixed() were added. - Added new type "png_fixed_point" for integers that hold float*100000 values - Added many parentheses, e.g., "if (a && b & c)" becomes "if (a && (b & c))" - Added png_handle_as_unknown() - Added chunk_list and num_chunk_list members of png_ptr. - Define png_get_int_32 when oFFs chunk is supported as well as when pCAL is. - Added functions png_set_read_user_chunk_fn() and png_get_user_chunk_ptr() for setting a callback function to handle unknown chunks and for retrieving the associated user pointer (Glenn). - Added png_free_data() function. - Added high-level functions png_read_png() and png_write_png() (ESR). - Renamed pngdll.mak to makefile.bd32 - Cosmetic changes in pngtest.c - Fixed pngvcrd.c bug by pushing/popping registers in mmxsupport (Bruce Oberg) - Revised makefile.gcmmx - Fixed a bug in pngrtran.c that improperly expanded the background color. - Return *num_text=0 from png_get_text() when appropriate, and fix documentation of png_get_text() in libpng.txt/libpng.3. - Added PNG_SETJMP_SUPPORTED, PNG_SETJMP_NOT_SUPPORTED, and PNG_ABORT() and "png_jmpbuf()" macros to pngconf.h, to help people migrate to the new error handler that's planned for the next libpng release, and changed example.c, pngtest.c, and contrib programs to use this macro. - Revised some of the DLL-export macros in pngconf.h (Greg Roelofs) - Fixed some mistakes in the unused and undocumented INCH_CONVERSIONS functions in pngget.c - Updated makefile.linux and makefile.gccmmx to make directories conditionally. - Increased precision of rgb_to_gray calculations from 8 to 15 bits and added png_set_rgb_to_gray_fixed() function. - Added makefile.bc32 (32-bit Borland C++, C mode) - Updated references to the zlib home page, which has moved to freesoftware.com. - Corrected bugs in documentation regarding png_read_row() and png_write_row(). - Renamed makefile.borland,turboc3 back to makefile.bor,tc3 as in version 1.0.3, revised borland makefiles; added makefile.ibmvac3 and makefile.gcc (Cosmin) - Added makefile.sggcc (SGI IRIX with gcc) @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.8 2000/02/09 15:46:29 tron Exp $ d38 1 a38 1 + ${LIBTOOL} --mode=link cc -o $@@ ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 1:3 @ 1.8 log @Update "png" package to version 1.0.5. This version mostly fixes bugs discovered since version 1.0.3. A complete list of the changes can be found under "ftp://ftp.uu.net/graphics/png/src/libpng-1.0.5-README.txt". @ text @d1 1 a1 1 $NetBSD$ d38 1 a38 1 + ${LIBTOOL} --mode=link cc -o $@@ ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 1:2 @ 1.7 log @Update "png" package to version 1.0.3. @ text @d38 1 a38 1 + ${LIBTOOL} --mode=link cc -o $@@ ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 1:1 @ 1.6 log @Add NetBSD RCS Ids. @ text @d3 12 a14 3 --- scripts/makefile.std.orig Tue Jul 14 21:39:10 1998 +++ scripts/makefile.std Tue Jul 14 21:49:54 1998 @@@@ -8,41 +8,34 @@@@ d27 1 a27 6 # where make install puts libpng.a and png.h -prefix=/usr/local +prefix=${PREFIX} OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ d38 1 a38 1 + ${LIBTOOL} --mode=link cc -o $@@ ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 1:0 @ 1.5 log @Update libpng to 1.0.2. Works with all dependent pkgs I have tested (everything but ImageMagick, gs5, and xemacs20). The API hasn't changed much, say the install instructions, but it isn't binary compatible--bump shlib version to 1.0. @ text @d1 2 @ 1.4 log @Patch from Tim Rightnour to make "png" compile on alpha, fixes PR pkg/5626. @ text @d1 5 a5 10 --- makefile.orig Fri May 16 07:53:30 1997 +++ makefile Thu Oct 2 16:48:59 1997 @@@@ -5,29 +5,41 @@@@ # Where the zlib library and include files are located #ZLIBLIB=/usr/local/lib #ZLIBINC=/usr/local/include -ZLIBLIB=../zlib -ZLIBINC=../zlib +#ZLIBLIB=../zlib +#ZLIBINC=../zlib d8 1 a8 1 -CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=1 d10 3 a12 4 +VER=0.96 +#CC=cc +#CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=1 +LDFLAGS=-L. -lpng -lz -lm -static d26 19 a44 24 +.SUFFIXES: .c .so .o + +.c.so: + ${CC} -fpic -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} + +all: libpng.a libpng.so.${VER} libpng.a: $(OBJS) ar rc $@@ $(OBJS) $(RANLIB) $@@ +libpng.so.${VER}: $(OBJS:S/o$/so/g) + ${LD} -x -Bshareable -o libpng.so.${VER} $(OBJS:S/o$/so/g) + +# XXX - agc - weird shared library load line +# ${CC} -shared -Wl,-x -Wl,-assert -Wl,pure-text -o $@@ $(OBJS:S/o$/so/g) -lz + pngtest: pngtest.o libpng.a $(CC) -o pngtest $(CCFLAGS) pngtest.o $(LDFLAGS) @@@@ -37,12 +49,9 @@@@ install: libpng.a -@@mkdir $(prefix)/include -@@mkdir $(prefix)/lib d51 1 d53 1 a53 2 + ${BSD_INSTALL_DATA} libpng.a libpng.so.${VER} $(prefix)/lib + ranlib $(prefix)/lib/libpng.a @ 1.3 log @Slight fix to the shared library linking command. XXX This doesn't work for ELF/binutils. @ text @d44 1 a44 1 + ${LD} -x -Bshareable -Bforcearchive -o libpng.so.${VER} $(OBJS:S/o$/so/g) @ 1.2 log @Add NetBSD RCS Ids. Attempt to make the target directories ${PREFIX}-dependent. @ text @d44 1 a44 1 + ${LD} -Bshareable -o libpng.so.${VER} $(OBJS:S/o$/so/g) @ 1.1 log @Initial revision @ text @d1 67 a67 96 *** makefile.orig Fri May 16 10:53:30 1997 --- makefile Tue Jun 24 16:53:47 1997 *************** *** 5,33 **** # Where the zlib library and include files are located #ZLIBLIB=/usr/local/lib #ZLIBINC=/usr/local/include ! ZLIBLIB=../zlib ! ZLIBINC=../zlib ! CC=cc ! CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=1 ! LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm #RANLIB=echo RANLIB=ranlib # where make install puts libpng.a and png.h ! prefix=/usr/local OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ pngwtran.o pngmem.o pngerror.o pngpread.o ! all: libpng.a pngtest libpng.a: $(OBJS) ar rc $@@ $(OBJS) $(RANLIB) $@@ pngtest: pngtest.o libpng.a $(CC) -o pngtest $(CCFLAGS) pngtest.o $(LDFLAGS) --- 5,42 ---- # Where the zlib library and include files are located #ZLIBLIB=/usr/local/lib #ZLIBINC=/usr/local/include ! #ZLIBLIB=../zlib ! #ZLIBINC=../zlib ! VER=0.96 ! #CC=cc ! #CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=1 ! LDFLAGS=-L. -lpng -lz -lm -static #RANLIB=echo RANLIB=ranlib # where make install puts libpng.a and png.h ! prefix=${PREFIX} OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ pngwtran.o pngmem.o pngerror.o pngpread.o ! .SUFFIXES: .c .so .o ! ! .c.so: ! ${CC} -fpic -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} ! ! all: libpng.a libpng.so.${VER} libpng.a: $(OBJS) ar rc $@@ $(OBJS) $(RANLIB) $@@ + libpng.so.${VER}: $(OBJS:S/o$/so/g) + ${CC} -shared -Wl,-x -Wl,-assert -Wl,pure-text -o $@@ $(OBJS:S/o$/so/g) -lz + pngtest: pngtest.o libpng.a $(CC) -o pngtest $(CCFLAGS) pngtest.o $(LDFLAGS) *************** *** 37,48 **** install: libpng.a -@@mkdir $(prefix)/include -@@mkdir $(prefix)/lib ! cp png.h $(prefix)/include ! cp pngconf.h $(prefix)/include ! chmod 644 $(prefix)/include/png.h ! chmod 644 $(prefix)/include/pngconf.h ! cp libpng.a $(prefix)/lib ! chmod 644 $(prefix)/lib/libpng.a clean: rm -f *.o libpng.a pngtest pngout.png --- 46,54 ---- install: libpng.a -@@mkdir $(prefix)/include -@@mkdir $(prefix)/lib ! ${INSTALL} -c -m 644 -o ${BINOWN} -g ${BINGRP} png.h pngconf.h $(prefix)/include ! ${INSTALL} -c -m 644 -o ${BINOWN} -g ${BINGRP} libpng.a libpng.so.${VER} $(prefix)/lib ! ranlib $(prefix)/lib/libpng.a clean: rm -f *.o libpng.a pngtest pngout.png @ 1.1.1.1 log @Initial import of FreeBSD graphics ports into the NetBSD packages system. @ text @@