[arch-commits] Commit in evas/trunk (PKGBUILD evas-1.7.5-giflib5.patch)
Jan de Groot
jgc at nymeria.archlinux.org
Tue Jul 30 10:54:23 UTC 2013
Date: Tuesday, July 30, 2013 @ 12:54:23
Author: jgc
Revision: 191768
giflib rebuild
upgpkg: evas 1.7.7-2
Added:
evas/trunk/evas-1.7.5-giflib5.patch
Modified:
evas/trunk/PKGBUILD
--------------------------+
PKGBUILD | 18 +++++---
evas-1.7.5-giflib5.patch | 93 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 105 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-07-30 10:31:09 UTC (rev 191767)
+++ PKGBUILD 2013-07-30 10:54:23 UTC (rev 191768)
@@ -4,19 +4,25 @@
pkgname=evas
pkgver=1.7.7
-pkgrel=1
+pkgrel=2
pkgdesc="A hardware-accelerated canvas API for X-Windows"
arch=('i686' 'x86_64')
url="http://www.enlightenment.org"
license=('BSD')
-depends=('eet' 'giflib' 'libpng' 'libjpeg>=7' 'libxrender' 'mesa'
+depends=('eet' 'giflib' 'libpng' 'libjpeg' 'libxrender' 'mesa'
'fribidi' 'fontconfig' 'freetype2' 'harfbuzz' 'evas_generic_loaders')
options=('!libtool' '!emptydirs')
-source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('0b37848127872be7250d1c3bdff622d78cb7f3af')
+source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz
+ evas-1.7.5-giflib5.patch)
+sha1sums=('0b37848127872be7250d1c3bdff622d78cb7f3af'
+ 'ec40d3aff6240dc0e33e648c76393f62b985628a')
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../evas-1.7.5-giflib5.patch
+}
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd $pkgname-$pkgver
export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
@@ -56,7 +62,7 @@
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
# install license files
Added: evas-1.7.5-giflib5.patch
===================================================================
--- evas-1.7.5-giflib5.patch (rev 0)
+++ evas-1.7.5-giflib5.patch 2013-07-30 10:54:23 UTC (rev 191768)
@@ -0,0 +1,93 @@
+diff --git a/src/modules/loaders/gif/evas_image_load_gif.c b/src/modules/loaders/gif/evas_image_load_gif.c
+index 18a6e23..e8cc562 100644
+--- a/src/modules/loaders/gif/evas_image_load_gif.c
++++ b/src/modules/loaders/gif/evas_image_load_gif.c
+@@ -684,7 +684,9 @@ evas_image_load_file_head_gif(Image_Entry *ie, const char *file, const char *key
+ int h;
+ int alpha;
+ int loop_count = -1;
+-
++#if GIFLIB_MAJOR >= 5
++ int err;
++#endif
+ w = 0;
+ h = 0;
+ alpha = -1;
+@@ -700,7 +702,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, &err);
++#else
+ gif = DGifOpenFileHandle(fd);
++#endif
+ if (!gif)
+ {
+ if (fd) close(fd);
+@@ -826,6 +832,9 @@ evas_image_load_specific_frame(Image_Entry *ie, const char *file, int frame_inde
+ GifFileType *gif;
+ Image_Entry_Frame *frame = NULL;
+ Gif_Frame *gif_frame = NULL;
++#if GIFLIB_MAJOR >= 5
++ int err;
++#endif
+
+ #ifndef __EMX__
+ fd = open(file, O_RDONLY);
+@@ -838,7 +847,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, &err);
++#else
+ gif = DGifOpenFileHandle(fd);
++#endif
+ if (!gif)
+ {
+ if (fd) close(fd);
+@@ -915,6 +928,9 @@ evas_image_load_file_data_gif(Image_Entry *ie, const char *file, const char *key
+ {
+ int fd;
+ GifFileType *gif;
++#if GIFLIB_MAJOR >= 5
++ int err;
++#endif
+
+ #ifndef __EMX__
+ fd = open(file, O_RDONLY);
+@@ -927,7 +943,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, &err);
++#else
+ gif = DGifOpenFileHandle(fd);
++#endif
+ if (!gif)
+ {
+ if (fd) close(fd);
+@@ -984,6 +1004,9 @@ evas_image_load_frame_duration_gif(Image_Entry *ie, const char *file, const int
+ int remain_frames = frame_num;
+ double duration = 0;
+ int frame_count = 0;
++#if GIFLIB_MAJOR >= 5
++ int err;
++#endif
+
+ frame_count = ie->frame_count;
+
+@@ -1000,7 +1023,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, &err);
++#else
+ gif = DGifOpenFileHandle(fd);
++#endif
+ if (!gif)
+ {
+ if (fd) close(fd);
More information about the arch-commits
mailing list