diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-03-27 23:45:43 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-03-28 00:00:34 +0000 |
| commit | 8844d75a425f3e2a5464753bd0261e9baea20d0d (patch) | |
| tree | 1731641a535b7ee981dd0f6c118988f26f6c653c /main/xf86-video-apm | |
| parent | f4a91dc87a9f1c0fa354bde97351fc9f40c281e2 (diff) | |
| download | aports-8844d75a425f3e2a5464753bd0261e9baea20d0d.tar.bz2 aports-8844d75a425f3e2a5464753bd0261e9baea20d0d.tar.xz | |
main/xf86-video-apm: rebuild against xorg-server-1.12
Diffstat (limited to 'main/xf86-video-apm')
| -rw-r--r-- | main/xf86-video-apm/APKBUILD | 18 | ||||
| -rw-r--r-- | main/xf86-video-apm/apm-1.2.3-git.patch | 34 |
2 files changed, 49 insertions, 3 deletions
diff --git a/main/xf86-video-apm/APKBUILD b/main/xf86-video-apm/APKBUILD index a60d5a2b63..e72957da90 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=2 +pkgrel=3 pkgdesc="Alliance ProMotion video driver" url="http://xorg.freedesktop.org/" arch="all" @@ -11,7 +11,18 @@ depends= makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto videoproto renderproto" -source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2" +source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2 + apm-1.2.3-git.patch + " + +prepare() { + cd "$srcdir"/$pkgname-$pkgver + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} build() { cd "$srcdir"/$pkgname-$pkgver @@ -27,4 +38,5 @@ 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" +md5sums="a3743a971b3acb7de3d2eefc8b1a4834 xf86-video-apm-1.2.3.tar.bz2 +53d71f20d5683443d5a72a817c37209d apm-1.2.3-git.patch" diff --git a/main/xf86-video-apm/apm-1.2.3-git.patch b/main/xf86-video-apm/apm-1.2.3-git.patch new file mode 100644 index 0000000000..1c6afb29d3 --- /dev/null +++ b/main/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; |