[EFL][JHBUILD] Fix evas build with giflib5
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 8 Sep 2013 08:58:14 +0000 (08:58 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 8 Sep 2013 08:58:14 +0000 (08:58 +0000)
https://bugs.webkit.org/show_bug.cgi?id=120863

Original patch from Doug Newgard, at https://phab.enlightenment.org/D200.

Patch by Sergio Correia <sergio.correia@openbossa.org> on 2013-09-08
Reviewed by Anders Carlsson.

* efl/jhbuild.modules: Apply patch to fix evas build with giflib5.
* efl/patches/evas-fix-build-with-giflib5.patch: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@155293 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/efl/jhbuild.modules
Tools/efl/patches/evas-fix-build-with-giflib5.patch [new file with mode: 0644]

index a8b929431a072d6f268cb6d220dd722ec1576611..b38b9fd5094c8244e810b9e71b66907fd0f5fbd0 100644 (file)
@@ -1,3 +1,15 @@
+2013-09-08  Sergio Correia  <sergio.correia@openbossa.org>
+
+        [EFL][JHBUILD] Fix evas build with giflib5
+        https://bugs.webkit.org/show_bug.cgi?id=120863
+
+        Original patch from Doug Newgard, at https://phab.enlightenment.org/D200.
+
+        Reviewed by Anders Carlsson.
+
+        * efl/jhbuild.modules: Apply patch to fix evas build with giflib5.
+        * efl/patches/evas-fix-build-with-giflib5.patch: Added.
+
 2013-09-07  Filip Pizlo  <fpizlo@apple.com>
 
         Only run FTL tests if we have the FTL
index 53e2d2a41bcf634a4dc59e2a81fd6cfd7fff196f..a1bcb0bc1b918eec3a24b50cc6ad18928f567c2b 100644 (file)
             repo="download.enlightenment.org"
             hash="sha256:70b350a970b2086787622845896f3e54de278fe698b8069796fd752e70427374"
             md5sum="2c965b836128a839292161d4ca89380d">
+      <patch file="evas-fix-build-with-giflib5.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="eet"/>
diff --git a/Tools/efl/patches/evas-fix-build-with-giflib5.patch b/Tools/efl/patches/evas-fix-build-with-giflib5.patch
new file mode 100644 (file)
index 0000000..203fbdd
--- /dev/null
@@ -0,0 +1,54 @@
+Patch from Doug Newgard, available at https://phab.enlightenment.org/D200
+
+diff --git a/src/modules/loaders/gif/evas_image_load_gif.c b/src/modules/loaders/gif/evas_image_load_gif.c
+index 18a6e23..6b6ef3d 100644
+--- a/src/modules/loaders/gif/evas_image_load_gif.c
++++ b/src/modules/loaders/gif/evas_image_load_gif.c
+@@ -700,7 +700,11 @@ evas_image_load_file_head_gif(Image_Entry *ie, const char *file, const char *key
+         return EINA_FALSE;
+      }
++#if GIFLIB_MAJOR >= 5
++   gif = DGifOpenFileHandle(fd, NULL);
++#else
+    gif = DGifOpenFileHandle(fd);
++#endif
+    if (!gif)
+      {
+         if (fd) close(fd);
+@@ -838,7 +842,11 @@ evas_image_load_specific_frame(Image_Entry *ie, const char *file, int frame_inde
+         return EINA_FALSE;
+      }
++#if GIFLIB_MAJOR >= 5
++   gif = DGifOpenFileHandle(fd, NULL);
++#else
+    gif = DGifOpenFileHandle(fd);
++#endif
+    if (!gif)
+      {
+         if (fd) close(fd);
+@@ -927,7 +935,11 @@ evas_image_load_file_data_gif(Image_Entry *ie, const char *file, const char *key
+                   return EINA_FALSE;
+                }
++#if GIFLIB_MAJOR >= 5
++             gif = DGifOpenFileHandle(fd, NULL);
++#else
+              gif = DGifOpenFileHandle(fd);
++#endif
+              if (!gif)
+                {
+                   if (fd) close(fd);
+@@ -1000,7 +1012,11 @@ evas_image_load_frame_duration_gif(Image_Entry *ie, const char *file, const int
+ #endif
+    if (fd < 0) return -1;
++#if GIFLIB_MAJOR >=5
++   gif = DGifOpenFileHandle(fd, NULL);
++#else
+    gif = DGifOpenFileHandle(fd);
++#endif
+    if (!gif)
+      {
+         if (fd) close(fd);