[arch-commits] CVS update of extra/x11-drivers/xf86-video-trident (PKGBUILD)

[Jan de Groot]

    Date: Sunday, March 16, 2008 @ 18:21:22
  Author: jgc
    Path: /home/cvs-extra/extra/x11-drivers/xf86-video-trident

Modified: PKGBUILD (1.14 -> 1.15)

upgpkg: xf86-video-trident 1.2.3-6


----------+
 PKGBUILD |   31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)


Index: extra/x11-drivers/xf86-video-trident/PKGBUILD
diff -u extra/x11-drivers/xf86-video-trident/PKGBUILD:1.14 extra/x11-drivers/xf86-video-trident/PKGBUILD:1.15
--- extra/x11-drivers/xf86-video-trident/PKGBUILD:1.14	Sat Sep 22 14:04:32 2007
+++ extra/x11-drivers/xf86-video-trident/PKGBUILD	Sun Mar 16 18:21:22 2008
@@ -1,29 +1,32 @@
-# $Id: PKGBUILD,v 1.14 2007/09/22 18:04:32 alexander Exp $
+# $Id: PKGBUILD,v 1.15 2008/03/16 22:21:22 jgc Exp $
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xf86-video-trident
 pkgver=1.2.3
-pkgrel=5
+pkgrel=6
 pkgdesc="X.org Trident video driver"
-mesaver="7.0"
+_mesaver="7.0.3-rc2"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 depends=('libdrm>=2.3.0' 'expat>=2.0')
-makedepends=('pkgconfig' 'xorg-server>=1.3.0.0-3' 'imake' 'mesa>=7.0' 'xf86driproto')
+makedepends=('pkgconfig' 'xorg-server>=1.4.0.90' 'imake' 'mesa>=7.0.3rc2' 'xf86driproto')
 groups=('xorg-video-drivers')
 options=(!libtool)
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-	http://dl.sourceforge.net/mesa3d/MesaLib-${mesaver}.tar.bz2)
+	http://www.mesa3d.org/beta/MesaLib-${_mesaver}.tar.gz)
+md5sums=('c0e8b2f54942b6902b7dd4f30defe800'
+         '141f5c1c89b090d0f0bd92522ebb8de9')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
   ./configure --prefix=/usr \
-              --enable-dri \
-              --build=${CHOST} --host=${CHOST}
+              --enable-dri || return 1
   make || return 1
   make DESTDIR=${startdir}/pkg install || return 1
 
-  cd ${startdir}/src/Mesa-${mesaver}/configs
+  cd ${startdir}/src/Mesa-${_mesaver}
+  cd configs
+
   CONFIG="linux-dri-x86"
   [ "$CARCH" = "x86_64" ] && CONFIG="linux-dri-x86-64"
   echo "EXTRA_LIB_PATH =" >> ${CONFIG}
@@ -34,17 +37,13 @@
   echo "MKDEP = makedepend" >> ${CONFIG}
   echo "DRI_DIRS = trident" >> ${CONFIG}
   echo "DRI_DRIVER_SEARCH_DIR = /usr/lib/xorg/modules/dri" >> ${CONFIG}
+  echo "DRI_DRIVER_INSTALL_DIR = /usr/lib/xorg/modules/dri" >> ${CONFIG}
   echo "ARCH_FLAGS += -DGLX_USE_TLS" >> ${CONFIG}
   echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> ${CONFIG}
 
   ln -s ${CONFIG} current
-  cd ${startdir}/src/Mesa-${mesaver}/src/mesa
-  make libmesa.a || return 1
+  cd ${startdir}/src/Mesa-${_mesaver}/src/mesa
+  make linux-solo || return 1
   cd drivers/dri
-
-  mkdir -p ${startdir}/pkg/usr/lib/xorg/modules/dri
-  make || return 1
-  install -m 755 */*_dri.so ${startdir}/pkg/usr/lib/xorg/modules/dri/
+  make DESTDIR=${startdir}/pkg install || return 1
 }
-md5sums=('c0e8b2f54942b6902b7dd4f30defe800'
-         '50c371455fa7532c04aa0a970f9bc51f')