fixes build with giflib-5.1

3 files changed, 34 insertions, 7 deletions

diff --git a/graphics/camlimages/distinfo b/graphics/camlimages/distinfo
index a9f41af89f1..640115ddf01 100644
--- a/graphics/camlimages/distinfo
+++ b/graphics/camlimages/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.11 2013/08/30 22:34:51 joerg Exp $
+$NetBSD: distinfo,v 1.12 2014/05/24 04:05:24 obache 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_gifread.c) = 63aac1a76e809676f0000f37af63c79c4edbe316
+SHA1 (patch-src_gifwrite.c) = ab92107467b059d9541edacf60a5f73ed71fd687
 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
index 3f046c994e9..41d11b8f2f2 100644
--- a/graphics/camlimages/patches/patch-src_gifread.c
+++ b/graphics/camlimages/patches/patch-src_gifread.c
@@ -1,6 +1,10 @@
-$NetBSD: patch-src_gifread.c,v 1.1 2013/08/30 22:34:51 joerg Exp $
+$NetBSD: patch-src_gifread.c,v 1.2 2014/05/24 04:05:24 obache Exp $
 
---- src/gifread.c.orig	2013-08-30 20:40:18.000000000 +0000
+* DGifOpenFileName API change for giflib-5
+* DGifCloseFile API change for giflib-5.1
+* PrintGifError API removal for giflib-4.2.0
+
+--- src/gifread.c.orig	2011-06-22 18:04:32.000000000 +0000
 +++ src/gifread.c
 @@ -140,7 +140,7 @@ value dGifOpenFileName( value name )
    GifFileType *GifFile;
@@ -11,6 +15,15 @@ $NetBSD: patch-src_gifread.c,v 1.1 2013/08/30 22:34:51 joerg Exp $
      failwith("DGifOpenFileName");
    }
  
+@@ -161,7 +161,7 @@ value dGifCloseFile( value hdl )
+      segmentation faults */
+   ((GifFileType *)hdl)->Image.ColorMap = NULL; 
+ 
+-  DGifCloseFile( (GifFileType *) hdl );
++  DGifCloseFile( (GifFileType *) hdl, NULL);
+   CAMLreturn(Val_unit);
+ }
+ 
 @@ -200,7 +200,6 @@ value dGifGetLine( value hdl )
  
    if( DGifGetLine(GifFile, String_val(buf), GifFile->Image.Width ) 
diff --git a/graphics/camlimages/patches/patch-src_gifwrite.c b/graphics/camlimages/patches/patch-src_gifwrite.c
index a5183be9bc1..698584b62ab 100644
--- a/graphics/camlimages/patches/patch-src_gifwrite.c
+++ b/graphics/camlimages/patches/patch-src_gifwrite.c
@@ -1,6 +1,11 @@
-$NetBSD: patch-src_gifwrite.c,v 1.1 2013/08/30 22:34:51 joerg Exp $
+$NetBSD: patch-src_gifwrite.c,v 1.2 2014/05/24 04:05:24 obache Exp $
 
---- src/gifwrite.c.orig	2013-08-30 20:37:28.000000000 +0000
+* MakeMapObject API rename for giflib-5
+* DGifOpenFileName API change for giflib-5
+* DGifCloseFile API change for giflib-5.1
+* PrintGifError API removal for giflib-4.2.0
+
+--- src/gifwrite.c.orig	2011-06-22 18:04:32.000000000 +0000
 +++ src/gifwrite.c
 @@ -52,7 +52,7 @@ ColorMapObject *ColorMapObject_val( valu
  fprintf(stderr, "Creating map with length = %d ...\n", len);
@@ -20,6 +25,15 @@ $NetBSD: patch-src_gifwrite.c,v 1.1 2013/08/30 22:34:51 joerg Exp $
      failwith("EGifOpenFileName");
    }
    /* gcc -fwritable-strings is required to compile libungif */
+@@ -88,7 +88,7 @@ value eGifCloseFile( value hdl )
+      segmentation faults */
+   ((GifFileType *)hdl)->Image.ColorMap = NULL; 
+ 
+-  EGifCloseFile( (GifFileType *) hdl );
++  EGifCloseFile( (GifFileType *) hdl, NULL);
+   CAMLreturn(Val_unit);
+ }
+ 
 @@ -133,7 +133,6 @@ value eGifPutLine( value oc, value buf )
  
    if ( EGifPutLine(GifFileOut, String_val(buf), GifFileOut->Image.Width)