rpms/xorg-x11-server/F-13 xserver-1.7.6-export-dix-functions.patch, NONE, 1.1 xorg-x11-server.spec, 1.512, 1.513

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-server/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29652

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.7.6-export-dix-functions.patch 
Log Message:
* Mon Apr 12 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.8.0-3
- xserver-1.7.6-export-dix-functions: export some functions in use by VNC.


xserver-1.7.6-export-dix-functions.patch:
 input.h |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE xserver-1.7.6-export-dix-functions.patch ---
>From 7bdea0bb8f38dba2d214482301de981c3260450d Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac at redhat.com>
Date: Mon, 22 Mar 2010 14:52:29 +0100
Subject: [PATCH] dix: Export AllocDevicePair GetPointerEvents, GetKeyboardEvents and generate_modkeymap functions from Xorg.

Those functions are used by TigerVNC libvnc.so module which doesn't
use standard XInput infrastructure but uses same functions like,
for example, XTest devices.

Signed-off-by: Adam Tkac <atkac at redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 include/input.h |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/input.h b/include/input.h
index 8561308..63f981e 100644
--- a/include/input.h
+++ b/include/input.h
@@ -432,7 +432,7 @@ extern void CreateClassesChangedEvent(EventListPtr event,
                                       DeviceIntPtr master,
                                       DeviceIntPtr slave,
                                       int type);
-extern int GetPointerEvents(
+extern _X_EXPORT int GetPointerEvents(
     EventListPtr events,
     DeviceIntPtr pDev,
     int type,
@@ -442,7 +442,7 @@ extern int GetPointerEvents(
     int num_valuators,
     int *valuators);
 
-extern int GetKeyboardEvents(
+extern _X_EXPORT int GetKeyboardEvents(
     EventListPtr events,
     DeviceIntPtr pDev,
     int type,
@@ -493,7 +493,7 @@ extern int AttachDevice(ClientPtr client,
 extern _X_EXPORT DeviceIntPtr GetPairedDevice(DeviceIntPtr kbd);
 extern DeviceIntPtr GetMaster(DeviceIntPtr dev, int type);
 
-extern int AllocDevicePair(ClientPtr client,
+extern _X_EXPORT int AllocDevicePair(ClientPtr client,
                              char* name,
                              DeviceIntPtr* ptr,
                              DeviceIntPtr* keybd,
@@ -505,7 +505,7 @@ extern void DeepCopyDeviceClasses(DeviceIntPtr from,
                                   DeviceChangedEvent *dce);
 
 /* Helper functions. */
-extern int generate_modkeymap(ClientPtr client, DeviceIntPtr dev,
+extern _X_EXPORT int generate_modkeymap(ClientPtr client, DeviceIntPtr dev,
                               KeyCode **modkeymap, int *max_keys_per_mod);
 extern int change_modmap(ClientPtr client, DeviceIntPtr dev, KeyCode *map,
                          int max_keys_per_mod);
-- 
1.6.6.1



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-13/xorg-x11-server.spec,v
retrieving revision 1.512
retrieving revision 1.513
diff -u -p -r1.512 -r1.513
--- xorg-x11-server.spec	12 Apr 2010 05:42:07 -0000	1.512
+++ xorg-x11-server.spec	12 Apr 2010 05:50:01 -0000	1.513
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.8.0
-Release:   2%{?gitdate:.%{gitdate}}%{dist}
+Release:   3%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -87,6 +87,7 @@ Patch6052: xserver-1.8-udev-warning.patc
 Patch6053: xserver-1.8-disable-vboxvideo.patch
 
 Patch6054: xserver-1.8-no-hardcoded-etc.patch
+Patch6055: xserver-1.7.6-export-dix-functions.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -526,6 +527,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Mon Apr 12 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.8.0-3
+- xserver-1.7.6-export-dix-functions: export some functions in use by VNC.
+
 * Mon Apr 12 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.8.0-2
 - Add Xen virtual pointer quirk to 10-quirks.conf (#523914)