summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2011-12-23 01:17:54 +0000
committerjoerg <joerg@pkgsrc.org>2011-12-23 01:17:54 +0000
commit9920e9131b841df6954c2d1700cc8b52d7d12d63 (patch)
tree1b23f0a6e5e0ff1b86d6a3bda53aff3cb899e9f6 /misc
parent937286d75dc1f925f3e75cffa6ddeb21e06f9e6e (diff)
downloadpkgsrc-9920e9131b841df6954c2d1700cc8b52d7d12d63.tar.gz
Fix issues from newer libpng
Diffstat (limited to 'misc')
-rw-r--r--misc/root/distinfo4
-rw-r--r--misc/root/patches/patch-graf2d_asimage_src_libAfterImage_export.c13
-rw-r--r--misc/root/patches/patch-graf2d_asimage_src_libAfterImage_import.c22
3 files changed, 38 insertions, 1 deletions
diff --git a/misc/root/distinfo b/misc/root/distinfo
index 6c9c1545d59..9fc27370d18 100644
--- a/misc/root/distinfo
+++ b/misc/root/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2011/12/15 18:51:43 dholland Exp $
+$NetBSD: distinfo,v 1.9 2011/12/23 01:17:54 joerg Exp $
SHA1 (root_v5.26.00b.source.tar.gz) = 70db6f9cf6acc29bcf0060a4c2e1f9e24c26702a
RMD160 (root_v5.26.00b.source.tar.gz) = 057ce1151a534f00a445ec69392e7a7a3bd55ca8
@@ -28,3 +28,5 @@ SHA1 (patch-bh) = 70591be468ba459aa1ab7f5159a3399566a784ea
SHA1 (patch-bi) = 338133d5a00d67f6d2fab4ee55ca8b3f9c78ddf5
SHA1 (patch-bj) = 07b5423a35c3998639cd5ac09596e5e40ce700f0
SHA1 (patch-ca) = 016b52171f894a800f667c7e588a51a8031907bb
+SHA1 (patch-graf2d_asimage_src_libAfterImage_export.c) = a206c421c5d05c4a38dba0fc686e75459a713e70
+SHA1 (patch-graf2d_asimage_src_libAfterImage_import.c) = b5e33f2b3ce858bfdc64eaed59ea7606173a2169
diff --git a/misc/root/patches/patch-graf2d_asimage_src_libAfterImage_export.c b/misc/root/patches/patch-graf2d_asimage_src_libAfterImage_export.c
new file mode 100644
index 00000000000..2573906a0e4
--- /dev/null
+++ b/misc/root/patches/patch-graf2d_asimage_src_libAfterImage_export.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-graf2d_asimage_src_libAfterImage_export.c,v 1.1 2011/12/23 01:17:54 joerg Exp $
+
+--- graf2d/asimage/src/libAfterImage/export.c.orig 2011-12-22 22:02:37.000000000 +0000
++++ graf2d/asimage/src/libAfterImage/export.c
+@@ -491,7 +491,7 @@ ASImage2png_int ( ASImage *im, void *dat
+ png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
+ if ( png_ptr != NULL )
+ if( (info_ptr = png_create_info_struct(png_ptr)) != NULL )
+- if( setjmp(png_ptr->jmpbuf) )
++ if( setjmp(png_jmpbuf(png_ptr)) )
+ {
+ png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr);
+ info_ptr = NULL ;
diff --git a/misc/root/patches/patch-graf2d_asimage_src_libAfterImage_import.c b/misc/root/patches/patch-graf2d_asimage_src_libAfterImage_import.c
new file mode 100644
index 00000000000..7cd58e3ce82
--- /dev/null
+++ b/misc/root/patches/patch-graf2d_asimage_src_libAfterImage_import.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-graf2d_asimage_src_libAfterImage_import.c,v 1.1 2011/12/23 01:17:54 joerg Exp $
+
+--- graf2d/asimage/src/libAfterImage/import.c.orig 2011-12-22 22:05:04.000000000 +0000
++++ graf2d/asimage/src/libAfterImage/import.c
+@@ -1251,7 +1251,7 @@ png2ASImage_int( void *data, png_rw_ptr
+ * 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)))
+ {
+ ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ;
+
+@@ -1468,7 +1468,7 @@ typedef struct ASImPNGReadBuffer
+
+ static void asim_png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+ {
+- ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_ptr->io_ptr;
++ ASImPNGReadBuffer *buf = png_get_io_ptr(png_ptr);
+ memcpy(data, buf->buffer, length);
+ buf->buffer += length;
+ }