[arch-commits] Commit in xf86-video-trident/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Jan de Groot]

    Date: Friday, December 26, 2008 @ 09:50:13
  Author: jgc
Revision: 22349

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

........
  r22290 | jgc | 2008-12-25 17:22:13 +0000 (Thu, 25 Dec 2008) | 1 line
  
  upgpkg: xf86-video-trident 1.3.1-1
........

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

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


Property changes on: xf86-video-trident/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /xf86-video-trident/trunk:1-15229
   + /xf86-video-trident/trunk:1-22348
Deleted: svn:mergeinfo
   - 

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-12-26 14:47:10 UTC (rev 22348)
+++ extra-x86_64/PKGBUILD	2008-12-26 14:50:13 UTC (rev 22349)
@@ -2,34 +2,34 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xf86-video-trident
-pkgver=1.3.0
-pkgrel=4
+pkgver=1.3.1
+pkgrel=1
 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.2' 'mesa>=7.2' 'xf86driproto')
-conflicts=('xorg-server<1.5.2')
+makedepends=('pkgconfig' 'xorg-server>=1.5.3' 'mesa>=7.2' 'xf86driproto')
+conflicts=('xorg-server<1.5.3')
 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=('e89799579d0cf3858362bd751469e0bf'
+md5sums=('9f280bef235426394013cb5e1854b823'
          '04d379292e023df0b0266825cb0dbde5'
          '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}
+  cd "${srcdir}/Mesa-${_mesaver}"
   cd ${srcdir}/Mesa-${pkgver}
-  patch -Np1 -i ${srcdir}/mesa-7.1-link-shared.patch || return 1
+  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=trident \
@@ -42,8 +42,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"
 }