[arch-commits] Commit in xf86-video-nouveau/trunk (PKGBUILD)

[Jan de Groot]

    Date: Saturday, July 18, 2009 @ 15:20:26
  Author: jgc
Revision: 46548

upgpkg: xf86-video-nouveau 0.0.10_git20090612-2
    Depend on libdrm 2.4.12

Modified:
  xf86-video-nouveau/trunk/PKGBUILD

----------+
 PKGBUILD |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-07-18 19:15:50 UTC (rev 46547)
+++ PKGBUILD	2009-07-18 19:20:26 UTC (rev 46548)
@@ -5,13 +5,14 @@
 pkgname=xf86-video-nouveau
 _gitdate=20090612
 pkgver=0.0.10_git${_gitdate} # see configure.ac
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source 3D acceleration driver for nVidia cards (eperimental)"
 arch=('i686' 'x86_64')
 url="http://nouveau.freedesktop.org/wiki/"
 license=('GPL') #and MIT, not yet a license file, see http://nouveau.freedesktop.org/wiki/FAQ#head-09f75d03eb30011c754038a3893119a70745de4e
-depends=('nouveau-drm>=20090612') # 'libdrm>=2.4.11' provided now by new nouveau-drm pkg
-makedepends=('pkgconfig' 'xorg-server>=1.6.0' 'mesa>=7.3' 'glproto>=1.4.9' 'xorg-util-macros' 'xf86driproto' 'autoconf')
+depends=('nouveau-drm>=20090612' 'libdrm>=2.4.12')
+makedepends=('pkgconfig' 'xorg-server>=1.6.2' 'mesa>=7.5' 'glproto>=1.4.9' 'xorg-util-macros' 'xf86driproto' 'autoconf')
+conflicts=('xorg-server<1.6.2')
 groups=('xorg-video-drivers')
 options=('!libtool')
 source=(ftp://ftp.archlinux.org/other/$pkgname/xf86-video-nouveau-${_gitdate}.tar.bz2)
@@ -29,7 +30,7 @@
   # insert the nouveau kernel drm replacement first: modprobe -v drm should show something like 
   # insmod /lib/modules/2.6.28-ARCH/extra/drm.ko
   cd ${srcdir}/xf86-video-nouveau-${_gitdate}
-  ./autogen.sh --prefix=/usr --with-kms=yes
+  ./autogen.sh --prefix=/usr --with-kms=yes || return 1
   make || return 1
   make DESTDIR=${pkgdir} install || return 1
 }