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

[Jan de Groot]

    Date: Friday, December 26, 2008 @ 14:23:12
  Author: jgc
Revision: 22415

upgpkg: xf86-video-ati 6.9.0-6

Modified:
  xf86-video-ati/trunk/PKGBUILD

----------+
 PKGBUILD |   32 ++++----------------------------
 1 file changed, 4 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-12-26 19:20:33 UTC (rev 22414)
+++ PKGBUILD	2008-12-26 19:23:12 UTC (rev 22415)
@@ -3,24 +3,19 @@
 # Contributor: Alexander Baldeck <alexander at archlinux.org>
 pkgname=xf86-video-ati
 pkgver=6.9.0
-pkgrel=5
-_mesaver="7.2"
+pkgrel=6
 pkgdesc="X.org ati video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
-depends=('libdrm>=2.3.1' 'libgl>=7.2' 'libpciaccess')
-makedepends=('pkgconfig' 'xorg-server>=1.5.0' "mesa>=${_mesaver}" 'fontsproto'
-	     'glproto>=1.4.9' 'xf86driproto' 'diffutils' 'dri2proto' 'xorg-util-macros')
+depends=('libdrm>=2.3.1' 'libgl>=7.2' 'libpciaccess' 'ati-dri>=7.2')
+makedepends=('pkgconfig' 'xorg-server>=1.5.0' 'fontsproto'
+	     'glproto>=1.4.9' 'xf86driproto' 'diffutils' 'xorg-util-macros')
 conflicts=('xorg-server<1.5.0')
 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
        git-20081021.patch)
 md5sums=('afa4873f58ae6fa31fedeb9ed31531db'
-         '04d379292e023df0b0266825cb0dbde5'
-         'f0baa948d9810f268413111ee439d24b'
 	 'f2ce4e7fb4e266bbc61fb2d9c7c20a3b')
 
 build() {
@@ -34,23 +29,4 @@
               --enable-dri || return 1
   make || return 1
   make "DESTDIR=${pkgdir}" install || return 1
-
-  cd "${srcdir}/Mesa-${_mesaver}"
-  patch -Np1 -i "${srcdir}/mesa-7.1-link-shared.patch" || return 1
-  ./configure --prefix=/usr \
-    --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-    --with-dri-drivers=radeon,r200,r300 \
-    --enable-glx-tls \
-    --disable-ttm-api \
-    --with-driver=dri \
-    --enable-xcb \
-    --disable-glu \
-    --disable-glut \
-    --disable-glw || return 1
-  make || return 1
-  cd src/mesa/drivers/dri || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  rm -f "${pkgdir}/usr/lib/xorg/modules/dri/libdricore.so"
-  rm -rf "${pkgdir}/usr/include"
-  rm -rf "${pkgdir}/usr/lib/pkgconfig"
 }