rpms/xorg-x11-drv-s3virge/devel s3v-pciaccess.patch, 1.1, 1.2 xorg-x11-drv-s3virge.spec, 1.17, 1.18

[Dave Airlie (airlied)]

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-s3virge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22129

Modified Files:
	s3v-pciaccess.patch xorg-x11-drv-s3virge.spec 
Log Message:
* Mon Mar 17 2008 Dave Airlie <airlied at redhat.com> 1.9.1-8
- fixup pciaccess conversion


s3v-pciaccess.patch:

Index: s3v-pciaccess.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-s3virge/devel/s3v-pciaccess.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- s3v-pciaccess.patch	10 Mar 2008 03:41:25 -0000	1.1
+++ s3v-pciaccess.patch	17 Mar 2008 03:16:43 -0000	1.2
@@ -100,7 +100,7 @@
      *offset = 0;
      *flags = DGA_NEED_ROOT;
 diff --git a/src/s3v_driver.c b/src/s3v_driver.c
-index 49f87af..e5d8f8a 100644
+index 49f87af..79e6b54 100644
 --- a/src/s3v_driver.c
 +++ b/src/s3v_driver.c
 @@ -29,6 +29,7 @@ in this Software without prior written authorization from the XFree86 Project.
@@ -306,10 +306,10 @@
     */
    outb(vgaCRIndex, 0x59);         /*@@@EE*/
 -  outb(vgaCRReg, ps3v->PciInfo->memBase[0] >> 24);  
-+  outb(vgaCRReg, PCI_REGION_MEM(ps3v->PciInfo, 0, REGION_MEM) >> 24);  
++  outb(vgaCRReg, PCI_REGION_BASE(ps3v->PciInfo, 0, REGION_MEM) >> 24);  
    outb(vgaCRIndex, 0x5A);
 -  outb(vgaCRReg, ps3v->PciInfo->memBase[0] >> 16);
-+  outb(vgaCRReg, PCI_REGION_MEM(ps3v->PciInfo, 0, REGION_MEM) >> 16);
++  outb(vgaCRReg, PCI_REGION_BASE(ps3v->PciInfo, 0, REGION_MEM) >> 16);
    outb(vgaCRIndex, 0x53);
  #endif
    /* Save register for restore */


Index: xorg-x11-drv-s3virge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-s3virge/devel/xorg-x11-drv-s3virge.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xorg-x11-drv-s3virge.spec	10 Mar 2008 03:41:25 -0000	1.17
+++ xorg-x11-drv-s3virge.spec	17 Mar 2008 03:16:43 -0000	1.18
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 s3virge video driver
 Name:      xorg-x11-drv-s3virge
 Version:   1.9.1
-Release:   7%{?dist}
+Release:   8%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -59,6 +59,9 @@
 %{_mandir}/man4/s3virge.4*
 
 %changelog
+* Mon Mar 17 2008 Dave Airlie <airlied at redhat.com> 1.9.1-8
+- fixup pciaccess conversion
+
 * Mon Mar 10 2008 Dave Airlie <airlied at redhat.com> 1.9.1-7
 - pciaccess conversion