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

[Allan McRae]

    Date: Saturday, October 18, 2008 @ 22:38:37
  Author: allan
Revision: 15790

Fix SVN conflict

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

----------+
 PKGBUILD |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)


Property changes on: sdl/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /sdl/trunk:1
   + /sdl/trunk:1-15787

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-10-19 02:37:33 UTC (rev 15789)
+++ extra-x86_64/PKGBUILD	2008-10-19 02:38:37 UTC (rev 15790)
@@ -1,21 +1,24 @@
 # $Id$
-# Maintainer: dorphell <dorphell at archlinux.org>
+# Maintainer: Allan McRae <allan at archlinux.org>
+# Contributor: dorphell <dorphell at archlinux.org>
+
 pkgname=sdl
 pkgver=1.2.13
-pkgrel=1
+pkgrel=2
 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
+url="http://www.libsdl.org"
 license=('LGPL')
 depends=('glibc' 'libxext' 'libxrender' 'libx11')
+makedepends=('alsa-lib' 'esd' 'mesa')
 options=('!libtool')
-makedepends=('alsa-lib' 'esd' 'mesa')
 source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz)
-url="http://www.libsdl.org"
 md5sums=('c6660feea2a6834de10bc71b2f8e4d88')
 
 build() {
-  cd ${startdir}/src/SDL-${pkgver}
-  ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd --with-x
+  cd ${srcdir}/SDL-${pkgver}
+  ./configure --prefix=/usr --disable-nasm --enable-alsa \
+              --enable-esd --with-x --disable-rpath
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR=${pkgdir} install
 }