[arch-commits] Commit in xf86-video-apm/repos (6 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Tue Jul 17 16:04:08 UTC 2012
Date: Tuesday, July 17, 2012 @ 12:04:08
Author: andyrtr
Revision: 163635
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
xf86-video-apm/repos/extra-i686/PKGBUILD
(from rev 163634, xf86-video-apm/trunk/PKGBUILD)
xf86-video-apm/repos/extra-x86_64/PKGBUILD
(from rev 163634, xf86-video-apm/trunk/PKGBUILD)
Deleted:
xf86-video-apm/repos/extra-i686/PKGBUILD
xf86-video-apm/repos/extra-i686/apm-1.2.3-git.patch
xf86-video-apm/repos/extra-x86_64/PKGBUILD
xf86-video-apm/repos/extra-x86_64/apm-1.2.3-git.patch
----------------------------------+
extra-i686/PKGBUILD | 60 ++++++++++++++++++-------------------
extra-i686/apm-1.2.3-git.patch | 34 --------------------
extra-x86_64/PKGBUILD | 60 ++++++++++++++++++-------------------
extra-x86_64/apm-1.2.3-git.patch | 34 --------------------
4 files changed, 60 insertions(+), 128 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-07-17 16:03:24 UTC (rev 163634)
+++ extra-i686/PKGBUILD 2012-07-17 16:04:08 UTC (rev 163635)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=xf86-video-apm
-pkgver=1.2.4
-pkgrel=1
-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)
-sha1sums=('d792ba6e8c39e60e00e0790b4e08f551044b2f7c')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./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/PKGBUILD (from rev 163634, xf86-video-apm/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-07-17 16:04:08 UTC (rev 163635)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-apm
+pkgver=1.2.5
+pkgrel=1
+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.12.0')
+conflicts=('xorg-server<1.12.0')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./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}/"
+}
Deleted: extra-i686/apm-1.2.3-git.patch
===================================================================
--- extra-i686/apm-1.2.3-git.patch 2012-07-17 16:03:24 UTC (rev 163634)
+++ extra-i686/apm-1.2.3-git.patch 2012-07-17 16:04:08 UTC (rev 163635)
@@ -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;
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-07-17 16:03:24 UTC (rev 163634)
+++ extra-x86_64/PKGBUILD 2012-07-17 16:04:08 UTC (rev 163635)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=xf86-video-apm
-pkgver=1.2.4
-pkgrel=1
-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)
-sha1sums=('d792ba6e8c39e60e00e0790b4e08f551044b2f7c')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./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-x86_64/PKGBUILD (from rev 163634, xf86-video-apm/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-07-17 16:04:08 UTC (rev 163635)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-apm
+pkgver=1.2.5
+pkgrel=1
+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.12.0')
+conflicts=('xorg-server<1.12.0')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./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}/"
+}
Deleted: extra-x86_64/apm-1.2.3-git.patch
===================================================================
--- extra-x86_64/apm-1.2.3-git.patch 2012-07-17 16:03:24 UTC (rev 163634)
+++ extra-x86_64/apm-1.2.3-git.patch 2012-07-17 16:04:08 UTC (rev 163635)
@@ -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;
More information about the arch-commits
mailing list