[arch-commits] Commit in xf86-video-ast/repos (6 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Fri Feb 10 21:25:00 UTC 2012
Date: Friday, February 10, 2012 @ 16:24:59
Author: andyrtr
Revision: 149790
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
xf86-video-ast/repos/staging-i686/
xf86-video-ast/repos/staging-i686/PKGBUILD
(from rev 149789, xf86-video-ast/trunk/PKGBUILD)
xf86-video-ast/repos/staging-i686/ast-0.93.9-vga.patch
(from rev 149789, xf86-video-ast/trunk/ast-0.93.9-vga.patch)
xf86-video-ast/repos/staging-x86_64/
xf86-video-ast/repos/staging-x86_64/PKGBUILD
(from rev 149789, xf86-video-ast/trunk/PKGBUILD)
xf86-video-ast/repos/staging-x86_64/ast-0.93.9-vga.patch
(from rev 149789, xf86-video-ast/trunk/ast-0.93.9-vga.patch)
-------------------------------------+
staging-i686/PKGBUILD | 33 +++++++++++++++++++++++++++++
staging-i686/ast-0.93.9-vga.patch | 38 ++++++++++++++++++++++++++++++++++
staging-x86_64/PKGBUILD | 33 +++++++++++++++++++++++++++++
staging-x86_64/ast-0.93.9-vga.patch | 38 ++++++++++++++++++++++++++++++++++
4 files changed, 142 insertions(+)
Copied: xf86-video-ast/repos/staging-i686/PKGBUILD (from rev 149789, xf86-video-ast/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-02-10 21:24:59 UTC (rev 149790)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-ast
+pkgver=0.93.9
+pkgrel=2
+pkgdesc="X.org ASPEED AST Graphics 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')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+ ast-0.93.9-vga.patch)
+md5sums=('e25c6a55e9d07cc6054d6affc1231296'
+ '9aa9ea4c568b6563389fa634cb0f7cf0')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i ${srcdir}/ast-0.93.9-vga.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-ast/repos/staging-i686/ast-0.93.9-vga.patch (from rev 149789, xf86-video-ast/trunk/ast-0.93.9-vga.patch)
===================================================================
--- staging-i686/ast-0.93.9-vga.patch (rev 0)
+++ staging-i686/ast-0.93.9-vga.patch 2012-02-10 21:24:59 UTC (rev 149790)
@@ -0,0 +1,38 @@
+From 4a7eda24050b42072c77d527257609e743e8dc78 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Wed, 16 Nov 2011 20:09:40 +0000
+Subject: Adapt to domain changes in videoabi 12
+
+This is a blind change, I don't have this hardware handy to test with.
+It probably wants the same new API that tdfx wants.
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+---
+diff --git a/src/ast_driver.c b/src/ast_driver.c
+index bd3d338..128538f 100644
+--- a/src/ast_driver.c
++++ b/src/ast_driver.c
+@@ -498,11 +498,20 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
+ (pScrn->chipset != NULL) ? pScrn->chipset : "Unknown ast");
+
+ /* Resource Allocation */
++#if ABI_VIDEODRV_VERSION < 12
+ pAST->IODBase = pScrn->domainIOBase;
++#else
++ pAST->IODBase = 0;
++#endif
+ /* "Patch" the PIOOffset inside vgaHW in order to force
+ * the vgaHW module to use our relocated i/o ports.
+ */
+- VGAHWPTR(pScrn)->PIOOffset = pAST->PIOOffset = pAST->IODBase + PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) - 0x380;
++
++#if ABI_VIDEODRV_VERSION < 12
++ VGAHWPTR(pScrn)->PIOOffset = /* ... */
++#endif
++ pAST->PIOOffset =
++ pAST->IODBase + PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) - 0x380;
+
+ pAST->RelocateIO = (IOADDRESS)(PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) + pAST->IODBase);
+
+--
+cgit v0.9.0.2-2-gbebe
Copied: xf86-video-ast/repos/staging-x86_64/PKGBUILD (from rev 149789, xf86-video-ast/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-02-10 21:24:59 UTC (rev 149790)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-ast
+pkgver=0.93.9
+pkgrel=2
+pkgdesc="X.org ASPEED AST Graphics 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')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+ ast-0.93.9-vga.patch)
+md5sums=('e25c6a55e9d07cc6054d6affc1231296'
+ '9aa9ea4c568b6563389fa634cb0f7cf0')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i ${srcdir}/ast-0.93.9-vga.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-ast/repos/staging-x86_64/ast-0.93.9-vga.patch (from rev 149789, xf86-video-ast/trunk/ast-0.93.9-vga.patch)
===================================================================
--- staging-x86_64/ast-0.93.9-vga.patch (rev 0)
+++ staging-x86_64/ast-0.93.9-vga.patch 2012-02-10 21:24:59 UTC (rev 149790)
@@ -0,0 +1,38 @@
+From 4a7eda24050b42072c77d527257609e743e8dc78 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Wed, 16 Nov 2011 20:09:40 +0000
+Subject: Adapt to domain changes in videoabi 12
+
+This is a blind change, I don't have this hardware handy to test with.
+It probably wants the same new API that tdfx wants.
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+---
+diff --git a/src/ast_driver.c b/src/ast_driver.c
+index bd3d338..128538f 100644
+--- a/src/ast_driver.c
++++ b/src/ast_driver.c
+@@ -498,11 +498,20 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
+ (pScrn->chipset != NULL) ? pScrn->chipset : "Unknown ast");
+
+ /* Resource Allocation */
++#if ABI_VIDEODRV_VERSION < 12
+ pAST->IODBase = pScrn->domainIOBase;
++#else
++ pAST->IODBase = 0;
++#endif
+ /* "Patch" the PIOOffset inside vgaHW in order to force
+ * the vgaHW module to use our relocated i/o ports.
+ */
+- VGAHWPTR(pScrn)->PIOOffset = pAST->PIOOffset = pAST->IODBase + PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) - 0x380;
++
++#if ABI_VIDEODRV_VERSION < 12
++ VGAHWPTR(pScrn)->PIOOffset = /* ... */
++#endif
++ pAST->PIOOffset =
++ pAST->IODBase + PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) - 0x380;
+
+ pAST->RelocateIO = (IOADDRESS)(PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) + pAST->IODBase);
+
+--
+cgit v0.9.0.2-2-gbebe
More information about the arch-commits
mailing list