[arch-commits] Commit in xf86-video-s3virge/trunk (PKGBUILD s3virge-1.10.4-vga.patch)

[andyrtr at archlinux.org]

    Date: Saturday, February 11, 2012 @ 06:17:14
  Author: andyrtr
Revision: 149874

upgpkg: xf86-video-s3virge 1.10.4-7

Xorg 1.12 rebuild; add late git fixes, patch from FC

Added:
  xf86-video-s3virge/trunk/s3virge-1.10.4-vga.patch
Modified:
  xf86-video-s3virge/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   17 +++++++---
 s3virge-1.10.4-vga.patch |   76 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 88 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-11 11:13:18 UTC (rev 149873)
+++ PKGBUILD	2012-02-11 11:17:14 UTC (rev 149874)
@@ -4,26 +4,33 @@
 
 pkgname=xf86-video-s3virge
 pkgver=1.10.4
-pkgrel=6
+pkgrel=7
 pkgdesc="X.org S3 Virge video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server-devel>=1.10.99.902')
-conflicts=('xorg-server<1.10.99.902')
+makedepends=('pkgconfig' 'xorg-server-devel>=1.11.99.903')
+conflicts=('xorg-server<1.11.99.903')
 options=(!libtool)
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        copyright.patch)
+        copyright.patch
+        s3virge-1.10.4-vga.patch)
 md5sums=('6517bbbf808c700502d51acdc44662f8'
-         'f91fb259e3632fb9130fcbe69ecd9d6a')
+         'f91fb259e3632fb9130fcbe69ecd9d6a'
+         '45c7d912734c9f7dfc1f42077827cb8e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/copyright.patch"
+  patch -Np1 -i ${srcdir}/s3virge-1.10.4-vga.patch
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"

Added: s3virge-1.10.4-vga.patch
===================================================================
--- s3virge-1.10.4-vga.patch	                        (rev 0)
+++ s3virge-1.10.4-vga.patch	2012-02-11 11:17:14 UTC (rev 149874)
@@ -0,0 +1,76 @@
+From 92b4671ca75022a56ad9e85b347f81c12157c98f Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Wed, 16 Nov 2011 19:58:29 +0000
+Subject: Adapt to missing PIOOffset in videoabi 12
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+---
+diff --git a/src/s3v_driver.c b/src/s3v_driver.c
+index 2ced9ac..0f754dd 100644
+--- a/src/s3v_driver.c
++++ b/src/s3v_driver.c
+@@ -3516,11 +3516,17 @@ S3VEnableMmio(ScrnInfoPtr pScrn)
+   S3VPtr ps3v;
+   IOADDRESS vgaCRIndex, vgaCRReg;
+   unsigned char val;
+-  
++  unsigned int PIOOffset = 0;
++
+   PVERB5("	S3VEnableMmio\n");
+   
+   hwp = VGAHWPTR(pScrn);
+   ps3v = S3VPTR(pScrn);
++
++#if ABI_VIDEODRV_VERSION < 12
++  PIOOffset = hwp->PIOOffset;
++#endif
++  
+   /*
+    * enable chipset (seen on uninitialized secondary cards)
+    * might not be needed once we use the VGA softbooter
+@@ -3533,17 +3539,17 @@ S3VEnableMmio(ScrnInfoPtr pScrn)
+    * to be set correctly already and MMIO _has_ to be
+    * enabled.
+    */
+-  val = inb(hwp->PIOOffset + 0x3C3);               /*@@@EE*/
+-  outb(hwp->PIOOffset + 0x3C3, val | 0x01);
++  val = inb(PIOOffset + 0x3C3);               /*@@@EE*/
++  outb(PIOOffset + 0x3C3, val | 0x01);
+   /*
+    * set CR registers to color mode
+    * in mono mode extended CR registers
+    * are not accessible. (EE 05/04/99)
+    */
+-  val = inb(hwp->PIOOffset + VGA_MISC_OUT_R);      /*@@@EE*/
+-  outb(hwp->PIOOffset + VGA_MISC_OUT_W, val | 0x01);
++  val = inb(PIOOffset + VGA_MISC_OUT_R);      /*@@@EE*/
++  outb(PIOOffset + VGA_MISC_OUT_W, val | 0x01);
+   vgaHWGetIOBase(hwp);             	/* Get VGA I/O base */
+-  vgaCRIndex = hwp->PIOOffset + hwp->IOBase + 4;
++  vgaCRIndex = PIOOffset + hwp->IOBase + 4;
+   vgaCRReg = vgaCRIndex + 1;
+ #if 1
+   /*
+@@ -3562,7 +3568,7 @@ S3VEnableMmio(ScrnInfoPtr pScrn)
+   			      	/* Enable new MMIO, if TRIO mmio is already */
+ 				/* enabled, then it stays enabled. */
+   outb(vgaCRReg, ps3v->EnableMmioCR53 | 0x08);
+-  outb(hwp->PIOOffset + VGA_MISC_OUT_W, val);
++  outb(PIOOffset + VGA_MISC_OUT_W, val);
+   if (S3_TRIO_3D_SERIES(ps3v->Chipset)) {
+     outb(vgaCRIndex, 0x40);
+     val = inb(vgaCRReg);
+@@ -3584,7 +3590,10 @@ S3VDisableMmio(ScrnInfoPtr pScrn)
+   hwp = VGAHWPTR(pScrn);
+   ps3v = S3VPTR(pScrn);
+ 
+-  vgaCRIndex = hwp->PIOOffset + hwp->IOBase + 4;
++  vgaCRIndex = hwp->IOBase + 4;
++#if ABI_VIDEODRV_VERSION < 12
++  vgaCRIndex += hwp->PIOOffset;
++#endif
+   vgaCRReg = vgaCRIndex + 1;
+   outb(vgaCRIndex, 0x53);
+ 				/* Restore register's original state */
+--
+cgit v0.9.0.2-2-gbebe