diff options
author | wiz <wiz@pkgsrc.org> | 2011-02-19 10:54:37 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2011-02-19 10:54:37 +0000 |
commit | 7d379800cc749760de3698a8b5ca660fc515eaa7 (patch) | |
tree | de4d69e9a733f768ffebc24e4d87502200d3cded /graphics | |
parent | 9a54b5ed1a177a8a8f594c2495b7e99b569c962d (diff) | |
download | pkgsrc-7d379800cc749760de3698a8b5ca660fc515eaa7.tar.gz |
Fix build with png-1.5.
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/camlimages/distinfo | 4 | ||||
-rw-r--r-- | graphics/camlimages/patches/patch-png_pngread.c | 42 | ||||
-rw-r--r-- | graphics/camlimages/patches/patch-png_pngwrite.c | 24 |
3 files changed, 69 insertions, 1 deletions
diff --git a/graphics/camlimages/distinfo b/graphics/camlimages/distinfo index 96adb73e7a2..b649d1a6e5c 100644 --- a/graphics/camlimages/distinfo +++ b/graphics/camlimages/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.5 2006/02/03 11:29:54 joerg Exp $ +$NetBSD: distinfo,v 1.6 2011/02/19 10:54:37 wiz Exp $ SHA1 (camlimages-2.2.0.tgz) = bc0062739be5ca9236f28145f17f840bf3f295ee RMD160 (camlimages-2.2.0.tgz) = 0f108ef3da565aeb0ab10d00e45819399af36d8c Size (camlimages-2.2.0.tgz) = 1385525 bytes SHA1 (patch-aa) = 8f1818e6b1a782066acb2ad6399514aa61e0e1f8 +SHA1 (patch-png_pngread.c) = b4d696e75c728be9a766424b41afbe5bb9446685 +SHA1 (patch-png_pngwrite.c) = 6894fc49bc0e752df550331c77c859362650c626 diff --git a/graphics/camlimages/patches/patch-png_pngread.c b/graphics/camlimages/patches/patch-png_pngread.c new file mode 100644 index 00000000000..a3899920127 --- /dev/null +++ b/graphics/camlimages/patches/patch-png_pngread.c @@ -0,0 +1,42 @@ +$NetBSD: patch-png_pngread.c,v 1.1 2011/02/19 10:54:37 wiz Exp $ + +Fix build with png-1.5. + +--- png/pngread.c.orig 2002-03-26 13:15:10.000000000 +0000 ++++ png/pngread.c +@@ -70,7 +70,7 @@ value read_png_file_as_rgb24( name ) + } + + /* error handling */ +- 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); + fclose(fp); +@@ -126,7 +126,7 @@ value read_png_file_as_rgb24( name ) + } + + /* Later, we can return something */ +- 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); + fclose(fp); +@@ -224,7 +224,7 @@ value read_png_file( name ) + } + + /* error handling */ +- 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); + fclose(fp); +@@ -328,7 +328,7 @@ fprintf(stderr, "pngread.c: rgb image\n" + } + + /* Later, we can return something */ +- 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); + fclose(fp); diff --git a/graphics/camlimages/patches/patch-png_pngwrite.c b/graphics/camlimages/patches/patch-png_pngwrite.c new file mode 100644 index 00000000000..cd21647fc6b --- /dev/null +++ b/graphics/camlimages/patches/patch-png_pngwrite.c @@ -0,0 +1,24 @@ +$NetBSD: patch-png_pngwrite.c,v 1.1 2011/02/19 10:54:37 wiz Exp $ + +Fix build with png-1.5. + +--- png/pngwrite.c.orig 2004-03-04 17:10:00.000000000 +0000 ++++ png/pngwrite.c +@@ -57,7 +57,7 @@ value write_png_file_rgb24( name, buffer + } + + /* error handling */ +- 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_write_struct(&png_ptr, &info_ptr); + fclose(fp); +@@ -166,7 +166,7 @@ value write_png_file_index( name, buffer + } + + /* error handling */ +- 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_write_struct(&png_ptr, &info_ptr); + fclose(fp); |