diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-06-17 03:27:11 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-06-17 03:27:11 +0000 |
| commit | 6459b84bf754eda5323f40eb7af76dde65b63251 (patch) | |
| tree | 81947a270848520d4cf2f9d1c5ce91ced54fcdff /extra/imlib2 | |
| parent | 942111e62628e9a5c4729563215b1cfb8911735e (diff) | |
Tue Jun 17 03:23:47 UTC 2014
Diffstat (limited to 'extra/imlib2')
| -rw-r--r-- | extra/imlib2/PKGBUILD | 10 | ||||
| -rw-r--r-- | extra/imlib2/imlib2-giflib5.patch | 14 | ||||
| -rw-r--r-- | extra/imlib2/imlib2-giflib51.patch | 64 |
3 files changed, 69 insertions, 19 deletions
diff --git a/extra/imlib2/PKGBUILD b/extra/imlib2/PKGBUILD index 635ace90e..3c7d08d5f 100644 --- a/extra/imlib2/PKGBUILD +++ b/extra/imlib2/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 204813 2014-01-27 19:49:53Z ronald $ +# $Id: PKGBUILD 215162 2014-06-14 19:17:11Z andyrtr $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Arjan Timmerman <arjan.archlinux.org> # Contributor: Tom Newsom <Jeepster.gmx.co.uk> pkgname=imlib2 pkgver=1.4.6 -pkgrel=1 +pkgrel=2 pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support" url="http://sourceforge.net/projects/enlightenment/" arch=('i686' 'x86_64') license=('BSD') depends=('libtiff' 'giflib' 'bzip2' 'freetype2' 'libxext' 'libpng' 'libid3tag' 'libjpeg-turbo') source=(http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2 - imlib2-giflib5.patch) + imlib2-giflib51.patch) sha1sums=('20e111d822074593e8d657ecf8aafe504e9e2967' - '29d0778ffbe6e57f08048918a79eb1ad6af87bce') + '3ee249142b4caecc4a38ac29a999708447f250c1') prepare() { cd $pkgname-$pkgver - patch -Np0 -i ../imlib2-giflib5.patch + patch -Np1 -i ../imlib2-giflib51.patch } build() { diff --git a/extra/imlib2/imlib2-giflib5.patch b/extra/imlib2/imlib2-giflib5.patch deleted file mode 100644 index 966c6e4a7..000000000 --- a/extra/imlib2/imlib2-giflib5.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- src/modules/loaders/loader_gif.c.orig -+++ src/modules/loaders/loader_gif.c -@@ -40,7 +40,11 @@ load(ImlibImage * im, ImlibProgressFunct - #endif - if (fd < 0) - return 0; -+#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR >= 5) -+ gif = DGifOpenFileHandle(fd, NULL); -+#else - gif = DGifOpenFileHandle(fd); -+#endif - if (!gif) - { - close(fd); diff --git a/extra/imlib2/imlib2-giflib51.patch b/extra/imlib2/imlib2-giflib51.patch new file mode 100644 index 000000000..1bd8627d3 --- /dev/null +++ b/extra/imlib2/imlib2-giflib51.patch @@ -0,0 +1,64 @@ +diff -ruN imlib2-1.4.6.orig/src/modules/loaders/loader_gif.c imlib2-1.4.6/src/modules/loaders/loader_gif.c +--- imlib2-1.4.6.orig/src/modules/loaders/loader_gif.c 2013-12-21 10:16:10.000000000 +0000 ++++ imlib2-1.4.6/src/modules/loaders/loader_gif.c 2014-05-27 09:52:35.857291512 +0000 +@@ -36,7 +36,7 @@ + #endif + if (fd < 0) + return 0; +- gif = DGifOpenFileHandle(fd); ++ gif = DGifOpenFileHandle(fd, NULL); + if (!gif) + { + close(fd); +@@ -60,13 +60,13 @@ + h = gif->Image.Height; + if (!IMAGE_DIMENSIONS_OK(w, h)) + { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + return 0; + } + rows = malloc(h * sizeof(GifRowType *)); + if (!rows) + { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + return 0; + } + for (i = 0; i < h; i++) +@@ -78,7 +78,7 @@ + rows[i] = malloc(w * sizeof(GifPixelType)); + if (!rows[i]) + { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + for (i = 0; i < h; i++) + { + if (rows[i]) +@@ -150,7 +150,7 @@ + im->data = (DATA32 *) malloc(sizeof(DATA32) * w * h); + if (!im->data) + { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + free(rows); + return 0; + } +@@ -181,7 +181,7 @@ + last_per = (int)per; + if (!(progress(im, (int)per, 0, last_y, w, i))) + { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + for (i = 0; i < h; i++) + { + free(rows[i]); +@@ -198,7 +198,7 @@ + { + progress(im, 100, 0, last_y, w, h); + } +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + for (i = 0; i < h; i++) + { + free(rows[i]); |