[arch-commits] Commit in imlib2/repos (6 files)
Jan de Groot
jgc at nymeria.archlinux.org
Tue May 27 10:01:17 UTC 2014
Date: Tuesday, May 27, 2014 @ 12:01:17
Author: jgc
Revision: 213649
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
imlib2/repos/staging-i686/
imlib2/repos/staging-i686/PKGBUILD
(from rev 213648, imlib2/trunk/PKGBUILD)
imlib2/repos/staging-i686/imlib2-giflib51.patch
(from rev 213648, imlib2/trunk/imlib2-giflib51.patch)
imlib2/repos/staging-x86_64/
imlib2/repos/staging-x86_64/PKGBUILD
(from rev 213648, imlib2/trunk/PKGBUILD)
imlib2/repos/staging-x86_64/imlib2-giflib51.patch
(from rev 213648, imlib2/trunk/imlib2-giflib51.patch)
--------------------------------------+
staging-i686/PKGBUILD | 42 +++++++++++++++++++++
staging-i686/imlib2-giflib51.patch | 64 +++++++++++++++++++++++++++++++++
staging-x86_64/PKGBUILD | 42 +++++++++++++++++++++
staging-x86_64/imlib2-giflib51.patch | 64 +++++++++++++++++++++++++++++++++
4 files changed, 212 insertions(+)
Copied: imlib2/repos/staging-i686/PKGBUILD (from rev 213648, imlib2/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2014-05-27 10:01:17 UTC (rev 213649)
@@ -0,0 +1,42 @@
+# $Id$
+# 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=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-giflib51.patch)
+sha1sums=('20e111d822074593e8d657ecf8aafe504e9e2967'
+ '3ee249142b4caecc4a38ac29a999708447f250c1')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../imlib2-giflib51.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+
+ [ $CARCH = "i686" ] && EXTRAOPTS="--enable-mmx"
+ [ $CARCH = "x86_64" ] && EXTRAOPTS="--enable-amd64"
+
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc/imlib2 \
+ --x-libraries=/usr/lib $EXTRAOPTS
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ # Install License
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
Copied: imlib2/repos/staging-i686/imlib2-giflib51.patch (from rev 213648, imlib2/trunk/imlib2-giflib51.patch)
===================================================================
--- staging-i686/imlib2-giflib51.patch (rev 0)
+++ staging-i686/imlib2-giflib51.patch 2014-05-27 10:01:17 UTC (rev 213649)
@@ -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]);
Copied: imlib2/repos/staging-x86_64/PKGBUILD (from rev 213648, imlib2/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2014-05-27 10:01:17 UTC (rev 213649)
@@ -0,0 +1,42 @@
+# $Id$
+# 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=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-giflib51.patch)
+sha1sums=('20e111d822074593e8d657ecf8aafe504e9e2967'
+ '3ee249142b4caecc4a38ac29a999708447f250c1')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../imlib2-giflib51.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+
+ [ $CARCH = "i686" ] && EXTRAOPTS="--enable-mmx"
+ [ $CARCH = "x86_64" ] && EXTRAOPTS="--enable-amd64"
+
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc/imlib2 \
+ --x-libraries=/usr/lib $EXTRAOPTS
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ # Install License
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
Copied: imlib2/repos/staging-x86_64/imlib2-giflib51.patch (from rev 213648, imlib2/trunk/imlib2-giflib51.patch)
===================================================================
--- staging-x86_64/imlib2-giflib51.patch (rev 0)
+++ staging-x86_64/imlib2-giflib51.patch 2014-05-27 10:01:17 UTC (rev 213649)
@@ -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]);
More information about the arch-commits
mailing list