Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 130442 Details for
Bug 191899
x11-drivers/synaptics doesn't compile w/ xorg-server-1.4.0
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
synaptics-0.14.6-xorg-server-1.4.0.patch
synaptics-0.14.6-xorg-server-1.4.0.patch (text/plain), 2.13 KB, created by
Nicolas Boichat
on 2007-09-09 20:20:20 UTC
(
hide
)
Description:
synaptics-0.14.6-xorg-server-1.4.0.patch
Filename:
MIME Type:
Creator:
Nicolas Boichat
Created:
2007-09-09 20:20:20 UTC
Size:
2.13 KB
patch
obsolete
>diff -u synaptics-0.14.6.orig/Makefile synaptics-0.14.6/Makefile >--- synaptics-0.14.6.orig/Makefile 2006-07-15 17:58:26.000000000 +0200 >+++ synaptics-0.14.6/Makefile 2007-09-07 15:03:17.386179198 +0200 >@@ -34,10 +34,9 @@ > LDCOMBINEFLAGS = -shared -lc > PICFLAG = $(call check_gcc,-fPIC,) > X_INCLUDES_ROOT = $(INSTALLED_X) >- SDKDIR = $(shell pkg-config xorg-server --variable=sdkdir) > ALLINCLUDES = -I. -I$(INSTALLED_X)/include/X11 \ > -I$(INSTALLED_X)/include/X11/extensions \ >- -I$(SDKDIR) >+ `pkg-config xorg-server --cflags` > else > INSTALLED_X = /usr/X11R6 > INPUT_MODULE_DIR = $(DESTDIR)/$(INSTALLED_X)/$(LIBDIR)/modules/input >diff -u synaptics-0.14.6.orig/synaptics.c synaptics-0.14.6/synaptics.c >--- synaptics-0.14.6.orig/synaptics.c 2006-07-15 17:54:29.000000000 +0200 >+++ synaptics-0.14.6/synaptics.c 2007-09-07 15:10:24.910542275 +0200 >@@ -321,7 +321,9 @@ > 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; >+#endif > local->history_size = 0; > local->always_core_feedback = 0; > >@@ -613,8 +615,17 @@ > > InitPointerDeviceStruct((DevicePtr)dev, map, > SYN_MAX_BUTTONS, >- miPointerGetMotionEvents, SynapticsCtrl, >+#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); >diff -u synaptics-0.14.6.orig/synaptics.h synaptics-0.14.6/synaptics.h >--- synaptics-0.14.6.orig/synaptics.h 2006-07-15 17:54:29.000000000 +0200 >+++ synaptics-0.14.6/synaptics.h 2007-09-07 15:10:12.409829887 +0200 >@@ -226,5 +226,11 @@ > > #endif /* SYNAPTICS_PRIVATE */ > >+/* Previously found in xf86Xinput.h */ >+#ifdef DBG >+#undef DBG >+#endif >+ >+#define DBG(lvl, f) {if ((lvl) <= xf86GetVerbosity()) f;} > > #endif /* _SYNAPTICS_H_ */ >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 191899
: 130442