From b7f1ecc33238537198c62cafecd10417ed99e4ff Mon Sep 17 00:00:00 2001
From: Stefan Schweizer <genstef@gentoo.org>
Date: Sun, 9 Sep 2007 20:20:16 +0000
Subject: Fix synaptics api for xorg-server-1.4 thanks to Geaaru
<geaaru@gmail.com> in bug 191899 (Portage version: 2.1.3.9)
---
x11-drivers/synaptics/ChangeLog | 7 ++-
.../synaptics/files/synaptics_input_api.diff | 62 ++++++++++++++++++++++
x11-drivers/synaptics/synaptics-0.14.6.ebuild | 3 +-
3 files changed, 70 insertions(+), 2 deletions(-)
create mode 100644 x11-drivers/synaptics/files/synaptics_input_api.diff
(limited to 'x11-drivers')
diff --git a/x11-drivers/synaptics/ChangeLog b/x11-drivers/synaptics/ChangeLog
index 4467b9db26a0..8d79ba853652 100644
--- a/x11-drivers/synaptics/ChangeLog
+++ b/x11-drivers/synaptics/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-drivers/synaptics
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/ChangeLog,v 1.27 2007/07/22 02:34:11 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/ChangeLog,v 1.28 2007/09/09 20:20:15 genstef Exp $
+
+ 09 Sep 2007; Stefan Schweizer <genstef@gentoo.org>
+ +files/synaptics_input_api.diff, synaptics-0.14.6.ebuild:
+ Fix synaptics api for xorg-server-1.4 thanks to Geaaru <geaaru@gmail.com> in
+ bug 191899
22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
synaptics-0.14.5-r1.ebuild, synaptics-0.14.6.ebuild:
diff --git a/x11-drivers/synaptics/files/synaptics_input_api.diff b/x11-drivers/synaptics/files/synaptics_input_api.diff
new file mode 100644
index 000000000000..f43cf0b308ab
--- /dev/null
+++ b/x11-drivers/synaptics/files/synaptics_input_api.diff
@@ -0,0 +1,62 @@
+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_ */
diff --git a/x11-drivers/synaptics/synaptics-0.14.6.ebuild b/x11-drivers/synaptics/synaptics-0.14.6.ebuild
index 2c5623835bbd..169bd3fb225d 100644
--- a/x11-drivers/synaptics/synaptics-0.14.6.ebuild
+++ b/x11-drivers/synaptics/synaptics-0.14.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/synaptics-0.14.6.ebuild,v 1.7 2007/07/22 02:34:11 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/synaptics-0.14.6.ebuild,v 1.8 2007/09/09 20:20:15 genstef Exp $
inherit toolchain-funcs eutils
@@ -27,6 +27,7 @@ src_unpack() {
-e "s:CC = gcc:CC = $(tc-getCC):g" \
-e "s:CDEBUGFLAGS = -O2:CDEBUGFLAGS = ${CFLAGS}:g" \
${S}/Makefile
+ epatch ${FILESDIR}/synaptics_input_api.diff
}
src_compile() {
--
cgit v1.2.3-65-gdbad