Fixes build with giflib-5.1.

2 files changed, 87 insertions, 4 deletions

diff --git a/graphics/evas/distinfo b/graphics/evas/distinfo
index 1a71be27490..033b7b315f1 100644
--- a/graphics/evas/distinfo
+++ b/graphics/evas/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2014/03/22 20:15:20 spz Exp $
+$NetBSD: distinfo,v 1.16 2014/05/25 08:12:26 obache Exp $
 
 SHA1 (evas-1.7.7.tar.bz2) = 680e85a60363df84b81298138cc19629f9f139bc
 RMD160 (evas-1.7.7.tar.bz2) = 306b36018c5ab07712553a554e4a2deac13854ed
@@ -6,5 +6,5 @@ Size (evas-1.7.7.tar.bz2) = 9408256 bytes
 SHA1 (patch-configure) = b7bda6085449a0fdcc51d58371101bb2f8bbc232
 SHA1 (patch-configure.ac) = d9330c131859794beb29414c9afe66a08b6fe55d
 SHA1 (patch-src_lib_engines_common_evas__font__load.c) = b6a0cb75692efc95e81b000f48216f6dd0f1ea27
-SHA1 (patch-src_modules_loaders_gif_evas__image__load__gif.c) = c0f386bde5bbe43aee54d1864377d2d0dad08103
+SHA1 (patch-src_modules_loaders_gif_evas__image__load__gif.c) = 5a61a54fc67f64ba71aed37aba5a094e8d47294a
 SHA1 (patch-src_modules_loaders_psd_evas__image__load__psd.c) = 386f375a68eb4d49b05cc69c041641d11c306082
diff --git a/graphics/evas/patches/patch-src_modules_loaders_gif_evas__image__load__gif.c b/graphics/evas/patches/patch-src_modules_loaders_gif_evas__image__load__gif.c
index b3b0a4274d6..a0b5dca4a2c 100644
--- a/graphics/evas/patches/patch-src_modules_loaders_gif_evas__image__load__gif.c
+++ b/graphics/evas/patches/patch-src_modules_loaders_gif_evas__image__load__gif.c
@@ -1,7 +1,18 @@
-$NetBSD: patch-src_modules_loaders_gif_evas__image__load__gif.c,v 1.1 2013/08/30 22:35:53 joerg Exp $
+$NetBSD: patch-src_modules_loaders_gif_evas__image__load__gif.c,v 1.2 2014/05/25 08:12:26 obache Exp $
 
---- src/modules/loaders/gif/evas_image_load_gif.c.orig	2013-08-30 21:25:51.000000000 +0000
+* Adapt to giflib>=5 API changes
+
+--- src/modules/loaders/gif/evas_image_load_gif.c.orig	2012-11-23 16:35:06.000000000 +0000
 +++ src/modules/loaders/gif/evas_image_load_gif.c
+@@ -338,7 +338,7 @@ _evas_image_load_frame_image_data(Image_
+ 
+    if (!cmap)
+      {
+-        DGifCloseFile(gif);
++        DGifCloseFile(gif, NULL);
+         for (i = 0; i < scale_h; i++)
+           {
+              free(rows[i]);
 @@ -700,7 +700,7 @@ evas_image_load_file_head_gif(Image_Entr
          return EINA_FALSE;
       }
@@ -11,6 +22,51 @@ $NetBSD: patch-src_modules_loaders_gif_evas__image__load__gif.c,v 1.1 2013/08/30
     if (!gif)
       {
          if (fd) close(fd);
+@@ -721,7 +721,7 @@ evas_image_load_file_head_gif(Image_Entr
+    if ((w < 1) || (h < 1) || (w > IMG_MAX_SIZE) || (h > IMG_MAX_SIZE) ||
+        IMG_TOO_BIG(w, h))
+      {
+-        DGifCloseFile(gif);
++        DGifCloseFile(gif, NULL);
+         if (IMG_TOO_BIG(w, h))
+           *error = EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
+         else
+@@ -736,7 +736,7 @@ evas_image_load_file_head_gif(Image_Entr
+         if (DGifGetRecordType(gif, &rec) == GIF_ERROR)
+           {
+              /* PrintGifError(); */
+-             DGifCloseFile(gif);
++             DGifCloseFile(gif, NULL);
+              *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT;
+              return EINA_FALSE;
+           }
+@@ -750,7 +750,7 @@ evas_image_load_file_head_gif(Image_Entr
+              if (DGifGetImageDesc(gif) == GIF_ERROR)
+                {
+                   /* PrintGifError(); */
+-                  DGifCloseFile(gif);
++                  DGifCloseFile(gif, NULL);
+                   *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT;
+                   return EINA_FALSE;
+                }
+@@ -758,7 +758,7 @@ evas_image_load_file_head_gif(Image_Entr
+              if (DGifGetCode(gif, &img_code, &img) == GIF_ERROR)
+                {
+                   /* PrintGifError(); */
+-                  DGifCloseFile(gif);
++                  DGifCloseFile(gif, NULL);
+                   *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT;
+                   return EINA_FALSE;
+                }
+@@ -814,7 +814,7 @@ evas_image_load_file_head_gif(Image_Entr
+         ie->frames = NULL;
+      }
+ 
+-   DGifCloseFile(gif);
++   DGifCloseFile(gif, NULL);
+    *error = EVAS_LOAD_ERROR_NONE;
+    return EINA_TRUE;
+ }
 @@ -838,7 +838,7 @@ evas_image_load_specific_frame(Image_Ent
          return EINA_FALSE;
       }
@@ -20,6 +76,15 @@ $NetBSD: patch-src_modules_loaders_gif_evas__image__load__gif.c,v 1.1 2013/08/30
     if (!gif)
       {
          if (fd) close(fd);
+@@ -877,7 +877,7 @@ evas_image_load_specific_frame(Image_Ent
+      }
+ 
+    ie->frames = eina_list_append(ie->frames, frame);
+-   DGifCloseFile(gif);
++   DGifCloseFile(gif, NULL);
+    return EINA_TRUE;
+ }
+ 
 @@ -927,7 +927,7 @@ evas_image_load_file_data_gif(Image_Entr
                    return EINA_FALSE;
                 }
@@ -29,6 +94,15 @@ $NetBSD: patch-src_modules_loaders_gif_evas__image__load__gif.c,v 1.1 2013/08/30
               if (!gif)
                 {
                    if (fd) close(fd);
+@@ -947,7 +947,7 @@ evas_image_load_file_data_gif(Image_Entr
+                   *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT;
+                   return EINA_FALSE;
+                }
+-             DGifCloseFile(gif);
++             DGifCloseFile(gif, NULL);
+              *error = EVAS_LOAD_ERROR_NONE;
+              return EINA_TRUE;
+           }
 @@ -1000,7 +1000,7 @@ evas_image_load_frame_duration_gif(Image
  #endif
     if (fd < 0) return -1;
@@ -38,3 +112,12 @@ $NetBSD: patch-src_modules_loaders_gif_evas__image__load__gif.c,v 1.1 2013/08/30
     if (!gif)
       {
          if (fd) close(fd);
+@@ -1064,7 +1064,7 @@ evas_image_load_frame_duration_gif(Image
+          }
+      } while (rec != TERMINATE_RECORD_TYPE);
+ 
+-   DGifCloseFile(gif);
++   DGifCloseFile(gif, NULL);
+    return duration;
+ }
+