[arch-commits] Commit in xf86-video-ark/repos (4 files)
Date: Friday, October 5, 2012 @ 16:26:50
Author: andyrtr
Revision: 168104
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
xf86-video-ark/repos/staging-i686/
xf86-video-ark/repos/staging-i686/PKGBUILD
(from rev 168103, xf86-video-ark/trunk/PKGBUILD)
xf86-video-ark/repos/staging-x86_64/
xf86-video-ark/repos/staging-x86_64/PKGBUILD
(from rev 168103, xf86-video-ark/trunk/PKGBUILD)
-+
staging-i686/PKGBUILD | 31 +++
staging-x86_64/PKGBUILD | 31 +++
2 files changed, 62 insertions(+)
Copied: xf86-video-ark/repos/staging-i686/PKGBUILD (from rev 168103,
xf86-video-ark/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-10-05 20:26:50 UTC (rev 168104)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-ark
+pkgver=0.7.5
+pkgrel=2
+pkgdesc=X.org ark video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto'
'scrnsaverproto')
+conflicts=('xorg-server1.13.0' 'X-ABI-VIDEODRV_VERSION13'
'X-ABI-VIDEODRV_VERSION=14')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e')
+
+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-ark/repos/staging-x86_64/PKGBUILD (from rev 168103,
xf86-video-ark/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-10-05 20:26:50 UTC (rev 168104)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-ark
+pkgver=0.7.5
+pkgrel=2
+pkgdesc=X.org ark video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto'
'scrnsaverproto')
+conflicts=('xorg-server1.13.0' 'X-ABI-VIDEODRV_VERSION13'
'X-ABI-VIDEODRV_VERSION=14')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e')
+
+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}/
+}
[arch-commits] Commit in xf86-video-ark/repos (4 files)
Date: Sunday, February 12, 2012 @ 04:44:27
Author: andyrtr
Revision: 150023
db-move: moved xf86-video-ark from [staging] to [testing] (i686)
Added:
xf86-video-ark/repos/testing-i686/
xf86-video-ark/repos/testing-i686/PKGBUILD
(from rev 149988, xf86-video-ark/repos/staging-i686/PKGBUILD)
xf86-video-ark/repos/testing-i686/git-fixes.patch
(from rev 149988, xf86-video-ark/repos/staging-i686/git-fixes.patch)
Deleted:
xf86-video-ark/repos/staging-i686/
-+
PKGBUILD| 34 +++
git-fixes.patch | 118 ++
2 files changed, 152 insertions(+)
Copied: xf86-video-ark/repos/testing-i686/PKGBUILD (from rev 149988,
xf86-video-ark/repos/staging-i686/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-02-12 09:44:27 UTC (rev 150023)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-ark
+pkgver=0.7.4
+pkgrel=1
+pkgdesc=X.org ark 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')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+#git-fixes.patch
+)
+sha1sums=('d95cb9aa56e7db542b3ac8fed9cb519b11f77556')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ #patch -Np1 -i ${srcdir}/git-fixes.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-ark/repos/testing-i686/git-fixes.patch (from rev 149988,
xf86-video-ark/repos/staging-i686/git-fixes.patch)
===
--- testing-i686/git-fixes.patch(rev 0)
+++ testing-i686/git-fixes.patch2012-02-12 09:44:27 UTC (rev 150023)
@@ -0,0 +1,118 @@
+From 9d3769bed020e9796e51411c63de337da5073bb4 Mon Sep 17 00:00:00 2001
+From: Ondrej Zary li...@rainbow-software.org
+Date: Sat, 04 Dec 2010 00:23:51 +
+Subject: Don't assume that FB address registers are initialized properly
+
+https://bugs.freedesktop.org/show_bug.cgi?id=28249
+
+ark driver does not work with Hercules Stingray 64 card (ark2000pv).
+X fails to start with:
+
+[...]
+(II) ark(0): vgaHWGetIOBase: hwp-IOBase is 0x03d0, hwp-PIOOffset is
+0x
+(II) ark(0): Creating default Display subsection in Screen section
+Default Screen Section for depth/fbbpp 24/32
+(==) ark(0): Depth 24, (--) framebuffer bpp 32
+(==) ark(0): RGB weight 888
+(==) ark(0): Default visual is TrueColor
+(**) ark(0): Chipset: ark2000pv
+(--) ark(0): Framebuffer @ 0xe5e5
+(==) ark(0): Using gamma correction (1.0, 1.0, 1.0)
+(--) ark(0): Detected 2048 bytes video ram
+[...]
+Fatal server error:
+AddScreen/ScreenInit failed for driver 0
+
+Comparing with lspci, the framebuffer address is wrong:
+00:0f.0 VGA compatible controller: ARK Logic Inc 2000PV [Stingray] (prog-if 00
[VGA controller])
+ Flags: medium devsel
+ Memory at e500 (32-bit, prefetchable) [size=4M]
+ [virtual] Expansion ROM at 1c00 [disabled] [size=64K]
+
+Reviewed-by: Adam Jackson a...@redhat.com
+---
+diff --git a/src/ark.h b/src/ark.h
+index de301dc..077f93b 100644
+--- a/src/ark.h
b/src/ark.h
+@@ -34,7 +34,6 @@ typedef struct _ARKRec {
+ #endif
+ EntityInfoPtr pEnt;
+ CARD32 IOAddress;
+- CARD32 FBAddress;
+ unsigned char * FBBase;
+ unsigned char * MMIOBase;
+ unsigned long videoRam;
+diff --git a/src/ark_driver.c b/src/ark_driver.c
+index 5de3b9a..fec3e1a 100644
+--- a/src/ark_driver.c
b/src/ark_driver.c
+@@ -363,14 +363,14 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags)
+ outb(hwp-PIOOffset + hwp-IOBase + 5, tmp 0x7f);
+ modinx(hwp-PIOOffset + 0x3c4, 0x1d, 0x01, 0x01);
+
+- /* use membase's later on ??? */
+- pARK-FBAddress = (rdinx(hwp-PIOOffset + 0x3c4, 0x13) 16) +
+-(rdinx(hwp-PIOOffset + 0x3c4, 0x14) 24);
+-
+- pScrn-memPhysBase = pARK-FBAddress;
++#ifndef XSERVER_LIBPCIACCESS
++ pScrn-memPhysBase = pARK-PciInfo-memBase[0];
++#else
++ pScrn-memPhysBase = pARK-PciInfo-regions[0].base_addr;
++#endif
+
+ xf86DrvMsg(pScrn-scrnIndex, X_PROBED, Framebuffer @ 0x%lx\n,
+- (unsigned long)pARK-FBAddress);
++ (unsigned long)pScrn-memPhysBase);
+
+ if (!xf86SetGamma(pScrn, gzeros))
+ return FALSE;
+@@ -748,8 +748,13 @@ static Bool ARKModeInit(ScrnInfoPtr pScrn, DisplayModePtr
mode)
+
[arch-commits] Commit in xf86-video-ark/repos (4 files)
Date: Sunday, February 12, 2012 @ 04:44:29
Author: andyrtr
Revision: 150024
db-move: moved xf86-video-ark from [staging] to [testing] (x86_64)
Added:
xf86-video-ark/repos/testing-x86_64/
xf86-video-ark/repos/testing-x86_64/PKGBUILD
(from rev 149988, xf86-video-ark/repos/staging-x86_64/PKGBUILD)
xf86-video-ark/repos/testing-x86_64/git-fixes.patch
(from rev 149988, xf86-video-ark/repos/staging-x86_64/git-fixes.patch)
Deleted:
xf86-video-ark/repos/staging-x86_64/
-+
PKGBUILD| 34 +++
git-fixes.patch | 118 ++
2 files changed, 152 insertions(+)
Copied: xf86-video-ark/repos/testing-x86_64/PKGBUILD (from rev 149988,
xf86-video-ark/repos/staging-x86_64/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-02-12 09:44:29 UTC (rev 150024)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-ark
+pkgver=0.7.4
+pkgrel=1
+pkgdesc=X.org ark 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')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+#git-fixes.patch
+)
+sha1sums=('d95cb9aa56e7db542b3ac8fed9cb519b11f77556')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ #patch -Np1 -i ${srcdir}/git-fixes.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-ark/repos/testing-x86_64/git-fixes.patch (from rev 149988,
xf86-video-ark/repos/staging-x86_64/git-fixes.patch)
===
--- testing-x86_64/git-fixes.patch (rev 0)
+++ testing-x86_64/git-fixes.patch 2012-02-12 09:44:29 UTC (rev 150024)
@@ -0,0 +1,118 @@
+From 9d3769bed020e9796e51411c63de337da5073bb4 Mon Sep 17 00:00:00 2001
+From: Ondrej Zary li...@rainbow-software.org
+Date: Sat, 04 Dec 2010 00:23:51 +
+Subject: Don't assume that FB address registers are initialized properly
+
+https://bugs.freedesktop.org/show_bug.cgi?id=28249
+
+ark driver does not work with Hercules Stingray 64 card (ark2000pv).
+X fails to start with:
+
+[...]
+(II) ark(0): vgaHWGetIOBase: hwp-IOBase is 0x03d0, hwp-PIOOffset is
+0x
+(II) ark(0): Creating default Display subsection in Screen section
+Default Screen Section for depth/fbbpp 24/32
+(==) ark(0): Depth 24, (--) framebuffer bpp 32
+(==) ark(0): RGB weight 888
+(==) ark(0): Default visual is TrueColor
+(**) ark(0): Chipset: ark2000pv
+(--) ark(0): Framebuffer @ 0xe5e5
+(==) ark(0): Using gamma correction (1.0, 1.0, 1.0)
+(--) ark(0): Detected 2048 bytes video ram
+[...]
+Fatal server error:
+AddScreen/ScreenInit failed for driver 0
+
+Comparing with lspci, the framebuffer address is wrong:
+00:0f.0 VGA compatible controller: ARK Logic Inc 2000PV [Stingray] (prog-if 00
[VGA controller])
+ Flags: medium devsel
+ Memory at e500 (32-bit, prefetchable) [size=4M]
+ [virtual] Expansion ROM at 1c00 [disabled] [size=64K]
+
+Reviewed-by: Adam Jackson a...@redhat.com
+---
+diff --git a/src/ark.h b/src/ark.h
+index de301dc..077f93b 100644
+--- a/src/ark.h
b/src/ark.h
+@@ -34,7 +34,6 @@ typedef struct _ARKRec {
+ #endif
+ EntityInfoPtr pEnt;
+ CARD32 IOAddress;
+- CARD32 FBAddress;
+ unsigned char * FBBase;
+ unsigned char * MMIOBase;
+ unsigned long videoRam;
+diff --git a/src/ark_driver.c b/src/ark_driver.c
+index 5de3b9a..fec3e1a 100644
+--- a/src/ark_driver.c
b/src/ark_driver.c
+@@ -363,14 +363,14 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags)
+ outb(hwp-PIOOffset + hwp-IOBase + 5, tmp 0x7f);
+ modinx(hwp-PIOOffset + 0x3c4, 0x1d, 0x01, 0x01);
+
+- /* use membase's later on ??? */
+- pARK-FBAddress = (rdinx(hwp-PIOOffset + 0x3c4, 0x13) 16) +
+-(rdinx(hwp-PIOOffset + 0x3c4, 0x14) 24);
+-
+- pScrn-memPhysBase = pARK-FBAddress;
++#ifndef XSERVER_LIBPCIACCESS
++ pScrn-memPhysBase = pARK-PciInfo-memBase[0];
++#else
++ pScrn-memPhysBase = pARK-PciInfo-regions[0].base_addr;
++#endif
+
+ xf86DrvMsg(pScrn-scrnIndex, X_PROBED, Framebuffer @ 0x%lx\n,
+- (unsigned long)pARK-FBAddress);
++ (unsigned long)pScrn-memPhysBase);
+
+ if (!xf86SetGamma(pScrn, gzeros))
+ return FALSE;
+@@ -748,8 +748,13 @@ static Bool ARKModeInit(ScrnInfoPtr pScrn,
[arch-commits] Commit in xf86-video-ark/repos (4 files)
Date: Tuesday, October 11, 2011 @ 17:29:37
Author: jgc
Revision: 140347
db-move: moved xf86-video-ark from [testing] to [extra] (i686)
Added:
xf86-video-ark/repos/extra-i686/PKGBUILD
(from rev 140271, xf86-video-ark/repos/testing-i686/PKGBUILD)
xf86-video-ark/repos/extra-i686/git-fixes.patch
(from rev 140271, xf86-video-ark/repos/testing-i686/git-fixes.patch)
Deleted:
xf86-video-ark/repos/extra-i686/PKGBUILD
xf86-video-ark/repos/testing-i686/
-+
PKGBUILD| 57 +-
git-fixes.patch | 118 ++
2 files changed, 148 insertions(+), 27 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-10-11 21:29:36 UTC (rev 140346)
+++ extra-i686/PKGBUILD 2011-10-11 21:29:37 UTC (rev 140347)
@@ -1,27 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=xf86-video-ark
-pkgver=0.7.3
-pkgrel=3
-pkgdesc=X.org ark video driver
-arch=(i686 x86_64)
-url=http://xorg.freedesktop.org/;
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel')
-conflicts=('xorg-server1.10.0')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('56901ec6097a83433689f208268281f9c98c238b')
-
-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-ark/repos/extra-i686/PKGBUILD (from rev 140271,
xf86-video-ark/repos/testing-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-10-11 21:29:37 UTC (rev 140347)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-ark
+pkgver=0.7.3
+pkgrel=4
+pkgdesc=X.org ark 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')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+git-fixes.patch)
+sha1sums=('56901ec6097a83433689f208268281f9c98c238b'
+ 'f62cdc7995e9b64c9105382ccfa842732fa81309')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ patch -Np1 -i ${srcdir}/git-fixes.patch
+ ./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-ark/repos/extra-i686/git-fixes.patch (from rev 140271,
xf86-video-ark/repos/testing-i686/git-fixes.patch)
===
--- extra-i686/git-fixes.patch (rev 0)
+++ extra-i686/git-fixes.patch 2011-10-11 21:29:37 UTC (rev 140347)
@@ -0,0 +1,118 @@
+From 9d3769bed020e9796e51411c63de337da5073bb4 Mon Sep 17 00:00:00 2001
+From: Ondrej Zary li...@rainbow-software.org
+Date: Sat, 04 Dec 2010 00:23:51 +
+Subject: Don't assume that FB address registers are initialized properly
+
+https://bugs.freedesktop.org/show_bug.cgi?id=28249
+
+ark driver does not work with Hercules Stingray 64 card (ark2000pv).
+X fails to start with:
+
+[...]
+(II) ark(0): vgaHWGetIOBase: hwp-IOBase is 0x03d0, hwp-PIOOffset is
+0x
+(II) ark(0): Creating default Display subsection in Screen section
+Default Screen Section for depth/fbbpp 24/32
+(==) ark(0): Depth 24, (--) framebuffer bpp 32
+(==) ark(0): RGB weight 888
+(==) ark(0): Default visual is TrueColor
+(**) ark(0): Chipset: ark2000pv
+(--) ark(0): Framebuffer @ 0xe5e5
+(==) ark(0): Using gamma correction (1.0, 1.0, 1.0)
+(--) ark(0): Detected 2048 bytes video ram
+[...]
+Fatal server error:
+AddScreen/ScreenInit failed for driver 0
+
+Comparing with lspci, the framebuffer address is wrong:
+00:0f.0 VGA compatible controller: ARK Logic Inc 2000PV [Stingray] (prog-if 00
[VGA controller])
+ Flags: medium devsel
+ Memory at e500 (32-bit, prefetchable) [size=4M]
+ [virtual] Expansion ROM at 1c00 [disabled] [size=64K]
+
+Reviewed-by: Adam Jackson a...@redhat.com
+---
+diff --git a/src/ark.h b/src/ark.h
+index de301dc..077f93b 100644
+--- a/src/ark.h
b/src/ark.h
+@@ -34,7 +34,6 @@ typedef struct _ARKRec {
+ #endif
+ EntityInfoPtr pEnt;
+ CARD32 IOAddress;
+- CARD32 FBAddress;
+ unsigned char * FBBase;
+ unsigned char * MMIOBase;
+ unsigned long videoRam;
+diff --git a/src/ark_driver.c b/src/ark_driver.c
+index 5de3b9a..fec3e1a 100644
+--- a/src/ark_driver.c
[arch-commits] Commit in xf86-video-ark/repos (4 files)
Date: Tuesday, October 11, 2011 @ 17:29:38
Author: jgc
Revision: 140348
db-move: moved xf86-video-ark from [testing] to [extra] (x86_64)
Added:
xf86-video-ark/repos/extra-x86_64/PKGBUILD
(from rev 140271, xf86-video-ark/repos/testing-x86_64/PKGBUILD)
xf86-video-ark/repos/extra-x86_64/git-fixes.patch
(from rev 140271, xf86-video-ark/repos/testing-x86_64/git-fixes.patch)
Deleted:
xf86-video-ark/repos/extra-x86_64/PKGBUILD
xf86-video-ark/repos/testing-x86_64/
-+
PKGBUILD| 57 +-
git-fixes.patch | 118 ++
2 files changed, 148 insertions(+), 27 deletions(-)
Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD 2011-10-11 21:29:37 UTC (rev 140347)
+++ extra-x86_64/PKGBUILD 2011-10-11 21:29:38 UTC (rev 140348)
@@ -1,27 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=xf86-video-ark
-pkgver=0.7.3
-pkgrel=3
-pkgdesc=X.org ark video driver
-arch=(i686 x86_64)
-url=http://xorg.freedesktop.org/;
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel')
-conflicts=('xorg-server1.10.0')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('56901ec6097a83433689f208268281f9c98c238b')
-
-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-ark/repos/extra-x86_64/PKGBUILD (from rev 140271,
xf86-video-ark/repos/testing-x86_64/PKGBUILD)
===
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-10-11 21:29:38 UTC (rev 140348)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-ark
+pkgver=0.7.3
+pkgrel=4
+pkgdesc=X.org ark 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')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+git-fixes.patch)
+sha1sums=('56901ec6097a83433689f208268281f9c98c238b'
+ 'f62cdc7995e9b64c9105382ccfa842732fa81309')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ patch -Np1 -i ${srcdir}/git-fixes.patch
+ ./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-ark/repos/extra-x86_64/git-fixes.patch (from rev 140271,
xf86-video-ark/repos/testing-x86_64/git-fixes.patch)
===
--- extra-x86_64/git-fixes.patch(rev 0)
+++ extra-x86_64/git-fixes.patch2011-10-11 21:29:38 UTC (rev 140348)
@@ -0,0 +1,118 @@
+From 9d3769bed020e9796e51411c63de337da5073bb4 Mon Sep 17 00:00:00 2001
+From: Ondrej Zary li...@rainbow-software.org
+Date: Sat, 04 Dec 2010 00:23:51 +
+Subject: Don't assume that FB address registers are initialized properly
+
+https://bugs.freedesktop.org/show_bug.cgi?id=28249
+
+ark driver does not work with Hercules Stingray 64 card (ark2000pv).
+X fails to start with:
+
+[...]
+(II) ark(0): vgaHWGetIOBase: hwp-IOBase is 0x03d0, hwp-PIOOffset is
+0x
+(II) ark(0): Creating default Display subsection in Screen section
+Default Screen Section for depth/fbbpp 24/32
+(==) ark(0): Depth 24, (--) framebuffer bpp 32
+(==) ark(0): RGB weight 888
+(==) ark(0): Default visual is TrueColor
+(**) ark(0): Chipset: ark2000pv
+(--) ark(0): Framebuffer @ 0xe5e5
+(==) ark(0): Using gamma correction (1.0, 1.0, 1.0)
+(--) ark(0): Detected 2048 bytes video ram
+[...]
+Fatal server error:
+AddScreen/ScreenInit failed for driver 0
+
+Comparing with lspci, the framebuffer address is wrong:
+00:0f.0 VGA compatible controller: ARK Logic Inc 2000PV [Stingray] (prog-if 00
[VGA controller])
+ Flags: medium devsel
+ Memory at e500 (32-bit, prefetchable) [size=4M]
+ [virtual] Expansion ROM at 1c00 [disabled] [size=64K]
+
+Reviewed-by: Adam Jackson a...@redhat.com
+---
+diff --git a/src/ark.h b/src/ark.h
+index de301dc..077f93b 100644
+--- a/src/ark.h
b/src/ark.h
+@@ -34,7 +34,6 @@ typedef struct _ARKRec {
+ #endif
+ EntityInfoPtr pEnt;
+ CARD32 IOAddress;
+- CARD32 FBAddress;
+ unsigned char * FBBase;
+ unsigned char * MMIOBase;
+ unsigned long videoRam;
+diff --git a/src/ark_driver.c
[arch-commits] Commit in xf86-video-ark/repos (4 files)
Date: Tuesday, August 30, 2011 @ 04:45:46
Author: jgc
Revision: 136550
db-move: moved xf86-video-ark from [staging] to [testing] (i686)
Added:
xf86-video-ark/repos/testing-i686/
xf86-video-ark/repos/testing-i686/PKGBUILD
(from rev 136477, xf86-video-ark/repos/staging-i686/PKGBUILD)
xf86-video-ark/repos/testing-i686/git-fixes.patch
(from rev 136477, xf86-video-ark/repos/staging-i686/git-fixes.patch)
Deleted:
xf86-video-ark/repos/staging-i686/
-+
PKGBUILD| 30 +
git-fixes.patch | 118 ++
2 files changed, 148 insertions(+)
Copied: xf86-video-ark/repos/testing-i686/PKGBUILD (from rev 136477,
xf86-video-ark/repos/staging-i686/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2011-08-30 08:45:46 UTC (rev 136550)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-ark
+pkgver=0.7.3
+pkgrel=4
+pkgdesc=X.org ark 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')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+git-fixes.patch)
+sha1sums=('56901ec6097a83433689f208268281f9c98c238b'
+ 'f62cdc7995e9b64c9105382ccfa842732fa81309')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ patch -Np1 -i ${srcdir}/git-fixes.patch
+ ./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-ark/repos/testing-i686/git-fixes.patch (from rev 136477,
xf86-video-ark/repos/staging-i686/git-fixes.patch)
===
--- testing-i686/git-fixes.patch(rev 0)
+++ testing-i686/git-fixes.patch2011-08-30 08:45:46 UTC (rev 136550)
@@ -0,0 +1,118 @@
+From 9d3769bed020e9796e51411c63de337da5073bb4 Mon Sep 17 00:00:00 2001
+From: Ondrej Zary li...@rainbow-software.org
+Date: Sat, 04 Dec 2010 00:23:51 +
+Subject: Don't assume that FB address registers are initialized properly
+
+https://bugs.freedesktop.org/show_bug.cgi?id=28249
+
+ark driver does not work with Hercules Stingray 64 card (ark2000pv).
+X fails to start with:
+
+[...]
+(II) ark(0): vgaHWGetIOBase: hwp-IOBase is 0x03d0, hwp-PIOOffset is
+0x
+(II) ark(0): Creating default Display subsection in Screen section
+Default Screen Section for depth/fbbpp 24/32
+(==) ark(0): Depth 24, (--) framebuffer bpp 32
+(==) ark(0): RGB weight 888
+(==) ark(0): Default visual is TrueColor
+(**) ark(0): Chipset: ark2000pv
+(--) ark(0): Framebuffer @ 0xe5e5
+(==) ark(0): Using gamma correction (1.0, 1.0, 1.0)
+(--) ark(0): Detected 2048 bytes video ram
+[...]
+Fatal server error:
+AddScreen/ScreenInit failed for driver 0
+
+Comparing with lspci, the framebuffer address is wrong:
+00:0f.0 VGA compatible controller: ARK Logic Inc 2000PV [Stingray] (prog-if 00
[VGA controller])
+ Flags: medium devsel
+ Memory at e500 (32-bit, prefetchable) [size=4M]
+ [virtual] Expansion ROM at 1c00 [disabled] [size=64K]
+
+Reviewed-by: Adam Jackson a...@redhat.com
+---
+diff --git a/src/ark.h b/src/ark.h
+index de301dc..077f93b 100644
+--- a/src/ark.h
b/src/ark.h
+@@ -34,7 +34,6 @@ typedef struct _ARKRec {
+ #endif
+ EntityInfoPtr pEnt;
+ CARD32 IOAddress;
+- CARD32 FBAddress;
+ unsigned char * FBBase;
+ unsigned char * MMIOBase;
+ unsigned long videoRam;
+diff --git a/src/ark_driver.c b/src/ark_driver.c
+index 5de3b9a..fec3e1a 100644
+--- a/src/ark_driver.c
b/src/ark_driver.c
+@@ -363,14 +363,14 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags)
+ outb(hwp-PIOOffset + hwp-IOBase + 5, tmp 0x7f);
+ modinx(hwp-PIOOffset + 0x3c4, 0x1d, 0x01, 0x01);
+
+- /* use membase's later on ??? */
+- pARK-FBAddress = (rdinx(hwp-PIOOffset + 0x3c4, 0x13) 16) +
+-(rdinx(hwp-PIOOffset + 0x3c4, 0x14) 24);
+-
+- pScrn-memPhysBase = pARK-FBAddress;
++#ifndef XSERVER_LIBPCIACCESS
++ pScrn-memPhysBase = pARK-PciInfo-memBase[0];
++#else
++ pScrn-memPhysBase = pARK-PciInfo-regions[0].base_addr;
++#endif
+
+ xf86DrvMsg(pScrn-scrnIndex, X_PROBED, Framebuffer @ 0x%lx\n,
+- (unsigned long)pARK-FBAddress);
++ (unsigned long)pScrn-memPhysBase);
+
+ if (!xf86SetGamma(pScrn, gzeros))
+ return FALSE;
+@@ -748,8 +748,13 @@ static Bool ARKModeInit(ScrnInfoPtr pScrn, DisplayModePtr
mode)
+ new-sr10 = rdinx(isaIOBase
[arch-commits] Commit in xf86-video-ark/repos (4 files)
Date: Tuesday, August 30, 2011 @ 04:45:48
Author: jgc
Revision: 136551
db-move: moved xf86-video-ark from [staging] to [testing] (x86_64)
Added:
xf86-video-ark/repos/testing-x86_64/
xf86-video-ark/repos/testing-x86_64/PKGBUILD
(from rev 136477, xf86-video-ark/repos/staging-x86_64/PKGBUILD)
xf86-video-ark/repos/testing-x86_64/git-fixes.patch
(from rev 136477, xf86-video-ark/repos/staging-x86_64/git-fixes.patch)
Deleted:
xf86-video-ark/repos/staging-x86_64/
-+
PKGBUILD| 30 +
git-fixes.patch | 118 ++
2 files changed, 148 insertions(+)
Copied: xf86-video-ark/repos/testing-x86_64/PKGBUILD (from rev 136477,
xf86-video-ark/repos/staging-x86_64/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2011-08-30 08:45:48 UTC (rev 136551)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-ark
+pkgver=0.7.3
+pkgrel=4
+pkgdesc=X.org ark 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')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+git-fixes.patch)
+sha1sums=('56901ec6097a83433689f208268281f9c98c238b'
+ 'f62cdc7995e9b64c9105382ccfa842732fa81309')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ patch -Np1 -i ${srcdir}/git-fixes.patch
+ ./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-ark/repos/testing-x86_64/git-fixes.patch (from rev 136477,
xf86-video-ark/repos/staging-x86_64/git-fixes.patch)
===
--- testing-x86_64/git-fixes.patch (rev 0)
+++ testing-x86_64/git-fixes.patch 2011-08-30 08:45:48 UTC (rev 136551)
@@ -0,0 +1,118 @@
+From 9d3769bed020e9796e51411c63de337da5073bb4 Mon Sep 17 00:00:00 2001
+From: Ondrej Zary li...@rainbow-software.org
+Date: Sat, 04 Dec 2010 00:23:51 +
+Subject: Don't assume that FB address registers are initialized properly
+
+https://bugs.freedesktop.org/show_bug.cgi?id=28249
+
+ark driver does not work with Hercules Stingray 64 card (ark2000pv).
+X fails to start with:
+
+[...]
+(II) ark(0): vgaHWGetIOBase: hwp-IOBase is 0x03d0, hwp-PIOOffset is
+0x
+(II) ark(0): Creating default Display subsection in Screen section
+Default Screen Section for depth/fbbpp 24/32
+(==) ark(0): Depth 24, (--) framebuffer bpp 32
+(==) ark(0): RGB weight 888
+(==) ark(0): Default visual is TrueColor
+(**) ark(0): Chipset: ark2000pv
+(--) ark(0): Framebuffer @ 0xe5e5
+(==) ark(0): Using gamma correction (1.0, 1.0, 1.0)
+(--) ark(0): Detected 2048 bytes video ram
+[...]
+Fatal server error:
+AddScreen/ScreenInit failed for driver 0
+
+Comparing with lspci, the framebuffer address is wrong:
+00:0f.0 VGA compatible controller: ARK Logic Inc 2000PV [Stingray] (prog-if 00
[VGA controller])
+ Flags: medium devsel
+ Memory at e500 (32-bit, prefetchable) [size=4M]
+ [virtual] Expansion ROM at 1c00 [disabled] [size=64K]
+
+Reviewed-by: Adam Jackson a...@redhat.com
+---
+diff --git a/src/ark.h b/src/ark.h
+index de301dc..077f93b 100644
+--- a/src/ark.h
b/src/ark.h
+@@ -34,7 +34,6 @@ typedef struct _ARKRec {
+ #endif
+ EntityInfoPtr pEnt;
+ CARD32 IOAddress;
+- CARD32 FBAddress;
+ unsigned char * FBBase;
+ unsigned char * MMIOBase;
+ unsigned long videoRam;
+diff --git a/src/ark_driver.c b/src/ark_driver.c
+index 5de3b9a..fec3e1a 100644
+--- a/src/ark_driver.c
b/src/ark_driver.c
+@@ -363,14 +363,14 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags)
+ outb(hwp-PIOOffset + hwp-IOBase + 5, tmp 0x7f);
+ modinx(hwp-PIOOffset + 0x3c4, 0x1d, 0x01, 0x01);
+
+- /* use membase's later on ??? */
+- pARK-FBAddress = (rdinx(hwp-PIOOffset + 0x3c4, 0x13) 16) +
+-(rdinx(hwp-PIOOffset + 0x3c4, 0x14) 24);
+-
+- pScrn-memPhysBase = pARK-FBAddress;
++#ifndef XSERVER_LIBPCIACCESS
++ pScrn-memPhysBase = pARK-PciInfo-memBase[0];
++#else
++ pScrn-memPhysBase = pARK-PciInfo-regions[0].base_addr;
++#endif
+
+ xf86DrvMsg(pScrn-scrnIndex, X_PROBED, Framebuffer @ 0x%lx\n,
+- (unsigned long)pARK-FBAddress);
++ (unsigned long)pScrn-memPhysBase);
+
+ if (!xf86SetGamma(pScrn, gzeros))
+ return FALSE;
+@@ -748,8 +748,13 @@ static Bool ARKModeInit(ScrnInfoPtr pScrn, DisplayModePtr
mode)
+
