rpms/xorg-x11-drv-vmmouse/devel vmmouse-12.6.4-abi.patch, NONE, 1.1 xorg-x11-drv-vmmouse.spec, 1.25, 1.26

[Adam Jackson]

Author: ajax

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

Modified Files:
	xorg-x11-drv-vmmouse.spec 
Added Files:
	vmmouse-12.6.4-abi.patch 
Log Message:
* Thu Jul 09 2009 Adam Jackson <ajax at redhat.com> 12.6.4-2
- Port to new server ABI (#509682)


vmmouse-12.6.4-abi.patch:

--- NEW FILE vmmouse-12.6.4-abi.patch ---
diff -up xf86-input-vmmouse-12.6.4/src/vmmouse.c.jx xf86-input-vmmouse-12.6.4/src/vmmouse.c
--- xf86-input-vmmouse-12.6.4/src/vmmouse.c.jx	2009-05-11 12:59:48.000000000 -0400
+++ xf86-input-vmmouse-12.6.4/src/vmmouse.c	2009-07-09 10:37:25.000000000 -0400
@@ -776,6 +776,10 @@ VMMouseDeviceControl(DeviceIntPtr device
    VMMousePrivPtr mPriv;
    unsigned char map[MSE_MAXBUTTONS + 1];
    int i;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+   Atom btn_labels[MSE_MAXBUTTONS] = {0};
+   Atom axes_labels[2] = { 0, 0 };
+#endif
 
    pInfo = device->public.devicePrivate;
    pMse = pInfo->private;
@@ -794,6 +798,9 @@ VMMouseDeviceControl(DeviceIntPtr device
 
       InitPointerDeviceStruct((DevicePtr)device, map,
 			      min(pMse->buttons, MSE_MAXBUTTONS),
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+				btn_labels,
+#endif
 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
 				miPointerGetMotionEvents,
 #elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
@@ -805,20 +812,39 @@ VMMouseDeviceControl(DeviceIntPtr device
 #else
                                 GetMotionHistorySize(), 2
 #endif
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+				, axes_labels
+#endif
                                 );
 
       /* X valuator */
 #ifdef ABS_VALUATOR_AXES
-      xf86InitValuatorAxisStruct(device, 0, 0, 65535, 10000, 0, 10000);
+      xf86InitValuatorAxisStruct(device, 0,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+				axes_labels[0],
+#endif
+				0, 65535, 10000, 0, 10000);
 #else
-      xf86InitValuatorAxisStruct(device, 0, 0, -1, 1, 0, 1);
+      xf86InitValuatorAxisStruct(device, 0,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+				axes_labels[0],
+#endif
+				0, -1, 1, 0, 1);
 #endif
       xf86InitValuatorDefaults(device, 0);
       /* Y valuator */
 #ifdef ABS_VALUATOR_AXES
-      xf86InitValuatorAxisStruct(device, 1, 0, 65535, 10000, 0, 10000);
+      xf86InitValuatorAxisStruct(device, 1,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+				axes_labels[1],
+#endif
+				0, 65535, 10000, 0, 10000);
 #else
-      xf86InitValuatorAxisStruct(device, 1, 0, -1, 1, 0, 1);
+      xf86InitValuatorAxisStruct(device, 1,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+				axes_labels[1],
+#endif
+				0, -1, 1, 0, 1);
 #endif
       xf86InitValuatorDefaults(device, 1);
 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
@@ -1144,17 +1170,6 @@ VMMouseConvertProc(InputInfoPtr pInfo, i
    return TRUE;
 }
 
-
-#ifdef XFree86LOADER
-ModuleInfoRec VMMouseInfo = {
-    1,
-    "VMMOUSE",
-    NULL,
-    0,
-    VMMouseAvailableOptions,
-};
-
-
 /*
  *----------------------------------------------------------------------
  *
@@ -1204,8 +1219,6 @@ VMMousePlug(pointer	module,
    static Bool Initialised = FALSE;
    char *name;
 
-   xf86LoaderReqSymLists(reqSymbols, NULL);
-
    if (!Initialised)
       Initialised = TRUE;
 
@@ -1247,9 +1260,8 @@ static XF86ModuleVersionInfo VMMouseVers
 /*
  * The variable contains the necessary information to load and initialize the module
  */
-XF86ModuleData vmmouseModuleData = {
+_X_EXPORT XF86ModuleData vmmouseModuleData = {
    &VMMouseVersionRec,
    VMMousePlug,
    VMMouseUnplug
 };
-#endif /* XFree86LOADER */


Index: xorg-x11-drv-vmmouse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmmouse/devel/xorg-x11-drv-vmmouse.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- xorg-x11-drv-vmmouse.spec	12 May 2009 22:03:56 -0000	1.25
+++ xorg-x11-drv-vmmouse.spec	9 Jul 2009 14:38:23 -0000	1.26
@@ -2,16 +2,17 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/input
 
-Summary:   Xorg X11 vmmouse input driver
-Name:      xorg-x11-drv-vmmouse
-Version:   12.6.4
-Release:   1%{?dist}
-URL:       http://www.x.org
-License:   MIT
-Group:     User Interface/X Hardware Support
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Summary:    Xorg X11 vmmouse input driver
+Name:	    xorg-x11-drv-vmmouse
+Version:    12.6.4
+Release:    2%{?dist}
+URL:	    http://www.x.org
+License:    MIT
+Group:	    User Interface/X Hardware Support
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source0:    ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Patch0:	    vmmouse-12.6.4-abi.patch
 
 # Yes, this is not the same as vmware.  Yes, this is intentional.
 ExclusiveArch: %{ix86} x86_64
@@ -25,6 +26,7 @@ X.Org X11 vmmouse input driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p1 -b .abi
 
 %build
 %configure --disable-static --with-hal-callouts-dir=%{_bindir}
@@ -51,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi
 
 %changelog
+* Thu Jul 09 2009 Adam Jackson <ajax at redhat.com> 12.6.4-2
+- Port to new server ABI (#509682)
+
 * Wed May 13 2009 Peter Hutterer <peter.hutterer at redhat.com> 12.6.4-1
 - vmmouse 12.6.4