[arch-commits] Commit in imlib2/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Ronald van Haren]

    Date: Thursday, November 27, 2008 @ 17:52:27
  Author: ronald
Revision: 19590

Merged revisions 19589 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/imlib2/trunk

........
  r19589 | ronald | 2008-11-27 23:51:51 +0100 (Thu, 27 Nov 2008) | 1 line
  
  upgpkg: imlib2 1.4.2-1
........

Modified:
  imlib2/repos/extra-x86_64/	(properties)
  imlib2/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   45 +++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 22 deletions(-)


Property changes on: imlib2/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /imlib2/trunk:1-19581
   + /imlib2/trunk:1-19589

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-27 22:51:51 UTC (rev 19589)
+++ extra-x86_64/PKGBUILD	2008-11-27 22:52:27 UTC (rev 19590)
@@ -1,38 +1,39 @@
 # $Id$
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: arjan <arjan.archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+# Contributor: Arjan Timmerman <arjan.archlinux.org>
+# Contributor: Tom Newsom <Jeepster.gmx.co.uk>
 
 pkgname=imlib2
-pkgver=1.4.1
-pkgrel=2
-pkgdesc="Imlib2 is the successor to Imlib. It is NOT a newer version -- Imlib 2 can be installed alongside Imlib 1.x"
-arch=(i686 x86_64)
-url="http://sourceforge.net/projects/enlightenment"
+pkgver=1.4.2
+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' 'libungif' 'bzip2' 'freetype2' 'libxext' 'libpng' 'libid3tag')
+depends=('libtiff' 'libungif' 'bzip2' 'freetype2' 'libxext' 'libpng' 'libid3tag' 'libjpeg')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/enlightenment/$pkgname-$pkgver.tar.gz \
-	bufferoverflow.patch)
-md5sums=('16a3d885e523303be794282c0ed90841'
-         '76def1fe0ac2ac1686ff24d29979606f')
+source=("http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2" \
+        'bufferoverflow.patch')
+md5sums=('9f15568e76ebda9092c571e0df261f54' '76def1fe0ac2ac1686ff24d29979606f')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
 
-  # Enable x86 MMX optimizations for i686 (32-bit assembler code not compatible with x86_64)
-  [ "${CARCH}" = "i686" ] && EXTRAOPTS="--disable-mmx"
-  # Disable AMD64 optimizations due to bug in assembler code
-  [ "${CARCH}" = "x86_64" ] && EXTRAOPTS="--disable-amd64"
+  # imlib2 has different configure options for x86/amd64 mmx
+  [ $CARCH = "i686" ] && EXTRAOPTS="--disable-amd64 --enable-mmx"
+  [ $CARCH = "x86_64" ] && EXTRAOPTS="--enable-amd64 --disable-mmx"
 
-  # Security fix (buffer overflow), Debian bug #505714
+
+  # Security Fix (Buffer Overflow), upstream fix
   patch -Np0 -i $srcdir/bufferoverflow.patch || return 1
 
-  # build & install
-  ./configure --prefix=/usr --sysconfdir=/etc/imlib2 --x-libraries=/usr/lib $EXTRAOPTS
+  # Configure and Build
+  ./configure --prefix=/usr \
+              --sysconfdir=/etc/imlib2 \
+              --x-libraries=/usr/lib $EXTRAOPTS || return 1
   make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
+  make DESTDIR=$pkgdir install || return 1
 
-  # install BSD license
-  install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  # Install License
+  install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
 }