[xorg-x11-drv-openchrome] ABI rebuild openchrome-0.2.904-vga.patch: Adapt to videoabi 12

[Adam Jackson]

commit d1bce4f077367dd0a13b3d97dcfcf858d2d51e6c
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Nov 16 20:17:24 2011 -0500

    ABI rebuild
    openchrome-0.2.904-vga.patch: Adapt to videoabi 12

 openchrome-0.2.904-vga.patch |   33 +++++++++++++++++++++++++++++++++
 xorg-x11-drv-openchrome.spec |    7 +++++--
 2 files changed, 38 insertions(+), 2 deletions(-)
---
diff --git a/openchrome-0.2.904-vga.patch b/openchrome-0.2.904-vga.patch
new file mode 100644
index 0000000..0151597
--- /dev/null
+++ b/openchrome-0.2.904-vga.patch
@@ -0,0 +1,33 @@
+diff -up xf86-video-openchrome-0.2.904/src/via_vgahw.c.jx xf86-video-openchrome-0.2.904/src/via_vgahw.c
+--- xf86-video-openchrome-0.2.904/src/via_vgahw.c.jx	2009-10-03 16:48:55.000000000 -0400
++++ xf86-video-openchrome-0.2.904/src/via_vgahw.c	2011-11-16 20:14:47.985001289 -0500
+@@ -36,6 +36,11 @@
+ #include "via_driver.h" /* for HAVE_DEBUG */
+ #include "via_vgahw.h"
+ 
++#if ABI_VIDEODRV_VERSION < 12
++#define PIOOFFSET hwp->PIOOffset
++#else
++#define PIOOFFSET 0
++#endif
+ 
+ static CARD8
+ ViaVgahwIn(vgaHWPtr hwp, int address)
+@@ -43,7 +48,7 @@ ViaVgahwIn(vgaHWPtr hwp, int address)
+     if (hwp->MMIOBase)
+         return MMIO_IN8(hwp->MMIOBase, hwp->MMIOOffset + address);
+     else
+-        return inb(hwp->PIOOffset + address);
++        return inb(PIOOFFSET + address);
+ }
+ 
+ static void
+@@ -52,7 +57,7 @@ ViaVgahwOut(vgaHWPtr hwp, int address, C
+     if (hwp->MMIOBase)
+         MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + address, value);
+     else
+-        outb(hwp->PIOOffset + address, value);
++        outb(PIOOFFSET + address, value);
+ }
+ 
+ /*
diff --git a/xorg-x11-drv-openchrome.spec b/xorg-x11-drv-openchrome.spec
index e2866be..f2e7e9e 100644
--- a/xorg-x11-drv-openchrome.spec
+++ b/xorg-x11-drv-openchrome.spec
@@ -10,7 +10,7 @@
 Summary:        Xorg X11 openchrome video driver
 Name:           xorg-x11-drv-openchrome
 Version:        0.2.904
-Release:        17%{?dist}
+Release:        18%{?dist}
 URL:            http://www.openchrome.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -27,6 +27,7 @@ Patch0:         openchrome-0.2.904-svn933.patch
 # Experimental patches (branch backport, etc...): 
 Patch13:        openchrome-0.2.904-fix_tvout_flickering.patch
 Patch20:        openchrome-0.2.904-I420_Xv_surface_for_CME.patch
+Patch21:	openchrome-0.2.904-vga.patch
 
 ExclusiveArch:  %{ix86} x86_64
 
@@ -68,6 +69,7 @@ X.Org X11 openchrome video driver XvMC development package.
 
 %patch13 -p0
 #%patch20 -p1
+%patch21 -p1
 
 
 %build
@@ -124,8 +126,9 @@ fi
 
 
 %changelog
-* Wed Nov 09 2011 ajax <ajax at redhat.com> - 0.2.904-17
+* Wed Nov 16 2011 Adam Jackson <ajax at redhat.com> 0.2.904-18
 - ABI rebuild
+- openchrome-0.2.904-vga.patch: Adapt to videoabi 12
 
 * Sun Sep 11 2011 Xavier Bachelot <xavier at bachelot.org> - 0.2.904-16
 - Update to svn933 for bugfixes.