Update to 4.0.1, from Nicolas Thauvin.

4.0.1
	* Minor bug fixes, patch submitted by Damien Doligez

4.0.0
	* Stop supporting the autoconf build. (It might works though.)
	* Instead of autoconf, using omake and ocamlfind
	* Subpackages: no need to link codes for uninterested format.
	* Stop supporting lablgtk1
	  - Ximage2 module is now Ximage, and the older Ximage is removed
	  - OXimage2 module is now OXimage, and the older OXimage is removed

3.2.0
	* Misnamed version. It should have been 3.0.3 or something.
        * Small bug fix for image load memory allocation vulnerability

3.0.2
        * O'Caml 3.11 port.
	* Integer overflow vulnerability fix for pngread.c

3.0.1
        * Alpha channel support for png images.

3.0.0
        * new version numbering scheme
        * autoconf and makefiles cleanup
        * fix examples compilation

2.2.1
        * Now compiling with -warn-error -A


(wiz)

$NetBSD: patch-OMakefile,v 1.1 2011/08/07 20:36:20 wiz Exp $

--- OMakefile.orig	2011-06-22 18:04:32.000000000 +0000
+++ OMakefile	2011-08-06 17:23:47.000000000 +0000
@@ -25,8 +25,10 @@
   /usr/include/X11
   /usr/local/include
 
+INCLUDES[]+= @PREFIX@/include
+
 # Specify non standard library directories
-LDFLAGS[]+= 
+LDFLAGS[]+= @LDFLAGS@
 # for example, 
 # LDFLAGS[]+= -L/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/
 
@@ -35,6 +37,8 @@
   /etc/X11
   /usr/share/X11
 
+PATH_RGB_TXT[]+= @X11BASE@/lib/X11
+
 BYTE_ENABLED=1
 NATIVE_ENABLED=1
 
@@ -122,11 +126,11 @@
     export
 
   HAVE_Z = $(Check_header_library z, zlib.h, zlibVersion)
-  HAVE_PNG = $(Check_header_library png, png.h, png_create_read_struct)
+  HAVE_PNG = $(Check_header_library png15, png.h, png_create_read_struct)
   SUPPORT_PNG = $(and $(HAVE_Z) $(HAVE_PNG))
   LDFLAGS_png=
   if $(SUPPORT_PNG)
-    LDFLAGS_png=-lpng -lz
+    LDFLAGS_png=-lpng15 -lz
     SUPPORTED_FORMATS+=png
     export
 

$NetBSD: patch-src_pngread.c,v 1.1 2011/08/07 20:36:20 wiz Exp $

Fix build with png-1.5.

--- src/pngread.c.orig	2011-01-25 14:10:44.000000000 +0000
+++ src/pngread.c	2011-04-17 13:35:40.000000000 +0000
@@ -69,7 +69,7 @@
   }
 
   /* 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);
@@ -134,7 +134,7 @@
     png_set_rows(png_ptr, info_ptr, row_pointers);
 
     /* 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);
@@ -243,7 +243,7 @@
   }
 
   /* 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);
@@ -302,7 +302,7 @@
     png_set_rows(png_ptr, info_ptr, row_pointers);
 
     /* 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);

$NetBSD: patch-src_pngwrite.c,v 1.1 2011/08/07 20:36:20 wiz Exp $

Fix build with png-1.5.

--- src/pngwrite.c.orig	2011-01-25 14:10:44.000000000 +0000
+++ src/pngwrite.c	2011-04-17 13:36:21.000000000 +0000
@@ -62,7 +62,7 @@
   }
 
   /* 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);
@@ -171,7 +171,7 @@
   }
 
   /* 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);

$NetBSD: patch-src_tiffread.c,v 1.1 2011/08/07 20:36:20 wiz Exp $

--- src/tiffread.c.orig	2011-01-25 14:10:44.000000000 +0000
+++ src/tiffread.c	2011-04-17 13:37:39.000000000 +0000
@@ -28,6 +28,8 @@
 #define uint16 uint16tiff
 #define int32 int32tiff
 #define uint32 uint32tiff
+#define uint16 uint16_t
+#define uint32 uint32_t
 
 #include <tiffio.h>