Fix build with newer giflib.

3 files changed, 54 insertions, 1 deletions

diff --git a/graphics/camlimages/distinfo b/graphics/camlimages/distinfo
index 209566aa28b..a9f41af89f1 100644
--- a/graphics/camlimages/distinfo
+++ b/graphics/camlimages/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.10 2012/12/26 10:24:16 jaapb Exp $
+$NetBSD: distinfo,v 1.11 2013/08/30 22:34:51 joerg Exp $
 
 SHA1 (camlimages-4.0.1/v4.0.1.tar.gz) = 4c1eee28f02749f53ed8345b448ce11375ce6dce
 RMD160 (camlimages-4.0.1/v4.0.1.tar.gz) = 6ae0f4c2ad3f0a8d7f4d84109d413e0b4bc1a86b
 Size (camlimages-4.0.1/v4.0.1.tar.gz) = 2190252 bytes
 SHA1 (patch-OMakefile) = 3d6343128c8c6d450463e2cf6a2e1f5b75d4285a
+SHA1 (patch-src_gifread.c) = d080d957cdfb6859413db4fd42beef987e2cb11f
+SHA1 (patch-src_gifwrite.c) = 339d3c9a4a4a366d1d7da936b785d511c6149c60
 SHA1 (patch-src_jpegread.c) = e6aa9279e6efc0c8345b74344d56377ddfe77b74
 SHA1 (patch-src_pngread.c) = 00d753b8570b5ff9ffa71e6e62328496b03f9654
 SHA1 (patch-src_pngwrite.c) = 4df4f69851769e0eefc2249a30ac8dd53aa8d755
diff --git a/graphics/camlimages/patches/patch-src_gifread.c b/graphics/camlimages/patches/patch-src_gifread.c
new file mode 100644
index 00000000000..3f046c994e9
--- /dev/null
+++ b/graphics/camlimages/patches/patch-src_gifread.c
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_gifread.c,v 1.1 2013/08/30 22:34:51 joerg Exp $
+
+--- src/gifread.c.orig	2013-08-30 20:40:18.000000000 +0000
++++ src/gifread.c
+@@ -140,7 +140,7 @@ value dGifOpenFileName( value name )
+   GifFileType *GifFile;
+   int i;
+ 
+-  if((GifFile = DGifOpenFileName( String_val(name) )) == NULL){
++  if((GifFile = DGifOpenFileName( String_val(name), NULL )) == NULL){
+     failwith("DGifOpenFileName");
+   }
+ 
+@@ -200,7 +200,6 @@ value dGifGetLine( value hdl )
+ 
+   if( DGifGetLine(GifFile, String_val(buf), GifFile->Image.Width ) 
+       == GIF_ERROR ){
+-    PrintGifError ();
+     failwith("DGifGetLine");
+   }
+   CAMLreturn(buf);
diff --git a/graphics/camlimages/patches/patch-src_gifwrite.c b/graphics/camlimages/patches/patch-src_gifwrite.c
new file mode 100644
index 00000000000..a5183be9bc1
--- /dev/null
+++ b/graphics/camlimages/patches/patch-src_gifwrite.c
@@ -0,0 +1,30 @@
+$NetBSD: patch-src_gifwrite.c,v 1.1 2013/08/30 22:34:51 joerg Exp $
+
+--- src/gifwrite.c.orig	2013-08-30 20:37:28.000000000 +0000
++++ src/gifwrite.c
+@@ -52,7 +52,7 @@ ColorMapObject *ColorMapObject_val( valu
+ fprintf(stderr, "Creating map with length = %d ...\n", len);
+ fflush(stderr);
+ */
+-  cmapobj = MakeMapObject( len, NULL );
++  cmapobj = GifMakeMapObject( len, NULL );
+   for(i=0; i< len; i++){
+     cmapobj->Colors[i].Red   = Int_val(Field(Field(cmap,i),0));
+     cmapobj->Colors[i].Green = Int_val(Field(Field(cmap,i),1));
+@@ -68,7 +68,7 @@ value eGifOpenFileName( name )
+ 
+   GifFileType *GifFileOut;
+ 
+-  if ((GifFileOut = EGifOpenFileName( String_val( name ), 0) )== NULL) {
++  if ((GifFileOut = EGifOpenFileName( String_val( name ), 0, NULL) )== NULL) {
+     failwith("EGifOpenFileName");
+   }
+   /* gcc -fwritable-strings is required to compile libungif */
+@@ -133,7 +133,6 @@ value eGifPutLine( value oc, value buf )
+ 
+   if ( EGifPutLine(GifFileOut, String_val(buf), GifFileOut->Image.Width) 
+        == GIF_ERROR ){
+-    PrintGifError ();
+     failwith("EGifPutLine");
+   }
+   CAMLreturn(Val_unit);