[arch-commits] Commit in xf86-video-apm/repos (4 files)

[andyrtr at archlinux.org]

    Date: Monday, March 12, 2012 @ 16:53:06
  Author: andyrtr
Revision: 153318

db-move: moved xf86-video-apm from [testing] to [extra] (i686)

Added:
  xf86-video-apm/repos/extra-i686/PKGBUILD
    (from rev 153285, xf86-video-apm/repos/testing-i686/PKGBUILD)
  xf86-video-apm/repos/extra-i686/apm-1.2.3-git.patch
    (from rev 153285, xf86-video-apm/repos/testing-i686/apm-1.2.3-git.patch)
Deleted:
  xf86-video-apm/repos/extra-i686/PKGBUILD
  xf86-video-apm/repos/testing-i686/

---------------------+
 PKGBUILD            |   59 +++++++++++++++++++++++++++-----------------------
 apm-1.2.3-git.patch |   34 ++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 26 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-03-12 20:53:04 UTC (rev 153317)
+++ extra-i686/PKGBUILD	2012-03-12 20:53:06 UTC (rev 153318)
@@ -1,26 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=xf86-video-apm
-pkgver=1.2.3
-pkgrel=4
-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')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('1fa7180cf985a74132f8d5b39a0bf9df08713fac')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-  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/extra-i686/PKGBUILD (from rev 153285, xf86-video-apm/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-03-12 20:53:06 UTC (rev 153318)
@@ -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.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
+        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/extra-i686/apm-1.2.3-git.patch (from rev 153285, xf86-video-apm/repos/testing-i686/apm-1.2.3-git.patch)
===================================================================
--- extra-i686/apm-1.2.3-git.patch	                        (rev 0)
+++ extra-i686/apm-1.2.3-git.patch	2012-03-12 20:53:06 UTC (rev 153318)
@@ -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;