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

[Jan de Groot]

    Date: Thursday, September 25, 2008 @ 14:54:26
  Author: jgc
Revision: 13016

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

........
  r13015 | jgc | 2008-09-25 20:54:09 +0200 (Thu, 25 Sep 2008) | 1 line
  
  upgpkg: xf86-video-mach64 6.8.0-2
........

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

----------+
 PKGBUILD |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)


Property changes on: xf86-video-mach64/repos/testing-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /xf86-video-mach64/trunk:1-11437
   + /xf86-video-mach64/trunk:1-13015

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2008-09-25 18:54:09 UTC (rev 13015)
+++ testing-i686/PKGBUILD	2008-09-25 18:54:26 UTC (rev 13016)
@@ -2,20 +2,23 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=xf86-video-mach64
 pkgver=6.8.0
-pkgrel=1
-_mesaver="7.1"
+pkgrel=2
+_mesaver="7.2"
 pkgdesc="X.org mach64 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'
+depends=('libdrm>=2.3.1' 'libgl>=7.2')
+makedepends=('pkgconfig' 'xorg-server>=1.5.1' 'mesa>=7.2' 'dri2proto'
 	     'glproto>=1.4.9' 'xf86driproto' 'diffutils')
-conflicts=('xorg-server<1.4.99.906')
+conflicts=('xorg-server<1.5.1')
 groups=('xorg-video-drivers')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
        http://downloads.sourceforge.net/sourceforge/mesa3d/MesaLib-${_mesaver}.tar.bz2
        mesa-7.1-link-shared.patch)
+md5sums=('6081b8fa50c689d51f85c2fbaf93867e'
+         '04d379292e023df0b0266825cb0dbde5'
+         'f0baa948d9810f268413111ee439d24b')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
@@ -26,7 +29,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=mach64 \