From 2ee660383b79e0852f26e1a983554884aa1ac99a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 22 Dec 2012 05:19:28 +0100 Subject: [PATCH] New package: evas-1.7.4. --- common/shlibs | 3 +- srcpkgs/evas-devel | 1 + srcpkgs/evas/evas-devel.template | 10 ++++ srcpkgs/evas/patches/giflib-5.patch | 81 +++++++++++++++++++++++++++++ srcpkgs/evas/template | 20 +++++++ 5 files changed, 114 insertions(+), 1 deletion(-) create mode 120000 srcpkgs/evas-devel create mode 100644 srcpkgs/evas/evas-devel.template create mode 100644 srcpkgs/evas/patches/giflib-5.patch create mode 100644 srcpkgs/evas/template diff --git a/common/shlibs b/common/shlibs index 3799cf694f..c61a04238c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1139,4 +1139,5 @@ libgnt.so.0 libgnt-2.10.6_1 libvarnishapi.so.1 libvarnishapi-3.0.3_1 libao.so.4 libao-1.1.0_1 libeina.so.1 eina-1.7.4_1 -libeet.so.1.7.4 eet-1.7.4_1 +libeet.so.1 eet-1.7.4_1 +libevas.so.1 evas-1.7.4_1 diff --git a/srcpkgs/evas-devel b/srcpkgs/evas-devel new file mode 120000 index 0000000000..0a06c4bcc1 --- /dev/null +++ b/srcpkgs/evas-devel @@ -0,0 +1 @@ +evas \ No newline at end of file diff --git a/srcpkgs/evas/evas-devel.template b/srcpkgs/evas/evas-devel.template new file mode 100644 index 0000000000..0c8a016422 --- /dev/null +++ b/srcpkgs/evas/evas-devel.template @@ -0,0 +1,10 @@ +# Template file for 'evas-devel'. +# +noarch=yes +depends="eina-devel evas>=${version}" +short_desc="${short_desc} -- development files" + +do_install() { + vmove usr/include usr + vmove usr/lib/pkgconfig usr/lib +} diff --git a/srcpkgs/evas/patches/giflib-5.patch b/srcpkgs/evas/patches/giflib-5.patch new file mode 100644 index 0000000000..d58205ea6c --- /dev/null +++ b/srcpkgs/evas/patches/giflib-5.patch @@ -0,0 +1,81 @@ +--- src/modules/loaders/gif/evas_image_load_gif.c.orig 2012-12-20 23:06:46.000000000 +0100 ++++ src/modules/loaders/gif/evas_image_load_gif.c 2012-12-22 05:15:33.315952654 +0100 +@@ -684,6 +684,7 @@ evas_image_load_file_head_gif(Image_Entr + int h; + int alpha; + int loop_count = -1; ++ int err = 0; + + w = 0; + h = 0; +@@ -700,8 +701,8 @@ evas_image_load_file_head_gif(Image_Entr + return EINA_FALSE; + } + +- gif = DGifOpenFileHandle(fd); +- if (!gif) ++ gif = DGifOpenFileHandle(fd, &err); ++ if (err != 0) + { + if (fd) close(fd); + *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT; +@@ -822,7 +823,7 @@ evas_image_load_file_head_gif(Image_Entr + static Eina_Bool + evas_image_load_specific_frame(Image_Entry *ie, const char *file, int frame_index, int *error) + { +- int fd; ++ int fd, err = 0; + GifFileType *gif; + Image_Entry_Frame *frame = NULL; + Gif_Frame *gif_frame = NULL; +@@ -838,8 +839,8 @@ evas_image_load_specific_frame(Image_Ent + return EINA_FALSE; + } + +- gif = DGifOpenFileHandle(fd); +- if (!gif) ++ gif = DGifOpenFileHandle(fd, &err); ++ if (err != 0) + { + if (fd) close(fd); + *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT; +@@ -913,7 +914,7 @@ evas_image_load_file_data_gif(Image_Entr + evas_image_load_file_data_gif_internal(ie,frame,error); + else + { +- int fd; ++ int fd, err = 0; + GifFileType *gif; + + #ifndef __EMX__ +@@ -927,8 +928,8 @@ evas_image_load_file_data_gif(Image_Entr + return EINA_FALSE; + } + +- gif = DGifOpenFileHandle(fd); +- if (!gif) ++ gif = DGifOpenFileHandle(fd, &err); ++ if (err != 0) + { + if (fd) close(fd); + *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT; +@@ -976,7 +977,7 @@ evas_image_load_file_data_gif(Image_Entr + static double + evas_image_load_frame_duration_gif(Image_Entry *ie, const char *file, const int start_frame, const int frame_num) + { +- int fd; ++ int fd, err = 0; + GifFileType *gif; + GifRecordType rec; + int done; +@@ -1000,8 +1001,8 @@ evas_image_load_frame_duration_gif(Image + #endif + if (fd < 0) return -1; + +- gif = DGifOpenFileHandle(fd); +- if (!gif) ++ gif = DGifOpenFileHandle(fd, &err); ++ if (err != 0) + { + if (fd) close(fd); + return -1; diff --git a/srcpkgs/evas/template b/srcpkgs/evas/template new file mode 100644 index 0000000000..ccfc2175be --- /dev/null +++ b/srcpkgs/evas/template @@ -0,0 +1,20 @@ +# Template file for 'evas' +pkgname=evas +version=1.7.4 +revision=1 +subpackages="evas-devel" +makedepends="pkg-config giflib-devel libpng-devel jpeg-devel fontconfig-devel + tiff-devel fribidi-devel harfbuzz-devel eet-devel pixman-devel + xcb-util-image-devel MesaLib-devel" +build_style=gnu-configure +configure_args="--disable-static --enable-gl-xlib --enable-pthreads + --enable-async-events --enable-pixman --enable-pixman-font + --enable-pixman-rect --enable-pixman-line --enable-pixman-poly + --enable-pixman-image --enable-pixman-image-scale-sample + --disable-install-examples --enable-gl-xcb" +homepage="http://enlightenment.org" +short_desc="A hardware-accelerated canvas API" +maintainer="Juan RP " +license="BSD" +distfiles="http://download.enlightenment.org/releases/evas-${version}.tar.gz" +checksum=a3e19a0bbad3cfafc314c46baa0b5250382809bc04e458bd0c02b5ce68a29da6