diff options
| author | wiz <wiz@pkgsrc.org> | 2011-03-28 08:01:20 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2011-03-28 08:01:20 +0000 |
| commit | 3fdc88124be3253e6cfe3bed43692fea8d90dd73 (patch) | |
| tree | 15c8e26f6ccd037ce494fc54b52e87a34f82c511 /graphics | |
| parent | 6b0cbde81e8620fe9ed19ba0415a51592b0400e5 (diff) | |
| download | pkgsrc-3fdc88124be3253e6cfe3bed43692fea8d90dd73.tar.gz | |
Fix build with png-1.5. Reported by joerg.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/libvideogfx/distinfo | 3 | ||||
| -rw-r--r-- | graphics/libvideogfx/patches/patch-libvideogfx_graphics_fileio_png.cc | 24 |
2 files changed, 26 insertions, 1 deletions
diff --git a/graphics/libvideogfx/distinfo b/graphics/libvideogfx/distinfo index ca3b66436fd..5a9e22351d5 100644 --- a/graphics/libvideogfx/distinfo +++ b/graphics/libvideogfx/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2010/06/12 14:05:40 wiz Exp $ +$NetBSD: distinfo,v 1.5 2011/03/28 08:01:20 wiz Exp $ SHA1 (libvideogfx-1.0.3.tar.gz) = 1f78e185a05bf063a5f2c9ea4afae1a2d2715b89 RMD160 (libvideogfx-1.0.3.tar.gz) = db64375cc2e298b2cd0c7ff95401b913d4cc5236 @@ -10,3 +10,4 @@ SHA1 (patch-ad) = 9189a999ef64636562014306b7a3e5e138776273 SHA1 (patch-ae) = 6462a94b85a7be12fcff1d36c17b83f640f27b43 SHA1 (patch-af) = 06704cb9bfe2a940c676880104c976d2948afe83 SHA1 (patch-ag) = 12ae1ab89d325944f00e46e6584d4b3a691f0b1b +SHA1 (patch-libvideogfx_graphics_fileio_png.cc) = d2f0d228b5f3f2a9478709ef9228dd1fa5d62a55 diff --git a/graphics/libvideogfx/patches/patch-libvideogfx_graphics_fileio_png.cc b/graphics/libvideogfx/patches/patch-libvideogfx_graphics_fileio_png.cc new file mode 100644 index 00000000000..29c0c444df9 --- /dev/null +++ b/graphics/libvideogfx/patches/patch-libvideogfx_graphics_fileio_png.cc @@ -0,0 +1,24 @@ +$NetBSD: patch-libvideogfx_graphics_fileio_png.cc,v 1.1 2011/03/28 08:01:21 wiz Exp $ + +Fix build with png-1.5. + +--- libvideogfx/graphics/fileio/png.cc.orig 2002-11-12 13:23:17.000000000 +0000 ++++ libvideogfx/graphics/fileio/png.cc +@@ -114,7 +114,7 @@ namespace videogfx { + * the normal method of doing things with libpng). REQUIRED unless you + * set up your own error handlers in the png_create_read_struct() earlier. + */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); + /* If we get here, we had a problem reading the file */ +@@ -309,7 +309,7 @@ namespace videogfx { + /* Set error handling. REQUIRED if you aren't supplying your own + * error hadnling functions in the png_create_write_struct() call. + */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* If we get here, we had a problem reading the file */ + png_destroy_write_struct(&png_ptr, (png_infopp)NULL); + AssertDescr(false, "could not write png file"); |