Commit graph

124 commits

Author SHA1 Message Date
wiz
83158489a7 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.
2006-05-17 21:48:57 +00:00
wiz
7a6c37fc12 Propagate PNG_NO_ASSEMBLER_CODE to dependencies.
This should fix PR 33325 (ImageMagick not building on amd64).
2006-05-09 22:28:18 +00:00
wiz
e022ecbc45 Only use assembler code on i386. Fixes amd64 build and PR 33331 by Ben Collver. 2006-04-22 07:07:55 +00:00
wiz
2a2c6fd1dc Update to 1.2.9nb2 (hopefully final update for this weekend):
. add rpath to libpng-config output
. link against libpng12 (instead of libpng) in all cases.

The latter causes shlib dependency changes, so update
BUILDLINK_ABI_DEPENDS.png.
2006-04-17 13:44:46 +00:00
tron
776d9cc5ae Extend ".la" file hack to make it work under Mac OS X (Darwin), too. 2006-04-17 12:49:16 +00:00
wiz
089ea9a234 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.
2006-04-16 23:19:15 +00:00
wiz
a65fd047c9 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
2006-04-16 19:39:46 +00:00
reed
5abef9be14 Over 1200 files touched but no revisions bumped :)
RECOMMENDED is removed. It becomes ABI_DEPENDS.

BUILDLINK_RECOMMENDED.foo becomes BUILDLINK_ABI_DEPENDS.foo.

BUILDLINK_DEPENDS.foo becomes BUILDLINK_API_DEPENDS.foo.

BUILDLINK_DEPENDS does not change.

IGNORE_RECOMMENDED (which defaulted to "no") becomes USE_ABI_DEPENDS
which defaults to "yes".

Added to obsolete.mk checking for IGNORE_RECOMMENDED.

I did not manually go through and fix any aesthetic tab/spacing issues.

I have tested the above patch on DragonFly building and packaging
subversion and pkglint and their many dependencies.

I have also tested USE_ABI_DEPENDS=no on my NetBSD workstation (where I
have used IGNORE_RECOMMENDED for a long time). I have been an active user
of IGNORE_RECOMMENDED since it was available.

As suggested, I removed the documentation sentences suggesting bumping for
"security" issues.

As discussed on tech-pkg.

I will commit to revbump, pkglint, pkg_install, createbuildlink separately.

Note that if you use wip, it will fail!  I will commit to pkgsrc-wip
later (within day).
2006-04-06 06:21:32 +00:00
reed
45d9dae994 Honor PKGMANDIR. 2005-12-27 17:34:53 +00:00
rillig
b71a1d488b Fixed pkglint warnings. The warnings are mostly quoting issues, for
example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some
other changes are outlined in

    http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html
2005-12-05 20:49:47 +00:00
rillig
7fe72478c0 Replaced the "!" in the sed expression with a ",". This might have been
the cause for PR 31953, but I'm not sure. At least, "!" is some special
character for the shell whereas "," is not.
2005-11-04 11:58:54 +00:00
tv
f816d81489 Remove USE_BUILDLINK3 and NO_BUILDLINK; these are no longer used. 2005-04-11 21:44:48 +00:00
agc
6a7b384635 Add RMD160 digests 2005-02-24 08:45:01 +00:00
wiz
829094795b Update to 1.2.8:
Changes since the last public release (1.2.7):

  Fixed bug in png_text_compress() that would fail to complete a large block.
  Fixed bug, introduced in libpng-1.2.7, that overruns a buffer during
    strip alpha operation in png_do_strip_filler().
  Added PNG_1_2_X definition in pngconf.h
  #ifdef out png_info_init in png.c and png_read_init in pngread.c (as of 1.3.0)
  Reduce color_type to a nonalpha type after strip alpha operation in
    png_do_strip_filler().
  Revised definitions of PNG_MAX_UINT_32, PNG_MAX_SIZE, and PNG_MAXSUM
  Fixed (again) definition of PNG_LIBPNG_VER_DLLNUM in png.h (Cosmin).
  Added PNG_LIBPNG_BUILD_PRIVATE in png.h (Cosmin).
  Set png_ptr->zstream.data_type to Z_BINARY, to avoid unnecessary detection
    of data type in deflate (Cosmin).
  Deprecated but continue to support SPECIALBUILD and PRIVATEBUILD in favor of
    PNG_LIBPNG_BUILD_SPECIAL_STRING and PNG_LIBPNG_BUILD_PRIVATE_STRING.
  Despammed mailing addresses by masking "@" with "at".
  Added scripts/makefile.elf with supporting code in pngconf.h for symbol
    versioning (John Bowler).
  Added projects/visualc71 (Simon-pierre).
2004-12-05 11:17:12 +00:00
adam
60c7748ee4 Changes 1.2.7:
* Removed unused pngasmrd.h file.
* Removed references to uu.net for archived files.  Added references to
    PNG Spec (second edition) and the PNG ISO/IEC Standard.
* Added "test-dd" target in 15 makefiles, to run pngtest in DESTDIR.
* Fixed bug with "optimized window size" in the IDAT datastream, that
    causes libpng to write PNG files with incorrect zlib header bytes.
* Fixed bug with sCAL chunk and big-endian machines (David Munro).
* Undid new code added in 1.2.6rc2 to update the color_type in
    png_set_filler().
* Added png_set_add_alpha() that updates color type.
* Revised png_set_strip_filler() to not remove alpha if color_type has alpha.
* Added makefile.hp64
* Changed projects/msvc/png32ms.def to scripts/png32ms.def in makefile.cygwin
2004-10-15 12:33:21 +00:00
tv
c487cb967a Libtool fix for PR pkg/26633, and other issues. Update libtool to 1.5.10
in the process.  (More information on tech-pkg.)

Bump PKGREVISION and BUILDLINK_DEPENDS of all packages using libtool and
installing .la files.

Bump PKGREVISION (only) of all packages depending directly on the above
via a buildlink3 include.
2004-10-03 00:12:51 +00:00
jlam
1a280185e1 Mechanical changes to package PLISTs to make use of LIBTOOLIZE_PLIST.
All library names listed by *.la files no longer need to be listed
in the PLIST, e.g., instead of:

	lib/libfoo.a
	lib/libfoo.la
	lib/libfoo.so
	lib/libfoo.so.0
	lib/libfoo.so.0.1

one simply needs:

	lib/libfoo.la

and bsd.pkg.mk will automatically ensure that the additional library
names are listed in the installed package +CONTENTS file.

Also make LIBTOOLIZE_PLIST default to "yes".
2004-09-22 08:09:14 +00:00
reed
77260d34ff Revert the BUILDLINK_DEPENDS.png back to previous value (1.2.4)
because no ABI change or soname changes.

It is important to note that because of the fixed *_RECOMMENDED
mechanism, that 1.2.6rc2 will be the default version required.
2004-08-24 16:51:34 +00:00
drochner
45553da701 update to 1.2.6 (first official release after the recent
security fixes)
changes:
version 1.2.6rc3 [August 9, 2004]
  Eliminated use of "abs()" in testing cHRM and gAMA values, to avoid
  trouble with some 64-bit compilers.  Created PNG_OUT_OF_RANGE() macro.
  Revised documentation of png_set_keep_unknown_chunks().
  Check handle_as_unknown status in pngpread.c, as in pngread.c previously.
  Moved  "PNG_HANDLE_CHUNK_*" macros out of PNG_INTERNAL section of png.h
  Added "rim" definitions for CONST4 and CONST6 in pnggccrd.c
version 1.2.6rc4 [August 10, 2004]
  Fixed mistake in pngtest.c introduced in 1.2.6rc2 (declaration of
  "pinfo" was out of place).
version 1.2.6rc5 [August 10, 2004]
  Moved  "PNG_HANDLE_CHUNK_*" macros out of PNG_ASSEMBLER_CODE_SUPPORTED
  section of png.h where they were inadvertently placed in version rc3.
version 1.2.6rc6 [August 15, 2004]
  Revised pngtest so memory allocation testing is only done when PNG_DEBUG==1.
2004-08-17 09:54:30 +00:00
wiz
f2dc3a4ee6 Drop whitespace at EOL. 2004-08-13 14:20:02 +00:00
kristerw
7ddb4e1eed Convert a C99-ism to C89 to make this build with gcc 2.95.
This fixes PR 26602 submitted by Hauke Fath.
2004-08-09 10:49:00 +00:00
recht
1537d1cea7 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).
2004-08-09 07:37:35 +00:00
drochner
6376c20751 require >=1.2.6rc1 to force updates 2004-08-06 11:22:34 +00:00
drochner
7c4d3fabcf update to 1.2.6rc1,
fixes some security issues, see
http://scary.beasts.org/security/CESA-2004-001.txt
2004-08-06 09:25:18 +00:00
wiz
37ffbf2261 Fix path to pkgconfig file in PKGCONFIG_OVERRIDE.
Bump PKGREVISION, since now the pkgconfig file contains the right rpath.
2004-07-10 01:11:18 +00:00
wiz
4237d54a34 Unused. 2004-07-06 22:41:15 +00:00
fredb
05ba31daa0 Don't read past the end of the error message string. This patch was
posted to png-implement by Glenn Randers-Pherson, libpng's maintainer.

This error was widely reported as "security issue",

    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0421

even though there is no security issue. The most the error could do is
SIGSEGV, and that only with some fairly uncommon circumstances. The patch
posted with the advisory is in fact flawed, in that it calls strlen() on
presumably arbitrary data.

Bump PKGREVISION.
2004-05-10 01:15:14 +00:00
tv
1f40881d7d Convert INSTALL_SCRIPT to INSTALL_LIB. 2004-04-27 22:40:35 +00:00
tv
f1db9cd144 Shared objects must be installed as executable on some platforms. Convert
BSD_INSTALL_DATA to BSD_INSTALL_SCRIPT.
2004-04-27 19:36:27 +00:00
minskim
6c55c7ff67 Create pkgconfig directory before installing libpng12.pc. Noted by
Cesar Catrian C. in PR pkg/24974.
2004-03-30 15:52:09 +00:00
wiz
2899bc814c Fix pngconf.h on Linux systems. From Michal Pasternak in PR 24581.
Ride yesterday's PKGREVISION bump for this one.
2004-03-30 11:09:15 +00:00
wiz
5974879340 Bump PKGREVISION for pkgconfig file addition. 2004-03-29 17:11:46 +00:00
ben
6a15bc7987 Install lib/pkgconfig/libpng12.pc, otherwise "pkg-config --list-all" will
fail with an error if imlib2 is installed.
2004-03-29 16:02:08 +00:00
ben
b146e33847 Backing out PNG patch that installed lib/pkgconfig/libpng12.pc because it
was done incorrectly and because it was disruptive to the pkgsrc freeze.
Will fix this correctly after the freeze is finished.
2004-03-19 18:36:46 +00:00
ben
27f414b735 Install lib/pkgconfig/libpng12.pc, otherwise "pkgconfig --list-all" will
fail with an error if imlib2 is installed.
2004-03-18 22:40:40 +00:00
jlam
7db11b582a Fix serious bug where BUILDLINK_PACKAGES wasn't being ordered properly
by moving the inclusion of buildlink3.mk files outside of the protected
region.  This bug would be seen by users that have set PREFER_PKGSRC
or PREFER_NATIVE to non-default values.

BUILDLINK_PACKAGES should be ordered so that for any package in the
list, that package doesn't depend on any packages to the left of it
in the list.  This ordering property is used to check for builtin
packages in the correct order.  The problem was that including a
buildlink3.mk file for <pkg> correctly ensured that <pkg> was removed
from BUILDLINK_PACKAGES and appended to the end.  However, since the
inclusion of any other buildlink3.mk files within that buildlink3.mk
was in a region that was protected against multiple inclusion, those
dependencies weren't also moved to the end of BUILDLINK_PACKAGES.
2004-03-18 09:12:08 +00:00
jlam
9ff0e10340 Reorder location and setting of BUILDLINK_PACKAGES to match template
buildlink3.mk file in revision 1.101 of bsd.buildlink3.mk.
2004-03-05 19:25:06 +00:00
jlam
a1c40fc01e We no longer need to explicitly call ${BUILDLINK_*} for CC, CXX, LIBTOOL,
etc. because the bare variables will point to the correct executables.
2004-02-08 04:03:14 +00:00
jlam
a7d877ca6a Append to BUILDLINK_DEPENDS.<pkg> instead of setting a default value. In
the normal case when BUILDLINK_DEPENDS.<pkg> isn't specified, it receives
a value only once due to the multiple inclusion protection in the
bulldlink3.mk files.  In the case where a package includes several
buildlink3.mk files that each want a slightly different version of another
dependency, having BUILDLINK_DEPENDS.<pkg> be a list allows for the
strictest <pkg> dependency to be matched.
2004-01-24 03:26:45 +00:00
jlam
6ec3370def Packages converted to use buildlink should think that the "real" CC is
BUILDLINK_CC.
2004-01-15 21:07:42 +00:00
jlam
02eb6f1e19 bl3ify 2004-01-05 20:38:34 +00:00
jlam
d279e6f535 Use S/+$// instead of C/\+$// to save a backslash. Very highly
recommended by seb :)
2004-01-05 11:05:44 +00:00
jlam
47bb2aae5f Re-arrange to match example buildlink3.mk file in bsd.buildlink3.mk. 2004-01-04 23:34:04 +00:00
jlam
339cd13cb2 Initial sprinkling of work-in-progress buildlink3.mk files for using the
buildlink3 framework.
2004-01-03 23:06:43 +00:00
jlam
8ed9d09370 The checks for MIPSPro and including gcc.buildlink3.mk have moved to
bsd.pkg.mk, so no need for the same logic here.
2003-08-29 20:49:30 +00:00
grant
0155927c43 s/netbsd.org/NetBSD.org/ 2003-07-17 21:41:05 +00:00
jschauma
436f1a18cb Under IRIX, we don't need gcc's buildlink. MIPSPro does just fine. 2003-06-12 15:40:31 +00:00
grant
c8036d6723 include gcc.buildlink2.mk, allows this to build on NetBSD with gcc 3.3. 2003-05-28 12:51:29 +00:00
dillo
5f4ad95078 convert to use test target from bsd.pkg.mk
addresses PR pkg/19416
2003-02-17 15:27:58 +00:00
fredb
d5cfb80689 Fix another bug in png_do_read_filler() regarding 16-big *grayscale*
images (and bump package to 1.2.5nb2). The following is taken directly
from the png-implement mailing list...


    Date: Fri, 20 Dec 2002 11:26:31 -0500
    From: Glenn Randers-Pehrson <glennrp@comcast.net>
    Reply-To: png-implement@ccrc.wustl.edu
    To: png-implement@ccrc.wustl.edu
    Subject: Re: [png-implement] bug in png_read_filler() with 16-bit  samples

    At 01:01 AM 12/5/02 -0500, Glenn Randers-Pehrson wrote:
    >A bug has turned up in png_read_filler() with 16-bit samples.
    >The starting offsets for the loops are calculated incorrectly
    >which causes a buffer overrun beyond the beginning of the row
    >buffer.
    >
    >To fix, at lines 1968 and 1990,
    >change "row_width * 3" to "row_width * 6"
    >and at lines 1969 and 1991,
    >change "row_width;" to "row_width * 2;"

    This is only half of the story.  Adding an alpha channel to
    16-bit *grayscale* images with png_do_read_filler() exhibits
    the same bug, and pngcrush crashes if I try to do it.

    To fix, at lines 1892, 1893, 1910, and 1911 of pngrtran.c
    change "row_width" to "row_width * 2"

    Note that applications that do not add an alpha channel via
    png_set_filler(), and any applications that do, but reduce 16-bit
    samples to 8 bit via png_set_strip_16() are invulnerable to
    the bug.  Pngcrush is the only application that I know of
    that uses png_set_filler() without also using png_set_strip_16().

    Glenn


    --
    Send the message body "help" to png-implement-request@ccrc.wustl.edu
2002-12-20 17:54:27 +00:00