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

[andyrtr at archlinux.org]

    Date: Saturday, October 6, 2012 @ 03:04:48
  Author: andyrtr
Revision: 168115

upgpkg: xf86-video-ati 1:6.14.6-2

rebuild for new Xorg-server; depend on the server ABI; fix makedeps; apply a hack now that XAA has been dropped in Xorg-server 1.13

Modified:
  xf86-video-ati/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-10-06 05:43:44 UTC (rev 168114)
+++ PKGBUILD	2012-10-06 07:04:48 UTC (rev 168115)
@@ -5,14 +5,14 @@
 pkgname=xf86-video-ati
 pkgver=6.14.6
 epoch=1
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org ati video driver"
 arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libdrm>=2.4.37' 'systemd-tools' 'ati-dri')
-makedepends=('xorg-server-devel>=1.11.99.902' 'xf86driproto' 'mesa')
-conflicts=('xorg-server<1.11.99.902')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
@@ -20,7 +20,12 @@
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr #--enable-dri --help
+  
+  # fix build now that XAA isn't available in new Xorg - http://bugs.gentoo.org/show_bug.cgi?id=428094
+  sed -i '/USE_XAA, 1/d' configure.ac
+  autoreconf -vfi
+  
+  ./configure --prefix=/usr
   make
 }