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

[Jan de Groot]

    Date: Saturday, January 26, 2008 @ 05:35:46
  Author: jgc
    Path: /home/cvs-extra/extra/x11-drivers/xf86-video-intel

Modified: PKGBUILD (1.10 -> 1.11)

upgpkg: xf86-video-intel 2.2.0-2
Update to mesa 7.0.3-rc1. Simplify PKGBUILD


----------+
 PKGBUILD |   28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)


Index: extra/x11-drivers/xf86-video-intel/PKGBUILD
diff -u extra/x11-drivers/xf86-video-intel/PKGBUILD:1.10 extra/x11-drivers/xf86-video-intel/PKGBUILD:1.11
--- extra/x11-drivers/xf86-video-intel/PKGBUILD:1.10	Wed Dec 19 02:35:00 2007
+++ extra/x11-drivers/xf86-video-intel/PKGBUILD	Sat Jan 26 05:35:46 2008
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD,v 1.10 2007/12/19 07:35:00 alexander Exp $
+# $Id: PKGBUILD,v 1.11 2008/01/26 10:35:46 jgc Exp $
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 pkgname=xf86-video-intel
 pkgver=2.2.0
-pkgrel=1
-_mesaver=7.0.1
+pkgrel=2
+_mesaver=7.0.3-rc1
 pkgdesc="X.org Intel i810/i830/i915 video drivers"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 depends=('libdrm>=2.3.0' 'expat>=2.0')
-makedepends=('pkgconfig' 'xorg-server>=1.4' 'imake' 'xf86driproto'
+makedepends=('pkgconfig' 'xorg-server>=1.4.0.90' 'imake' 'xf86driproto'
              'libxvmc' 'mesa')
 options=('!libtool')
 groups=('xorg-video-drivers')
 conflicts=('xf86-video-i810')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-	http://downloads.sourceforge.net/mesa3d/MesaLib-${_mesaver}.tar.bz2
-	945gme.patch
-	g33.patch)
+	ftp://ftp.archlinux.org/other/mesa/MesaLib-${_mesaver}.tar.bz2)
+md5sums=('e90d44adc819e8c5c76a1abde525a963'
+         '9bd9a3f3cebac89ff5a3571e1f51ca4f')
 
 build() {
   export CFLAGS="$CLFAGS -fno-strict-aliasing"
@@ -30,8 +30,6 @@
 
 
   cd ${startdir}/src/Mesa-${_mesaver}
-  patch -Np1 -i ${startdir}/src/945gme.patch || return 1
-  patch -Np1 -i ${startdir}/src/g33.patch || return 1
   cd configs
 
   CONFIG="linux-dri-x86"
@@ -44,19 +42,13 @@
   echo "MKDEP = makedepend" >> ${CONFIG}
   echo "DRI_DIRS = i810 i915 i915tex i965" >> ${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
+  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=('e90d44adc819e8c5c76a1abde525a963'
-         'c056abd763e899114bf745c9eedbf9ad'
-         '07d7d7dcd4e14623d60e8cc72dbc7df2'
-         '18be0bd1da75e1cc1e09d29789972da2')