| 1 |
genstef 07/09/09 20:20:16 |
| 2 |
|
| 3 |
Added: synaptics_input_api.diff |
| 4 |
Log: |
| 5 |
Fix synaptics api for xorg-server-1.4 thanks to Geaaru <geaaru@×××××.com> in bug 191899 |
| 6 |
(Portage version: 2.1.3.9) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 x11-drivers/synaptics/files/synaptics_input_api.diff |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/synaptics/files/synaptics_input_api.diff?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/synaptics/files/synaptics_input_api.diff?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: synaptics_input_api.diff |
| 15 |
=================================================================== |
| 16 |
diff -u synaptics-0.14.6.orig/Makefile synaptics-0.14.6/Makefile |
| 17 |
--- synaptics-0.14.6.orig/Makefile 2006-07-15 17:58:26.000000000 +0200 |
| 18 |
+++ synaptics-0.14.6/Makefile 2007-09-07 15:03:17.386179198 +0200 |
| 19 |
@@ -34,10 +34,9 @@ |
| 20 |
LDCOMBINEFLAGS = -shared -lc |
| 21 |
PICFLAG = $(call check_gcc,-fPIC,) |
| 22 |
X_INCLUDES_ROOT = $(INSTALLED_X) |
| 23 |
- SDKDIR = $(shell pkg-config xorg-server --variable=sdkdir) |
| 24 |
ALLINCLUDES = -I. -I$(INSTALLED_X)/include/X11 \ |
| 25 |
-I$(INSTALLED_X)/include/X11/extensions \ |
| 26 |
- -I$(SDKDIR) |
| 27 |
+ `pkg-config xorg-server --cflags` |
| 28 |
else |
| 29 |
INSTALLED_X = /usr/X11R6 |
| 30 |
INPUT_MODULE_DIR = $(DESTDIR)/$(INSTALLED_X)/$(LIBDIR)/modules/input |
| 31 |
diff -u synaptics-0.14.6.orig/synaptics.c synaptics-0.14.6/synaptics.c |
| 32 |
--- synaptics-0.14.6.orig/synaptics.c 2006-07-15 17:54:29.000000000 +0200 |
| 33 |
+++ synaptics-0.14.6/synaptics.c 2007-09-07 15:10:24.910542275 +0200 |
| 34 |
@@ -321,7 +321,9 @@ |
| 35 |
local->private_flags = 0; |
| 36 |
local->flags = XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS; |
| 37 |
local->conf_idev = dev; |
| 38 |
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 |
| 39 |
local->motion_history_proc = xf86GetMotionEvents; |
| 40 |
+#endif |
| 41 |
local->history_size = 0; |
| 42 |
local->always_core_feedback = 0; |
| 43 |
|
| 44 |
@@ -613,8 +615,17 @@ |
| 45 |
|
| 46 |
InitPointerDeviceStruct((DevicePtr)dev, map, |
| 47 |
SYN_MAX_BUTTONS, |
| 48 |
- miPointerGetMotionEvents, SynapticsCtrl, |
| 49 |
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 |
| 50 |
+ miPointerGetMotionEvents, |
| 51 |
+#else |
| 52 |
+ GetMotionHistory, |
| 53 |
+#endif |
| 54 |
+ SynapticsCtrl, |
| 55 |
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 |
| 56 |
miPointerGetMotionBufferSize()); |
| 57 |
+#else |
| 58 |
+ GetMotionHistorySize(), 2); |
| 59 |
+#endif |
| 60 |
|
| 61 |
/* X valuator */ |
| 62 |
xf86InitValuatorAxisStruct(dev, 0, 0, -1, 1, 0, 1); |
| 63 |
diff -u synaptics-0.14.6.orig/synaptics.h synaptics-0.14.6/synaptics.h |
| 64 |
--- synaptics-0.14.6.orig/synaptics.h 2006-07-15 17:54:29.000000000 +0200 |
| 65 |
+++ synaptics-0.14.6/synaptics.h 2007-09-07 15:10:12.409829887 +0200 |
| 66 |
@@ -226,5 +226,11 @@ |
| 67 |
|
| 68 |
#endif /* SYNAPTICS_PRIVATE */ |
| 69 |
|
| 70 |
+/* Previously found in xf86Xinput.h */ |
| 71 |
+#ifdef DBG |
| 72 |
+#undef DBG |
| 73 |
+#endif |
| 74 |
+ |
| 75 |
+#define DBG(lvl, f) {if ((lvl) <= xf86GetVerbosity()) f;} |
| 76 |
|
| 77 |
#endif /* _SYNAPTICS_H_ */ |
| 78 |
|
| 79 |
|
| 80 |
|
| 81 |
-- |
| 82 |
gentoo-commits@g.o mailing list |
Archives