[arch-commits] Commit in imlib2/repos (6 files)
Ronald van Haren
ronald at archlinux.org
Mon Apr 13 07:56:34 UTC 2015
Date: Monday, April 13, 2015 @ 09:56:34
Author: ronald
Revision: 236346
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
imlib2/repos/extra-i686/PKGBUILD
(from rev 236345, imlib2/trunk/PKGBUILD)
imlib2/repos/extra-x86_64/PKGBUILD
(from rev 236345, imlib2/trunk/PKGBUILD)
Deleted:
imlib2/repos/extra-i686/PKGBUILD
imlib2/repos/extra-i686/imlib2-giflib51.patch
imlib2/repos/extra-x86_64/PKGBUILD
imlib2/repos/extra-x86_64/imlib2-giflib51.patch
------------------------------------+
/PKGBUILD | 80 +++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 43 ------------------
extra-i686/imlib2-giflib51.patch | 64 ----------------------------
extra-x86_64/PKGBUILD | 43 ------------------
extra-x86_64/imlib2-giflib51.patch | 64 ----------------------------
5 files changed, 80 insertions(+), 214 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-04-13 07:56:23 UTC (rev 236345)
+++ extra-i686/PKGBUILD 2015-04-13 07:56:34 UTC (rev 236346)
@@ -1,43 +0,0 @@
-# $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=3
-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
- sed -i 's/@my_libs@//' imlib2-config.in
-}
-
-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/extra-i686/PKGBUILD (from rev 236345, imlib2/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-04-13 07:56:34 UTC (rev 236346)
@@ -0,0 +1,40 @@
+# $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.7
+pkgrel=1
+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)
+sha1sums=('0ed225afbbee8e990c655cf13ed802bda8a5cd8a')
+
+prepare() {
+ cd "${pkgname}-${pkgver}"
+ sed -i 's/@my_libs@//' imlib2-config.in
+}
+
+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"
+}
Deleted: extra-i686/imlib2-giflib51.patch
===================================================================
--- extra-i686/imlib2-giflib51.patch 2015-04-13 07:56:23 UTC (rev 236345)
+++ extra-i686/imlib2-giflib51.patch 2015-04-13 07:56:34 UTC (rev 236346)
@@ -1,64 +0,0 @@
-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]);
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-04-13 07:56:23 UTC (rev 236345)
+++ extra-x86_64/PKGBUILD 2015-04-13 07:56:34 UTC (rev 236346)
@@ -1,43 +0,0 @@
-# $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=3
-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
- sed -i 's/@my_libs@//' imlib2-config.in
-}
-
-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/extra-x86_64/PKGBUILD (from rev 236345, imlib2/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-04-13 07:56:34 UTC (rev 236346)
@@ -0,0 +1,40 @@
+# $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.7
+pkgrel=1
+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)
+sha1sums=('0ed225afbbee8e990c655cf13ed802bda8a5cd8a')
+
+prepare() {
+ cd "${pkgname}-${pkgver}"
+ sed -i 's/@my_libs@//' imlib2-config.in
+}
+
+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"
+}
Deleted: extra-x86_64/imlib2-giflib51.patch
===================================================================
--- extra-x86_64/imlib2-giflib51.patch 2015-04-13 07:56:23 UTC (rev 236345)
+++ extra-x86_64/imlib2-giflib51.patch 2015-04-13 07:56:34 UTC (rev 236346)
@@ -1,64 +0,0 @@
-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