[arch-commits] Commit in imlib2/trunk (PKGBUILD imlib2-giflib5.patch)

[Jan de Groot]

    Date: Tuesday, July 30, 2013 @ 13:05:39
  Author: jgc
Revision: 191770

giflib rebuild
re-enable mmx and amd64 optimisations. The reason to disable it were alignment issues in 1.4.2, which has been fixed upstream long time ago
upgpkg: imlib2 1.4.5-5

Added:
  imlib2/trunk/imlib2-giflib5.patch
Modified:
  imlib2/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   23 ++++++++++++++---------
 imlib2-giflib5.patch |   14 ++++++++++++++
 2 files changed, 28 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-30 10:54:28 UTC (rev 191769)
+++ PKGBUILD	2013-07-30 11:05:39 UTC (rev 191770)
@@ -5,24 +5,29 @@
 
 pkgname=imlib2
 pkgver=1.4.5
-pkgrel=4
+pkgrel=5
 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')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2")
-sha1sums=('af86a2c38f4bc3806db57e64e74dc9814ad474a0')
+source=(http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2
+        imlib2-giflib5.patch)
+sha1sums=('af86a2c38f4bc3806db57e64e74dc9814ad474a0'
+          '29d0778ffbe6e57f08048918a79eb1ad6af87bce')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np0 -i ../imlib2-giflib5.patch
+}
+
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
-  # disable optimizations, they cause problems (e.g. FS#12268)
-  [ $CARCH = "i686" ] && EXTRAOPTS="--disable-mmx"
-  [ $CARCH = "x86_64" ] && EXTRAOPTS="--disable-amd64"
+  [ $CARCH = "i686" ] && EXTRAOPTS="--enable-mmx"
+  [ $CARCH = "x86_64" ] && EXTRAOPTS="--enable-amd64"
 
-  # Configure and Build
   ./configure --prefix=/usr \
               --sysconfdir=/etc/imlib2 \
               --x-libraries=/usr/lib $EXTRAOPTS
@@ -30,7 +35,7 @@
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 
   # Install License

Added: imlib2-giflib5.patch
===================================================================
--- imlib2-giflib5.patch	                        (rev 0)
+++ imlib2-giflib5.patch	2013-07-30 11:05:39 UTC (rev 191770)
@@ -0,0 +1,14 @@
+--- 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);