Attachment 267581 Details for Bug 396891 – patch to add to make work

[patch] patch to add to make work

synaptics-0.14.4-newx.patch (text/plain), 2.84 KB, created by Caolan McNamara on 2007-11-23 15:20:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Caolan McNamara

Created: 2007-11-23 15:20:18 UTC

Size: 2.84 KB

patch

obsolete

>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;

Actions: View | Diff

Attachments on bug 396891: 267581 | 268151