Attachment #130442 for bug #191899

View | Details | Raw Unified | Return to bug 191899
Collapse All | Expand All

Lines 34-43 Link Here

(-)synaptics-0.14.6.orig/Makefile (-2 / +1 lines)
34	LDCOMBINEFLAGS = -shared -lc	34	LDCOMBINEFLAGS = -shared -lc
35	PICFLAG = $(call check_gcc,-fPIC,)	35	PICFLAG = $(call check_gcc,-fPIC,)
36	X_INCLUDES_ROOT = $(INSTALLED_X)	36	X_INCLUDES_ROOT = $(INSTALLED_X)
37	SDKDIR = $(shell pkg-config xorg-server --variable=sdkdir)
38	ALLINCLUDES = -I. -I$(INSTALLED_X)/include/X11 \	37	ALLINCLUDES = -I. -I$(INSTALLED_X)/include/X11 \
39	-I$(INSTALLED_X)/include/X11/extensions \	38	-I$(INSTALLED_X)/include/X11/extensions \
40	-I$(SDKDIR)	39	`pkg-config xorg-server --cflags`
41	else	40	else
42	INSTALLED_X = /usr/X11R6	41	INSTALLED_X = /usr/X11R6
43	INPUT_MODULE_DIR = $(DESTDIR)/$(INSTALLED_X)/$(LIBDIR)/modules/input	42	INPUT_MODULE_DIR = $(DESTDIR)/$(INSTALLED_X)/$(LIBDIR)/modules/input

Lines 321-327 Link Here

(-)synaptics-0.14.6.orig/synaptics.c (-1 / +12 lines)
321	local->private_flags = 0;	321	local->private_flags = 0;
322	local->flags = XI86_POINTER_CAPABLE \| XI86_SEND_DRAG_EVENTS;	322	local->flags = XI86_POINTER_CAPABLE \| XI86_SEND_DRAG_EVENTS;
323	local->conf_idev = dev;	323	local->conf_idev = dev;
		324	#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
324	local->motion_history_proc = xf86GetMotionEvents;	325	local->motion_history_proc = xf86GetMotionEvents;
		326	#endif
325	local->history_size = 0;	327	local->history_size = 0;
326	local->always_core_feedback = 0;	328	local->always_core_feedback = 0;
327		329
Lines 613-620 Link Here
613		615
614	InitPointerDeviceStruct((DevicePtr)dev, map,	616	InitPointerDeviceStruct((DevicePtr)dev, map,
615	SYN_MAX_BUTTONS,	617	SYN_MAX_BUTTONS,
616	miPointerGetMotionEvents, SynapticsCtrl,	618	#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
		619	miPointerGetMotionEvents,
		620	#else
		621	GetMotionHistory,
		622	#endif
		623	SynapticsCtrl,
		624	#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
617	miPointerGetMotionBufferSize());	625	miPointerGetMotionBufferSize());
		626	#else
		627	GetMotionHistorySize(), 2);
		628	#endif
618		629
619	/* X valuator */	630	/* X valuator */
620	xf86InitValuatorAxisStruct(dev, 0, 0, -1, 1, 0, 1);	631	xf86InitValuatorAxisStruct(dev, 0, 0, -1, 1, 0, 1);

Lines 226-230 Link Here

(-)synaptics-0.14.6.orig/synaptics.h (+6 lines)
226		226
227	#endif /* SYNAPTICS_PRIVATE */	227	#endif /* SYNAPTICS_PRIVATE */
228		228
		229	/* Previously found in xf86Xinput.h */
		230	#ifdef DBG
		231	#undef DBG
		232	#endif
		233
		234	#define DBG(lvl, f) {if ((lvl) <= xf86GetVerbosity()) f;}
229		235
230	#endif /* _SYNAPTICS_H_ */	236	#endif /* _SYNAPTICS_H_ */

Return to bug 191899