Title: [155293] trunk/Tools
- Revision
- 155293
- Author
- [email protected]
- Date
- 2013-09-08 01:58:14 -0700 (Sun, 08 Sep 2013)
Log Message
[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.
Patch by Sergio Correia <[email protected]> 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.
Modified Paths
Added Paths
Diff
Modified: trunk/Tools/ChangeLog (155292 => 155293)
--- trunk/Tools/ChangeLog 2013-09-08 08:56:17 UTC (rev 155292)
+++ trunk/Tools/ChangeLog 2013-09-08 08:58:14 UTC (rev 155293)
@@ -1,3 +1,15 @@
+2013-09-08 Sergio Correia <[email protected]>
+
+ [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 <[email protected]>
Only run FTL tests if we have the FTL
Modified: trunk/Tools/efl/jhbuild.modules (155292 => 155293)
--- trunk/Tools/efl/jhbuild.modules 2013-09-08 08:56:17 UTC (rev 155292)
+++ trunk/Tools/efl/jhbuild.modules 2013-09-08 08:58:14 UTC (rev 155293)
@@ -173,6 +173,7 @@
repo="download.enlightenment.org"
hash="sha256:70b350a970b2086787622845896f3e54de278fe698b8069796fd752e70427374"
md5sum="2c965b836128a839292161d4ca89380d">
+ <patch file="evas-fix-build-with-giflib5.patch" strip="1"/>
</branch>
<dependencies>
<dep package="eet"/>
Added: trunk/Tools/efl/patches/evas-fix-build-with-giflib5.patch (0 => 155293)
--- trunk/Tools/efl/patches/evas-fix-build-with-giflib5.patch (rev 0)
+++ trunk/Tools/efl/patches/evas-fix-build-with-giflib5.patch 2013-09-08 08:58:14 UTC (rev 155293)
@@ -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);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
