[arch-commits] Commit in xf86-video-trident/repos (2 files)

[Jan de Groot]

    Date: Sunday, October 12, 2008 @ 14:51:36
  Author: jgc
Revision: 15231

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

........
  r15046 | jgc | 2008-10-12 14:23:25 +0200 (Sun, 12 Oct 2008) | 2 lines
  
  upgpkg: xf86-video-trident 1.3.0-4
      Build with trident dri drivers instead of intel
........

Modified:
  xf86-video-trident/repos/testing-x86_64/	(properties)
  xf86-video-trident/repos/testing-x86_64/PKGBUILD

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


Property changes on: xf86-video-trident/repos/testing-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /xf86-video-trident/trunk:1-14879
   + /xf86-video-trident/trunk:1-15229

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2008-10-12 18:51:34 UTC (rev 15230)
+++ testing-x86_64/PKGBUILD	2008-10-12 18:51:36 UTC (rev 15231)
@@ -3,14 +3,14 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xf86-video-trident
 pkgver=1.3.0
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org Trident video driver"
 _mesaver="7.2"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 depends=('libgl>=7.2')
-makedepends=('pkgconfig' 'xorg-server>=1.5.1' 'mesa>=7.2' 'xf86driproto')
-conflicts=('xorg-server<1.5.1')
+makedepends=('pkgconfig' 'xorg-server>=1.5.2' 'mesa>=7.2' 'xf86driproto')
+conflicts=('xorg-server<1.5.2')
 groups=('xorg-video-drivers')
 options=(!libtool)
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
@@ -30,10 +30,9 @@
   cd ${startdir}/src/Mesa-${_mesaver}
   cd ${srcdir}/Mesa-${pkgver}
   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=i810,i915,i965 \
+    --with-dri-drivers=trident \
     --enable-glx-tls \
     --disable-ttm-api \
     --with-driver=dri \