rpms/xorg-x11-server/devel xserver-1.5.99.902-vnc.patch, NONE, 1.1 xorg-x11-server.spec, 1.403, 1.404

[Adam Tkac]

Author: atkac

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22938

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.5.99.902-vnc.patch 
Log Message:
- don't call drv->UnInit if device doesn't have driver


xserver-1.5.99.902-vnc.patch:

--- NEW FILE xserver-1.5.99.902-vnc.patch ---
>From 62cd546931f99504bcf830f20eeefe0dbc81f8a9 Mon Sep 17 00:00:00 2001
From: Fedora X Ninjas <x at fedoraproject.org>
Date: Thu, 12 Feb 2009 18:52:57 +0100
Subject: [PATCH] Don't call drv->UnInit if device doesn't have driver.

This bug probably isn't reproducable with "standard" devices and drivers but it
is reproducable with VNC devices. They are slave devices which doesn't have
LocalDevice structure filled. Upstream bug with more details -
https://bugs.freedesktop.org/show_bug.cgi?id=20087.
---
 hw/xfree86/common/xf86Xinput.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index 96352a4..3d89e39 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -668,7 +668,7 @@ DeleteInputDeviceRequest(DeviceIntPtr pDev)
     OsBlockSignals();
     RemoveDevice(pDev);
 
-    if (!isMaster)
+    if (!isMaster && pInfo != NULL)
     {
         if(drv->UnInit)
             drv->UnInit(drv, pInfo, 0);
-- 
1.6.1.3



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -r1.403 -r1.404
--- xorg-x11-server.spec	11 Feb 2009 01:28:09 -0000	1.403
+++ xorg-x11-server.spec	12 Feb 2009 18:13:40 -0000	1.404
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.99.902
-Release:   9%{?dist}
+Release:   10%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -90,6 +90,9 @@
 # In master, nominated for 1.6
 Patch6014: xserver-1.5.99.902-always-RAW.patch
 
+# https://bugs.freedesktop.org/show_bug.cgi?id=20087
+Patch6015: xserver-1.5.99.902-vnc.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -506,6 +509,9 @@
 
 
 %changelog
+* Thu Feb 12 2009 Adam Tkac <atkac redhat com> 1.5.99.902-10
+- don't call drv->UnInit if device doesn't have driver
+
 * Wed Feb 11 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.5.99.902-9
 - xserver-1.5.99.902-always-RAW.patch: always init the console to RAW mode.