diff options
| -rw-r--r-- | main/xf86-video-apm/APKBUILD | 8 | ||||
| -rw-r--r-- | main/xf86-video-apm/apm-1.2.3-git.patch | 34 |
2 files changed, 3 insertions, 39 deletions
diff --git a/main/xf86-video-apm/APKBUILD b/main/xf86-video-apm/APKBUILD index e72957da90..c09cb2f33f 100644 --- a/main/xf86-video-apm/APKBUILD +++ b/main/xf86-video-apm/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-apm -pkgver=1.2.3 -pkgrel=3 +pkgver=1.2.4 +pkgrel=0 pkgdesc="Alliance ProMotion video driver" url="http://xorg.freedesktop.org/" arch="all" @@ -12,7 +12,6 @@ makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto videoproto renderproto" source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2 - apm-1.2.3-git.patch " prepare() { @@ -38,5 +37,4 @@ package() { rm "$pkgdir"/usr/lib/xorg/modules/drivers/*.la || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="a3743a971b3acb7de3d2eefc8b1a4834 xf86-video-apm-1.2.3.tar.bz2 -53d71f20d5683443d5a72a817c37209d apm-1.2.3-git.patch" +md5sums="7692dac140c15172935872a77417bed2 xf86-video-apm-1.2.4.tar.bz2" diff --git a/main/xf86-video-apm/apm-1.2.3-git.patch b/main/xf86-video-apm/apm-1.2.3-git.patch deleted file mode 100644 index 1c6afb29d3..0000000000 --- a/main/xf86-video-apm/apm-1.2.3-git.patch +++ /dev/null @@ -1,34 +0,0 @@ -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; |