diff options
author | root <root@rshg054.dnsready.net> | 2012-03-14 00:01:30 +0000 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2012-03-14 00:01:30 +0000 |
commit | 01a0c4bc740842efa3bf1a7e1d6c8be5656e4e2a (patch) | |
tree | c9cf79fb6311cbb2a890419e0a382aa211fb3010 /extra/xf86-video-apm | |
parent | ca06c41d7d8e5d38284de9048372ab45dcd8b2fb (diff) |
Wed Mar 14 00:01:29 UTC 2012
Diffstat (limited to 'extra/xf86-video-apm')
-rw-r--r-- | extra/xf86-video-apm/PKGBUILD | 19 | ||||
-rw-r--r-- | extra/xf86-video-apm/apm-1.2.3-git.patch | 34 |
2 files changed, 47 insertions, 6 deletions
diff --git a/extra/xf86-video-apm/PKGBUILD b/extra/xf86-video-apm/PKGBUILD index c15e421d8..3cf6acff0 100644 --- a/extra/xf86-video-apm/PKGBUILD +++ b/extra/xf86-video-apm/PKGBUILD @@ -1,25 +1,32 @@ -# $Id: PKGBUILD 140350 2011-10-11 21:29:39Z jgc $ +# $Id: PKGBUILD 153319 2012-03-12 20:53:08Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-apm pkgver=1.2.3 -pkgrel=4 +pkgrel=5 pkgdesc="X.org Alliance ProMotion video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.11.0') -conflicts=('xorg-server<1.11.0') +makedepends=('xorg-server-devel>=1.11.99.902') +conflicts=('xorg-server<1.11.99.902') groups=('xorg-drivers' 'xorg') options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('1fa7180cf985a74132f8d5b39a0bf9df08713fac') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + apm-1.2.3-git.patch) +sha1sums=('1fa7180cf985a74132f8d5b39a0bf9df08713fac' + 'ad9468519eb959bb879ba4e4993d6a83848d5c6f') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ${srcdir}/apm-1.2.3-git.patch ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/extra/xf86-video-apm/apm-1.2.3-git.patch b/extra/xf86-video-apm/apm-1.2.3-git.patch new file mode 100644 index 000000000..1c6afb29d --- /dev/null +++ b/extra/xf86-video-apm/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; |