[xorg-x11-drv-apm] apm-1.2.3-git.patch: sync with git for new ABI

[Adam Jackson]

commit 4a998e178a9657c0a97b72f134d7d33e609328f4
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Nov 16 19:51:09 2011 -0500

    apm-1.2.3-git.patch: sync with git for new ABI

 apm-1.2.3-git.patch |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 deletions(-)
---
diff --git a/apm-1.2.3-git.patch b/apm-1.2.3-git.patch
new file mode 100644
index 0000000..1c6afb2
--- /dev/null
+++ b/apm-1.2.3-git.patch
@@ -0,0 +1,34 @@
+diff --git a/src/apm.h b/src/apm.h
+index bc66714..86c7663 100644
+--- a/src/apm.h
++++ b/src/apm.h
+@@ -109,7 +109,7 @@ typedef struct {
+     char		*MemMap;
+     pointer		BltMap;
+     Bool		UnlockCalled;
+-    IOADDRESS		iobase, xport, xbase;
++    unsigned long	iobase, xport, xbase;
+     unsigned char	savedSR10;
+     CARD8		MiscOut;
+     CARD8		c9, d9, db, Rush;
+diff --git a/src/apm_driver.c b/src/apm_driver.c
+index f172bab..f77bb2b 100644
+--- a/src/apm_driver.c
++++ b/src/apm_driver.c
+@@ -418,8 +418,14 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
+ 
+     hwp = VGAHWPTR(pScrn);
+     vgaHWGetIOBase(hwp);
+-    pApm->iobase = hwp->PIOOffset;
+-    pApm->xport = hwp->PIOOffset + 0x3C4;
++#if ABI_VIDEODRV_VERSION < 12
++#define PIOOFFSET hwp->PIOOffset
++#else
++/* FIXME reintroduce domain support */
++#define PIOOFFSET 0
++#endif
++    pApm->iobase = PIOOFFSET;
++    pApm->xport = PIOOFFSET + 0x3C4;
+ 
+     /* Set pScrn->monitor */
+     pScrn->monitor = pScrn->confScreen->monitor;