[arch-commits] Commit in xf86-video-tseng/trunk (2 files)

[Jan de Groot]

    Date: Thursday, August 25, 2011 @ 05:40:13
  Author: jgc
Revision: 136281

upgpkg: xf86-video-tseng 1.2.4-5

	Rebuild for xserver 1.11RC, add patch to fix a regression

Added:
  xf86-video-tseng/trunk/fix-regression-from-pciaccess-conversion.patch
Modified:
  xf86-video-tseng/trunk/PKGBUILD

------------------------------------------------+
 PKGBUILD                                       |   13 ++++++-----
 fix-regression-from-pciaccess-conversion.patch |   27 +++++++++++++++++++++++
 2 files changed, 35 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-25 09:36:40 UTC (rev 136280)
+++ PKGBUILD	2011-08-25 09:40:13 UTC (rev 136281)
@@ -3,21 +3,24 @@
 
 pkgname=xf86-video-tseng
 pkgver=1.2.4
-pkgrel=4
+pkgrel=5
 pkgdesc="X.org tseng video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel')
-conflicts=('xorg-server<1.10.0')
+makedepends=('xorg-server-devel>=1.10.99.902')
+conflicts=('xorg-server<1.10.99.902')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('1b45f55657b2c92f30abb0769cae57fca98d93b7')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        fix-regression-from-pciaccess-conversion.patch)
+sha1sums=('1b45f55657b2c92f30abb0769cae57fca98d93b7'
+          'df7660ec18cce3e9f04a7c70f72c75daa947e4a9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/fix-regression-from-pciaccess-conversion.patch"
   ./configure --prefix=/usr
   make
   make DESTDIR="${pkgdir}" install

Added: fix-regression-from-pciaccess-conversion.patch
===================================================================
--- fix-regression-from-pciaccess-conversion.patch	                        (rev 0)
+++ fix-regression-from-pciaccess-conversion.patch	2011-08-25 09:40:13 UTC (rev 136281)
@@ -0,0 +1,27 @@
+From 542e65deaf834c3d58c44064206445e4d18f6daa Mon Sep 17 00:00:00 2001
+From: BALATON Zoltan <balaton at eik.bme.hu>
+Date: Sat, 11 Jun 2011 10:50:16 +0000
+Subject: Fix regression from pciaccess conversion (bug#32682)
+
+Due to a typo in TsengGetFbAddress it is unable to get framebuffer base
+address and thus fails to load with an error message saying "No valid
+Framebuffer address in PCI config space" although previously it does
+print the correct framebuffer address.
+
+Signed-off-by: Julien Cristau <jcristau at debian.org>
+---
+diff --git a/src/tseng_driver.c b/src/tseng_driver.c
+index 6992671..d36b62c 100644
+--- a/src/tseng_driver.c
++++ b/src/tseng_driver.c
+@@ -883,7 +883,7 @@ TsengGetFbAddress(ScrnInfoPtr pScrn)
+     PDEBUG("	TsengGetFbAddress\n");
+ 
+     /* base0 is the framebuffer and base1 is the PCI IO space. */
+-    if (PCI_REGION_BASE(pTseng->PciInfo, 0, REGION_MEM)) {
++    if (!PCI_REGION_BASE(pTseng->PciInfo, 0, REGION_MEM)) {
+         xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                    "No valid Framebuffer address in PCI config space;\n");
+         return FALSE;
+--
+cgit v0.9.0.2-2-gbebe