[arch-commits] Commit in xorg-server/trunk (2 files)

[Jan de Groot]

    Date: Friday, May 29, 2009 @ 13:55:34
  Author: jgc
Revision: 40682

Fix FS#14408

Added:
  xorg-server/trunk/xserver-1.6.0-xinerama-cursors.patch
Modified:
  xorg-server/trunk/PKGBUILD

--------------------------------------+
 PKGBUILD                             |   11 +++++++--
 xserver-1.6.0-xinerama-cursors.patch |   37 +++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-05-29 17:53:14 UTC (rev 40681)
+++ PKGBUILD	2009-05-29 17:55:34 UTC (rev 40682)
@@ -4,7 +4,7 @@
 
 pkgname=xorg-server
 pkgver=1.6.1.901
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org X servers"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -19,11 +19,13 @@
 source=(${url}/releases/individual/xserver/${pkgname}-${pkgver}.tar.bz2
 	xorg-redhat-die-ugly-pattern-die-die-die.patch
 	server-1.6-branch.patch
-	pending-1.6.2.patch)
+	pending-1.6.2.patch
+	xserver-1.6.0-xinerama-cursors.patch)
 md5sums=('e6cba1f07006143daa95ce3f11d999b2'
          '1a336eb22e27cbf443ec5a2ecddfa93c'
          '99cd540797beb6245ecb7c9f3a7e0eb6'
-         '3c99aff6d7253e6828924f1b9d2fae8e')
+         '3c99aff6d7253e6828924f1b9d2fae8e'
+	 'a30429f7c2114e7170d62858472ec102')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -37,6 +39,9 @@
   # Excludes suggested DRI2 patches
   patch -Np1 -i "${srcdir}/pending-1.6.2.patch" || return 1
 
+  # FS#14408
+  patch -Np1 -i "${srcdir}/xserver-1.6.0-xinerama-cursors.patch" || return 1
+
   # Fix dbus config path
   sed -i -e 's/\$(sysconfdir)/\/etc/' config/Makefile.*  || return 1
 

Added: xserver-1.6.0-xinerama-cursors.patch
===================================================================
--- xserver-1.6.0-xinerama-cursors.patch	                        (rev 0)
+++ xserver-1.6.0-xinerama-cursors.patch	2009-05-29 17:55:34 UTC (rev 40682)
@@ -0,0 +1,37 @@
+From 3323f7ac880d5a8261d5b22059374fc9de8ca683 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Wed, 25 Mar 2009 12:55:42 +1000
+Subject: [PATCH] xfree86: fix SWCursor check in xf86CursorSetCursor.
+
+Wrong check for inputInfo.pointer resulted in a SW cursor being rendered when
+the pointer left the screen (in a Xinerama setup).
+We must call the sprite rendering function if
+- SW cursors are enabled, or
+- The current device is not the VCP and not attached to the VCP.
+
+Reported-by: Gordon Yuan <GordonYuan at viatech.com.cn>
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ hw/xfree86/ramdac/xf86Cursor.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/hw/xfree86/ramdac/xf86Cursor.c b/hw/xfree86/ramdac/xf86Cursor.c
+index 2b73b16..896ed37 100644
+--- a/hw/xfree86/ramdac/xf86Cursor.c
++++ b/hw/xfree86/ramdac/xf86Cursor.c
+@@ -302,9 +302,9 @@ xf86CursorSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCurs,
+ 
+ 
+     if (pCurs == NullCursor) {	/* means we're supposed to remove the cursor */
+-        if (ScreenPriv->SWCursor || pDev != inputInfo.pointer)
+-            (*ScreenPriv->spriteFuncs->SetCursor)(pDev, pScreen, NullCursor,
+-                                                  x, y);
++        if (ScreenPriv->SWCursor ||
++            !(pDev == inputInfo.pointer || !pDev->isMaster && pDev->u.master == inputInfo.pointer))
++                (*ScreenPriv->spriteFuncs->SetCursor)(pDev, pScreen, NullCursor, x, y);
+         else if (ScreenPriv->isUp) {
+             xf86SetCursor(pScreen, NullCursor, x, y);
+             ScreenPriv->isUp = FALSE;
+-- 
+1.6.0.6
+