[arch-commits] Commit in cegui/repos (extra-i686 extra-i686/PKGBUILD)

[Eric Bélanger]

    Date: Sunday, December 7, 2008 @ 21:15:37
  Author: eric
Revision: 20938

Merged revisions 356,20937 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/cegui/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r20937 | eric | 2008-12-07 21:15:17 -0500 (Sun, 07 Dec 2008) | 1 line
  
  updated options syntax
........

Modified:
  cegui/repos/extra-i686/	(properties)
  cegui/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)


Property changes on: cegui/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /cegui/trunk:1
   + /cegui/trunk:1-20937

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-12-08 02:15:17 UTC (rev 20937)
+++ extra-i686/PKGBUILD	2008-12-08 02:15:37 UTC (rev 20938)
@@ -1,3 +1,4 @@
+# $Id$
 # Maintainer: Juergen Hoetzel <juergen at archlinux.org> 
 # Contributors: William Rea <sillywilly at gmail.com>, 
 # Bjorn Lindeijer <bjorn at lindeijer.nl>
@@ -8,16 +9,22 @@
 pkgdesc="A free library providing windowing and widgets for graphics APIs/engines"
 arch=(i686 x86_64)
 url="http://crayzedsgui.sourceforge.net"
-options=('nolibtool')
-license="MIT"
+options=('!libtool')
+license=("MIT")
 depends=('pcre' 'expat' 'freetype2' 'libxml2' 'devil' 'freeglut')
-source=(http://dl.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz)
+[ "$CARCH" = "x86_64" ] && depends=(${depends[@]} 'silly')
+source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz)
 md5sums=('b42322a33c6a06eede76b15f75694a17')
 
 build() {
     cd $startdir/src/CEGUI-0.5.0
-    ./configure --prefix=/usr --sysconfdir=/etc --enable-devil --disable-silly \
-                --disable-xerces-c
+    if [ "$CARCH" = "x86_64" ]; then
+      ./configure --prefix=/usr --sysconfdir=/etc --enable-devil --enable-silly \
+        --disable-xerces-c --with-default-image-codec=SILLYImageCodec
+    else
+      ./configure --prefix=/usr --sysconfdir=/etc --enable-devil --disable-silly \
+        --disable-xerces-c
+    fi
     make || return 1
     make DESTDIR=$startdir/pkg install