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

[andyrtr at archlinux.org]

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

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

Added:
  xf86-video-ast/repos/extra-i686/PKGBUILD
    (from rev 153285, xf86-video-ast/repos/testing-i686/PKGBUILD)
  xf86-video-ast/repos/extra-i686/ast-0.93.9-vga.patch
    (from rev 153285, xf86-video-ast/repos/testing-i686/ast-0.93.9-vga.patch)
Deleted:
  xf86-video-ast/repos/extra-i686/PKGBUILD
  xf86-video-ast/repos/testing-i686/

----------------------+
 PKGBUILD             |   59 +++++++++++++++++++++++++++----------------------
 ast-0.93.9-vga.patch |   38 +++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 26 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-03-12 20:53:11 UTC (rev 153321)
+++ extra-i686/PKGBUILD	2012-03-12 20:53:12 UTC (rev 153322)
@@ -1,26 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=xf86-video-ast
-pkgver=0.93.9
-pkgrel=1
-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.0')
-conflicts=('xorg-server<1.11.0')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('424cc93d0300e49a882199c0546425f223b3b4bd')
-
-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-ast/repos/extra-i686/PKGBUILD (from rev 153285, xf86-video-ast/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-03-12 20:53:12 UTC (rev 153322)
@@ -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/extra-i686/ast-0.93.9-vga.patch (from rev 153285, xf86-video-ast/repos/testing-i686/ast-0.93.9-vga.patch)
===================================================================
--- extra-i686/ast-0.93.9-vga.patch	                        (rev 0)
+++ extra-i686/ast-0.93.9-vga.patch	2012-03-12 20:53:12 UTC (rev 153322)
@@ -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