[arch-commits] Commit in xf86-video-apm/repos (6 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Thu Feb 9 21:03:55 UTC 2012
Date: Thursday, February 9, 2012 @ 16:03:54
Author: andyrtr
Revision: 149737
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
xf86-video-apm/repos/staging-i686/
xf86-video-apm/repos/staging-i686/PKGBUILD
(from rev 149736, xf86-video-apm/trunk/PKGBUILD)
xf86-video-apm/repos/staging-i686/apm-1.2.3-git.patch
(from rev 149736, xf86-video-apm/trunk/apm-1.2.3-git.patch)
xf86-video-apm/repos/staging-x86_64/
xf86-video-apm/repos/staging-x86_64/PKGBUILD
(from rev 149736, xf86-video-apm/trunk/PKGBUILD)
xf86-video-apm/repos/staging-x86_64/apm-1.2.3-git.patch
(from rev 149736, xf86-video-apm/trunk/apm-1.2.3-git.patch)
------------------------------------+
staging-i686/PKGBUILD | 33 +++++++++++++++++++++++++++++++++
staging-i686/apm-1.2.3-git.patch | 34 ++++++++++++++++++++++++++++++++++
staging-x86_64/PKGBUILD | 33 +++++++++++++++++++++++++++++++++
staging-x86_64/apm-1.2.3-git.patch | 34 ++++++++++++++++++++++++++++++++++
4 files changed, 134 insertions(+)
Copied: xf86-video-apm/repos/staging-i686/PKGBUILD (from rev 149736, xf86-video-apm/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-02-09 21:03:54 UTC (rev 149737)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-apm
+pkgver=1.2.3
+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.10.99.902')
+conflicts=('xorg-server<1.10.99.902')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+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}/"
+}
Copied: xf86-video-apm/repos/staging-i686/apm-1.2.3-git.patch (from rev 149736, xf86-video-apm/trunk/apm-1.2.3-git.patch)
===================================================================
--- staging-i686/apm-1.2.3-git.patch (rev 0)
+++ staging-i686/apm-1.2.3-git.patch 2012-02-09 21:03:54 UTC (rev 149737)
@@ -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;
Copied: xf86-video-apm/repos/staging-x86_64/PKGBUILD (from rev 149736, xf86-video-apm/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-02-09 21:03:54 UTC (rev 149737)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-apm
+pkgver=1.2.3
+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.10.99.902')
+conflicts=('xorg-server<1.10.99.902')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+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}/"
+}
Copied: xf86-video-apm/repos/staging-x86_64/apm-1.2.3-git.patch (from rev 149736, xf86-video-apm/trunk/apm-1.2.3-git.patch)
===================================================================
--- staging-x86_64/apm-1.2.3-git.patch (rev 0)
+++ staging-x86_64/apm-1.2.3-git.patch 2012-02-09 21:03:54 UTC (rev 149737)
@@ -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;
More information about the arch-commits
mailing list