[arch-commits] CVS update of extra/x11-drivers/xf86-video-savage (2 files)

[Jan de Groot]

    Date: Sunday, March 16, 2008 @ 17:00:57
  Author: jgc
    Path: /home/cvs-extra/extra/x11-drivers/xf86-video-savage

Modified: PKGBUILD (1.18 -> 1.19)
 Removed: savage-2.1.2-respawn-crash.patch (1.1)

upgpkg: xf86-video-savage 2.1.3-3
    Update mesa


----------------------------------+
 PKGBUILD                         |   15 ++++++---------
 savage-2.1.2-respawn-crash.patch |   23 -----------------------
 2 files changed, 6 insertions(+), 32 deletions(-)


Index: extra/x11-drivers/xf86-video-savage/PKGBUILD
diff -u extra/x11-drivers/xf86-video-savage/PKGBUILD:1.18 extra/x11-drivers/xf86-video-savage/PKGBUILD:1.19
--- extra/x11-drivers/xf86-video-savage/PKGBUILD:1.18	Sat Jan 26 07:52:59 2008
+++ extra/x11-drivers/xf86-video-savage/PKGBUILD	Sun Mar 16 17:00:57 2008
@@ -1,25 +1,24 @@
-# $Id: PKGBUILD,v 1.18 2008/01/26 12:52:59 jgc Exp $
+# $Id: PKGBUILD,v 1.19 2008/03/16 21:00:57 jgc Exp $
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xf86-video-savage
 pkgver=2.1.3
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org savage video driver"
-mesaver="7.0.3-rc1"
+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.4.0.90' 'imake' 'mesa>=7.0.3rc1' 'xf86driproto' 'glproto>=1.4.9')
+makedepends=('pkgconfig' 'xorg-server>=1.4.0.90' 'imake' 'mesa>=7.0.3rc2' 'xf86driproto' 'glproto>=1.4.9')
 options=(!libtool)
 groups=('xorg-video-drivers')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        ftp://ftp.archlinux.org/other/mesa/MesaLib-${mesaver}.tar.bz2)
+        http://www.mesa3d.org/beta/MesaLib-${mesaver}.tar.gz)
 
 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
 
@@ -46,5 +45,3 @@
   cd drivers/dri
   make DESTDIR=${startdir}/pkg install || return 1
 }
-md5sums=('9c5e541613b07de6e7b2b2df3a2e35b1'
-         '9bd9a3f3cebac89ff5a3571e1f51ca4f')
Index: extra/x11-drivers/xf86-video-savage/savage-2.1.2-respawn-crash.patch
diff -u extra/x11-drivers/xf86-video-savage/savage-2.1.2-respawn-crash.patch:1.1 extra/x11-drivers/xf86-video-savage/savage-2.1.2-respawn-crash.patch:removed
--- extra/x11-drivers/xf86-video-savage/savage-2.1.2-respawn-crash.patch:1.1	Thu Feb 15 11:13:16 2007
+++ extra/x11-drivers/xf86-video-savage/savage-2.1.2-respawn-crash.patch	Sun Mar 16 17:00:57 2008
@@ -1,23 +0,0 @@
-From: Mikko Rapeli <mikko.rapeli at iki.fi>
-Date: Thu, 4 Jan 2007 02:50:22 +0000 (-0500)
-Subject: fix savage respawn crash
-X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-video-savage.git;a=commitdiff;h=3e2d370e291f5f222de88075f1f285446cca0569
-
-fix savage respawn crash
-
-SavageCloseScreen() unmaps memory, but SavageScreenInit()
-never maps it again.
----
-
---- a/src/savage_driver.c
-+++ b/src/savage_driver.c
-@@ -3088,6 +3088,9 @@ static Bool SavageScreenInit(int scrnInd
-  
-     SavageEnableMMIO(pScrn);
- 
-+    if (!SavageMapMem(pScrn))
-+	return FALSE;
-+
-     psav->FBStart2nd = 0;
- 
-     if (psav->overlayDepth) {