rpms/synaptics/devel synaptics-0.14.4-newx.patch, NONE, 1.1 synaptics.spec, 1.26, 1.27

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/synaptics/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23210

Modified Files:
	synaptics.spec 
Added Files:
	synaptics-0.14.4-newx.patch 
Log Message:
Resolves: rhbz#396891 patch it to at least work

synaptics-0.14.4-newx.patch:

--- NEW FILE synaptics-0.14.4-newx.patch ---
diff -ru synaptics-0.14.4.orig/Makefile synaptics-0.14.4/Makefile
--- synaptics-0.14.4.orig/Makefile	2007-11-23 08:49:08.000000000 +0000
+++ synaptics-0.14.4/Makefile	2007-11-23 08:49:04.000000000 +0000
@@ -40,7 +40,7 @@
     fi )
   ALLINCLUDES = -I. -I/usr/include/X11 \
 		-I/usr/include/X11/extensions \
-		-I/usr/include/xorg
+		-I/usr/include/xorg `pkg-config --cflags pixman-1`
 else
   SERVERSRC = $(TOP)/programs/Xserver
   ALLINCLUDES = -I. \
diff -ru synaptics-0.14.4.orig/ps2comm.c synaptics-0.14.4/ps2comm.c
--- synaptics-0.14.4.orig/ps2comm.c	2005-08-07 20:44:04.000000000 +0100
+++ synaptics-0.14.4/ps2comm.c	2007-11-23 08:49:03.000000000 +0000
@@ -60,6 +60,8 @@
 #define PS2DBG(x)
 #endif
 
+#define DBG(lvl, f)
+
 /*****************************************************************************
  *	PS/2 Utility functions.
  *     Many parts adapted from tpconfig.c by C. Scott Ananian
diff -ru synaptics-0.14.4.orig/synaptics.c synaptics-0.14.4/synaptics.c
--- synaptics-0.14.4.orig/synaptics.c	2007-11-23 08:49:08.000000000 +0000
+++ synaptics-0.14.4/synaptics.c	2007-11-23 08:49:03.000000000 +0000
@@ -67,6 +67,8 @@
 #include <xf86Optrec.h>  		/* needed for Options */
 #endif
 
+#define DBG(lvl, f)
+
 
 /*****************************************************************************
  *	Local Headers
@@ -305,8 +307,10 @@
     local->private_flags           = 0;
     local->flags                   = XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS;
     local->conf_idev               = dev;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
     local->motion_history_proc     = xf86GetMotionEvents;
     local->history_size            = 0;
+#endif
     local->always_core_feedback    = 0;
 
     xf86Msg(X_INFO, "Synaptics touchpad driver version %s (%d)\n", VERSION, VERSION_ID);
@@ -443,7 +447,9 @@
 	goto SetupProc_fail;
     }
 
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
     local->history_size = xf86SetIntOption( local->options, "HistorySize", 0 );
+#endif
 
     xf86ProcessCommonOptions(local, local->options);
     local->flags |= XI86_CONFIGURED;
@@ -601,8 +607,18 @@
 
     InitPointerDeviceStruct((DevicePtr)dev, map,
 			    SYN_MAX_BUTTONS,
-			    miPointerGetMotionEvents, SynapticsCtrl,
-			    miPointerGetMotionBufferSize());
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+			    miPointerGetMotionEvents,
+#else
+			    GetMotionHistory,
+#endif
+			    SynapticsCtrl,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+			    miPointerGetMotionBufferSize()
+#else
+			    GetMotionHistorySize(), 2
+#endif
+                           );
 
     /* X valuator */
     xf86InitValuatorAxisStruct(dev, 0, 0, -1, 1, 0, 1);
@@ -611,7 +627,9 @@
     xf86InitValuatorAxisStruct(dev, 1, 0, -1, 1, 0, 1);
     xf86InitValuatorDefaults(dev, 1);
 
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
     xf86MotionHistoryAllocate(local);
+#endif
 
     if (!alloc_param_data(local))
 	return !Success;


Index: synaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synaptics/devel/synaptics.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- synaptics.spec	15 Oct 2007 21:06:35 -0000	1.26
+++ synaptics.spec	30 Nov 2007 17:18:37 -0000	1.27
@@ -2,7 +2,7 @@
 
 Name:           synaptics
 Version:        0.14.4
-Release:	11%{?dist}
+Release:	12%{?dist}
 Summary:        Synaptics Touchpad Driver
 
 Group:          User Interface/X Hardware Support
@@ -11,6 +11,7 @@
 Source0:        http://w1.894.telia.com/~u89404340/touchpad/files/synaptics-0.14.4.tar.bz2
 Patch0: synaptics-0.14.4-modularx.patch
 Patch1: synaptics-0.14.4-delibcwrap.patch
+Patch2: synaptics-0.14.4-newx.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}
 BuildRequires:	pkgconfig
 BuildRequires:	xorg-x11-server-sdk >= 1.0.99.901
@@ -45,6 +46,7 @@
 %setup -q 
 %patch0 -p1 -b .modx
 %patch1 -p1 -b .delibcwrap
+%patch2 -p1 -b .newx
 # remove included XFree86 headers
 rm -rf Xincludes
 
@@ -71,6 +73,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Fri Nov 30 2007 Caolan McNamara <caolanm at redhat.com> 0.14.4-12
+- Resolves: rhbz#396891 patch it to at least work
+
 * Mon Oct 15 2007 Adam Jackson <ajax at redhat.com> 0.14.4-11
 - Back to ExclusiveArch, buildsystem is a disaster.