[arch-commits] Commit in xf86-video-ast/trunk (PKGBUILD ast-0.93.9-vga.patch)

2012-03-24 Thread Jan de Groot
Date: Saturday, March 24, 2012 @ 06:34:30
  Author: jgc
Revision: 154222

upgpkg: xf86-video-ast 0.93.10-1

Update to 0.93.10

Modified:
  xf86-video-ast/trunk/PKGBUILD
Deleted:
  xf86-video-ast/trunk/ast-0.93.9-vga.patch

--+
 PKGBUILD |   15 ++-
 ast-0.93.9-vga.patch |   38 --
 2 files changed, 6 insertions(+), 47 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-24 10:34:01 UTC (rev 154221)
+++ PKGBUILD2012-03-24 10:34:30 UTC (rev 154222)
@@ -2,25 +2,22 @@
 # Maintainer: Jan de Groot j...@archlinux.org
 
 pkgname=xf86-video-ast
-pkgver=0.93.9
-pkgrel=2
+pkgver=0.93.10
+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.99.902')
-conflicts=('xorg-server1.11.99.902')
+makedepends=('xorg-server-devel=1.12.0')
+conflicts=('xorg-server1.12.0')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-ast-0.93.9-vga.patch)
-md5sums=('e25c6a55e9d07cc6054d6affc1231296'
- '9aa9ea4c568b6563389fa634cb0f7cf0')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('c9d466fef391bdf960f79b82f1f776a1c1ab870e93475c3d1b3d028531fac4e0')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/ast-0.93.9-vga.patch
   ./configure --prefix=/usr
   make
 }

Deleted: ast-0.93.9-vga.patch
===
--- ast-0.93.9-vga.patch2012-03-24 10:34:01 UTC (rev 154221)
+++ ast-0.93.9-vga.patch2012-03-24 10:34:30 UTC (rev 154222)
@@ -1,38 +0,0 @@
-From 4a7eda24050b42072c77d527257609e743e8dc78 Mon Sep 17 00:00:00 2001
-From: Adam Jackson a...@redhat.com
-Date: Wed, 16 Nov 2011 20:09:40 +
-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 a...@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



[arch-commits] Commit in xf86-video-ast/trunk (PKGBUILD ast-0.93.9-vga.patch)

2012-02-10 Thread andyrtr
Date: Friday, February 10, 2012 @ 16:24:25
  Author: andyrtr
Revision: 149789

upgpkg: xf86-video-ast 0.93.9-2

Xorg 1.12 rebuild

Added:
  xf86-video-ast/trunk/ast-0.93.9-vga.patch
Modified:
  xf86-video-ast/trunk/PKGBUILD

--+
 PKGBUILD |   17 -
 ast-0.93.9-vga.patch |   38 ++
 2 files changed, 50 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-10 21:07:50 UTC (rev 149788)
+++ PKGBUILD2012-02-10 21:24:25 UTC (rev 149789)
@@ -3,23 +3,30 @@
 
 pkgname=xf86-video-ast
 pkgver=0.93.9
-pkgrel=1
+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.0')
-conflicts=('xorg-server1.11.0')
+makedepends=('xorg-server-devel=1.11.99.902')
+conflicts=('xorg-server1.11.99.902')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('424cc93d0300e49a882199c0546425f223b3b4bd')
+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}/

Added: ast-0.93.9-vga.patch
===
--- ast-0.93.9-vga.patch(rev 0)
+++ ast-0.93.9-vga.patch2012-02-10 21:24:25 UTC (rev 149789)
@@ -0,0 +1,38 @@
+From 4a7eda24050b42072c77d527257609e743e8dc78 Mon Sep 17 00:00:00 2001
+From: Adam Jackson a...@redhat.com
+Date: Wed, 16 Nov 2011 20:09:40 +
+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 a...@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