From 12e55da124bacdfbfbc601b1aeb450408e297a15 Mon Sep 17 00:00:00 2001 From: piernov Date: Sat, 31 Mar 2012 12:09:47 +0200 Subject: xorg 1.12.0-1 màj port MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xorg/apm-1.2.3-git.patch | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 xorg/apm-1.2.3-git.patch (limited to 'xorg/apm-1.2.3-git.patch') diff --git a/xorg/apm-1.2.3-git.patch b/xorg/apm-1.2.3-git.patch new file mode 100644 index 000000000..f6dd525c7 --- /dev/null +++ b/xorg/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; -- cgit v1.2.3-70-g09d2