[arch-commits] Commit in xf86-video-ati/repos (testing-i686 testing-i686/PKGBUILD)

[Jan de Groot]

    Date: Monday, September 15, 2008 @ 12:57:22
  Author: jgc
Revision: 12595

Merged revisions 12532 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/xf86-video-ati/trunk

........
  r12532 | jgc | 2008-09-15 08:59:26 +0200 (Mon, 15 Sep 2008) | 2 lines
  
  upgpkg: xf86-video-ati 6.9.0-3
      Run autotools, the patch changes .am files
........

Modified:
  xf86-video-ati/repos/testing-i686/	(properties)
  xf86-video-ati/repos/testing-i686/PKGBUILD

----------+
 PKGBUILD |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)


Property changes on: xf86-video-ati/repos/testing-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /xf86-video-ati/trunk:1-12498
   + /xf86-video-ati/trunk:1-12594

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2008-09-15 16:43:57 UTC (rev 12594)
+++ testing-i686/PKGBUILD	2008-09-15 16:57:22 UTC (rev 12595)
@@ -3,15 +3,15 @@
 # Contributor: Alexander Baldeck <alexander at archlinux.org>
 pkgname=xf86-video-ati
 pkgver=6.9.0
-pkgrel=2
+pkgrel=3
 _mesaver="7.1"
 pkgdesc="X.org ati video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
-depends=('libdrm>=2.3.1' 'libgl>=7.1-2')
-makedepends=('pkgconfig' 'xorg-server>=1.4.99.906' 'imake' 'mesa>=7.1'
-	     'glproto>=1.4.9' 'xf86driproto' 'diffutils')
-conflicts=('xorg-server<1.4.99.906')
+depends=('libdrm>=2.3.1' 'libgl>=7.1-2' 'libpciaccess')
+makedepends=('pkgconfig' 'xorg-server>=1.5.0' "mesa>=${_mesaver}"
+	     'glproto>=1.4.9' 'xf86driproto' 'diffutils' 'dri2proto')
+conflicts=('xorg-server<1.5.0')
 groups=('xorg-video-drivers')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
@@ -26,6 +26,10 @@
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/git-20080827.patch" || return 1
+  libtoolize --force --copy || return 1
+  aclocal || return 1
+  autoconf || return 1
+  automake || return 1
   ./configure --prefix=/usr \
               --enable-dri || return 1
   make || return 1
@@ -33,7 +37,6 @@
 
   cd "${srcdir}/Mesa-${_mesaver}"
   patch -Np1 -i "${srcdir}/mesa-7.1-link-shared.patch" || return 1
-  export CFLAGS="${CFLAGS} -ffast-math"
   ./configure --prefix=/usr \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
     --with-dri-drivers=radeon,r200,r300 \