[arch-commits] Commit in xf86-video-sis/repos (3 files)

[Jan de Groot]

    Date: Friday, November 13, 2009 @ 16:40:57
  Author: jgc
Revision: 58754

Merged revisions 58753 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/xf86-video-sis/trunk

........
  r58753 | jgc | 2009-11-13 22:40:34 +0100 (Fri, 13 Nov 2009) | 2 lines
  
  upgpkg: xf86-video-sis 0.10.2-3
      Add upstream patch to fix issues on 650 and 760 chipsets (FS#12365)
........

Added:
  xf86-video-sis/repos/extra-i686/fix-bios-read-on-650-760.patch
    (from rev 58753, xf86-video-sis/trunk/fix-bios-read-on-650-760.patch)
Modified:
  xf86-video-sis/repos/extra-i686/	(properties)
  xf86-video-sis/repos/extra-i686/PKGBUILD

--------------------------------+
 PKGBUILD                       |    7 +++++--
 fix-bios-read-on-650-760.patch |   23 +++++++++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)


Property changes on: xf86-video-sis/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /xf86-video-sis/trunk:1-55640
   + /xf86-video-sis/trunk:1-58753

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-11-13 21:40:34 UTC (rev 58753)
+++ extra-i686/PKGBUILD	2009-11-13 21:40:57 UTC (rev 58754)
@@ -3,7 +3,7 @@
 
 pkgname=xf86-video-sis
 pkgver=0.10.2
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org SiS video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -14,14 +14,17 @@
 options=('!libtool')
 groups=('xorg-video-drivers')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        fix-bios-read-on-650-760.patch
         LICENSE)
 md5sums=('f04baa307e49e9f0e5a5c3d2e89a5576'
+         '827d289307badeae3778180ab19b7363'
          'e33e023e3d811d28a8ed3bfbd2bf5672')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/fix-bios-read-on-650-760.patch" || return 1
   ./configure --prefix=/usr \
-              --enable-dri || return 1
+      --enable-dri || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
 

Copied: xf86-video-sis/repos/extra-i686/fix-bios-read-on-650-760.patch (from rev 58753, xf86-video-sis/trunk/fix-bios-read-on-650-760.patch)
===================================================================
--- extra-i686/fix-bios-read-on-650-760.patch	                        (rev 0)
+++ extra-i686/fix-bios-read-on-650-760.patch	2009-11-13 21:40:57 UTC (rev 58754)
@@ -0,0 +1,23 @@
+From 8370499d4035ec7a5c8e1f1b04d5a6c404883442 Mon Sep 17 00:00:00 2001
+From: Matteo Delfino <kendatsuba at gmail.com>
+Date: Wed, 21 Oct 2009 14:26:45 +0000
+Subject: Fix BIOS read on 650 and 760. (#19070)
+
+Signed-off-by: Matteo Delfino <kendatsuba at gmail.com>
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+---
+diff --git a/src/sis_driver.c b/src/sis_driver.c
+index 994b02d..b19e7a9 100644
+--- a/src/sis_driver.c
++++ b/src/sis_driver.c
+@@ -4099,6 +4099,8 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
+ 	     case SIS_315H:
+ 	     case SIS_330:
+ 	     case SIS_340:
++	     case SIS_650:
++	     case SIS_760:
+ 	     case XGI_40:     readpci = TRUE;
+ 			      break;
+ 	     case XGI_20:     readpci = TRUE;
+--
+cgit v0.8.2