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

[Jan de Groot]

    Date: Sunday, March 1, 2009 @ 15:34:00
  Author: jgc
Revision: 28650

upgpkg: xf86-video-savage 2.2.1-3

Modified:
  xf86-video-savage/trunk/PKGBUILD

----------+
 PKGBUILD |   29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-01 20:33:57 UTC (rev 28649)
+++ PKGBUILD	2009-03-01 20:34:00 UTC (rev 28650)
@@ -3,37 +3,36 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xf86-video-savage
 pkgver=2.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org savage video driver"
-_mesaver="7.2"
+_mesaver="7.3"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
-depends=('libgl>=7.2')
-makedepends=('pkgconfig' 'xorg-server>=1.5.1' 'imake' 'mesa>=7.2' 'xf86driproto' 'glproto>=1.4.9')
-conflicts=('xorg-server<1.5.1')
+depends=("libgl>=${_mesaver}")
+makedepends=('pkgconfig' 'xorg-server>=1.6.0' "mesa>=${_mesaver}" 'xf86driproto' 'glproto>=1.4.9' 'dri2proto>=1.99.3')
+conflicts=('xorg-server<1.6.0')
 options=(!libtool)
 groups=('xorg-video-drivers')
 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=('62b8aba48b54eaefeae87df502bf219c'
-         '04d379292e023df0b0266825cb0dbde5'
+         '781e7811a6ed5c97b2b8defefc8ffbc9'
          'f0baa948d9810f268413111ee439d24b')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
               --enable-dri || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+  make DESTDIR="${pkgdir}" install || return 1
 
-  cd ${startdir}/src/Mesa-${_mesaver}
-  patch -Np1 -i ${srcdir}/mesa-7.1-link-shared.patch
+  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=savage \
     --enable-glx-tls \
-    --disable-ttm-api \
     --with-driver=dri \
     --enable-xcb \
     --disable-glu \
@@ -41,8 +40,8 @@
     --disable-glw || return 1
   make || return 1
   cd src/mesa/drivers/dri || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  rm -rf ${pkgdir}/usr/lib/pkgconfig
-  rm -rf ${pkgdir}/usr/include
-  rm -f ${pkgdir}/usr/lib/xorg/modules/dri/libdricore.so
+  make DESTDIR="${pkgdir}" install || return 1
+  rm -rf "${pkgdir}/usr/lib/pkgconfig"
+  rm -rf "${pkgdir}/usr/include"
+  rm -f "${pkgdir}/usr/lib/xorg/modules/dri/libdricore.so"
 }