diff options
Diffstat (limited to 'extra/evas')
| -rw-r--r-- | extra/evas/PKGBUILD | 18 | ||||
| -rw-r--r-- | extra/evas/evas-1.7.5-giflib5.patch | 93 |
2 files changed, 7 insertions, 104 deletions
diff --git a/extra/evas/PKGBUILD b/extra/evas/PKGBUILD index 0857c4a48..eba82f694 100644 --- a/extra/evas/PKGBUILD +++ b/extra/evas/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 191915 2013-08-01 06:59:44Z bpiotrowski $ +# $Id: PKGBUILD 193657 2013-08-26 20:14:26Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=evas -pkgver=1.7.7 -pkgrel=2 +pkgver=1.7.8 +pkgrel=1 pkgdesc="A hardware-accelerated canvas API for X-Windows" arch=('i686' 'x86_64') url="http://www.enlightenment.org" @@ -12,15 +12,9 @@ license=('BSD') 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 - evas-1.7.5-giflib5.patch) -sha1sums=('0b37848127872be7250d1c3bdff622d78cb7f3af' - 'ec40d3aff6240dc0e33e648c76393f62b985628a') +source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) +sha1sums=('ce71de058896e80c8f1822d967a6dcee01a1c9ac') -prepare() { - cd $pkgname-$pkgver - patch -Np1 -i ../evas-1.7.5-giflib5.patch -} build() { cd $pkgname-$pkgver @@ -69,3 +63,5 @@ package() { install -Dm644 "$srcdir/$pkgname-$pkgver/COPYING" \ "$pkgdir/usr/share/licenses/$pkgname/COPYING" } + + diff --git a/extra/evas/evas-1.7.5-giflib5.patch b/extra/evas/evas-1.7.5-giflib5.patch deleted file mode 100644 index 48d1834c5..000000000 --- a/extra/evas/evas-1.7.5-giflib5.patch +++ /dev/null @@ -1,93 +0,0 @@ -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); |