[packages/evas] - fix building with giflib 5.1 - rel 6
baggins
baggins at pld-linux.org
Mon Nov 10 08:11:10 CET 2014
commit 4e14e60a7a31ad3fdc35e053f930632ac165e53a
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Mon Nov 10 08:10:50 2014 +0100
- fix building with giflib 5.1
- rel 6
evas-giflib.patch | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
evas.spec | 6 ++--
2 files changed, 87 insertions(+), 2 deletions(-)
---
diff --git a/evas.spec b/evas.spec
index cf15343..c89d645 100644
--- a/evas.spec
+++ b/evas.spec
@@ -40,13 +40,14 @@ Summary: Multi-platform Canvas Library
Summary(pl.UTF-8): Wieloplatformowa biblioteka do rysowania
Name: evas
Version: 1.7.10
-Release: 5
+Release: 6
License: BSD
Group: Libraries
Source0: http://download.enlightenment.org/releases/%{name}-%{version}.tar.bz2
# Source0-md5: ae96df73b30f4957aebe32c13d75cb49
Patch0: %{name}-wayland.patch
Patch1: %{name}-fribidi.patch
+Patch2: %{name}-giflib.patch
URL: http://trac.enlightenment.org/e/wiki/Evas
%{?with_directfb:BuildRequires: DirectFB-devel >= 0.9.16}
BuildRequires: Mesa-libGLU-devel
@@ -60,7 +61,7 @@ BuildRequires: eina-devel >= %{eina_ver}
BuildRequires: fontconfig-devel >= 2.5.0
BuildRequires: freetype-devel >= 1:2.2
BuildRequires: fribidi-devel >= 0.19.2
-BuildRequires: giflib-devel
+BuildRequires: giflib-devel >= 5.1.0
BuildRequires: harfbuzz-devel >= 0.9.0
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel >= 1.2
@@ -488,6 +489,7 @@ Moduł zapisywania obrazów TIFF dla Evas.
%setup -q -n %{name}-%{version}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
%{__libtoolize}
diff --git a/evas-giflib.patch b/evas-giflib.patch
new file mode 100644
index 0000000..77de700
--- /dev/null
+++ b/evas-giflib.patch
@@ -0,0 +1,83 @@
+--- evas-1.7.10/src/modules/loaders/gif/evas_image_load_gif.c~ 2013-08-01 17:41:35.000000000 +0200
++++ evas-1.7.10/src/modules/loaders/gif/evas_image_load_gif.c 2014-11-10 08:09:51.040708649 +0100
+@@ -338,7 +338,7 @@
+
+ if (!cmap)
+ {
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ for (i = 0; i < scale_h; i++)
+ {
+ free(rows[i]);
+@@ -725,7 +725,7 @@
+ 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
+@@ -740,7 +740,7 @@
+ if (DGifGetRecordType(gif, &rec) == GIF_ERROR)
+ {
+ /* PrintGifError(); */
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT;
+ return EINA_FALSE;
+ }
+@@ -754,7 +754,7 @@
+ if (DGifGetImageDesc(gif) == GIF_ERROR)
+ {
+ /* PrintGifError(); */
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT;
+ return EINA_FALSE;
+ }
+@@ -762,7 +762,7 @@
+ if (DGifGetCode(gif, &img_code, &img) == GIF_ERROR)
+ {
+ /* PrintGifError(); */
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT;
+ return EINA_FALSE;
+ }
+@@ -818,7 +818,7 @@
+ ie->frames = NULL;
+ }
+
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ *error = EVAS_LOAD_ERROR_NONE;
+ return EINA_TRUE;
+ }
+@@ -885,7 +885,7 @@
+ }
+
+ ie->frames = eina_list_append(ie->frames, frame);
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ return EINA_TRUE;
+ }
+
+@@ -959,7 +959,7 @@
+ *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT;
+ return EINA_FALSE;
+ }
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ *error = EVAS_LOAD_ERROR_NONE;
+ return EINA_TRUE;
+ }
+@@ -1080,7 +1080,7 @@
+ }
+ } while (rec != TERMINATE_RECORD_TYPE);
+
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ return duration;
+ }
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/evas.git/commitdiff/4e14e60a7a31ad3fdc35e053f930632ac165e53a
More information about the pld-cvs-commit
mailing list