Fix synaptics api for xorg-server-1.4 thanks to Geaaru <geaaru@gmail.com> in bug 191899

Package-Manager: portage-2.1.3.9

4 files changed, 82 insertions, 10 deletions

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/Manifest b/x11-drivers/synaptics/Manifest
index aec6399cdf89..226499995241 100644
--- a/x11-drivers/synaptics/Manifest
+++ b/x11-drivers/synaptics/Manifest
@@ -26,20 +26,24 @@ AUX synaptics-0.14.x-gcc4-the-sentinels-have-attacked.patch 538 RMD160 aec4ddbe8
 MD5 f2c484f02a746852ee1295ca1f092e8d files/synaptics-0.14.x-gcc4-the-sentinels-have-attacked.patch 538
 RMD160 aec4ddbe8c93439d2245aeea1909eeb0e9ee555f files/synaptics-0.14.x-gcc4-the-sentinels-have-attacked.patch 538
 SHA256 81cd1a662faf37141ca1e731c0ef63ba493a99b2c794d8ceb9510a7367e4f97c files/synaptics-0.14.x-gcc4-the-sentinels-have-attacked.patch 538
+AUX synaptics_input_api.diff 2181 RMD160 c7adda057b1591721abb4e2cba73e5fca1442361 SHA1 e0ac5c149a4a2899feacc1eaea27b78fa3c4a97b SHA256 0f415142a67a1a2cac51d9e67a33e7cadd9a20846b3f187db1ab5ff280b9c1f8
+MD5 0a537b564bcbde21c6b0c89b92e48d84 files/synaptics_input_api.diff 2181
+RMD160 c7adda057b1591721abb4e2cba73e5fca1442361 files/synaptics_input_api.diff 2181
+SHA256 0f415142a67a1a2cac51d9e67a33e7cadd9a20846b3f187db1ab5ff280b9c1f8 files/synaptics_input_api.diff 2181
 DIST synaptics-0.14.5.tar.bz2 126743 RMD160 815e95e3ae2ef2e60b55b7023e27619ca8c18893 SHA1 54788ea58ff0c07b3ae492e8dae9a2253b586af5 SHA256 aaad8ee83d5c6fd1e46be7201086645bd271281843751f850d345c7a9545b796
 DIST synaptics-0.14.6.tar.bz2 126833 RMD160 7a8b103aa314eb13dc512c663c501108cc24a574 SHA1 41443e253e73546657b40435c8c9bfa0a91662bc SHA256 f88b967258a0484b0aa02f26acfb31a70cc8afd4872608b7f81c44dc29ae8429
 EBUILD synaptics-0.14.5-r1.ebuild 1337 RMD160 2ff5f16ef23ece549d972c124750c5c827fcb9b6 SHA1 bc8b068e3b8b33c3cccd8d6ca9eb07c53c165ab3 SHA256 38f00f853ffd45d522bf985b96c4bb5695a796eb822f0792e245ee6ae72d1037
 MD5 0559509bd0eb5022479a52c7fdcde8a3 synaptics-0.14.5-r1.ebuild 1337
 RMD160 2ff5f16ef23ece549d972c124750c5c827fcb9b6 synaptics-0.14.5-r1.ebuild 1337
 SHA256 38f00f853ffd45d522bf985b96c4bb5695a796eb822f0792e245ee6ae72d1037 synaptics-0.14.5-r1.ebuild 1337
-EBUILD synaptics-0.14.6.ebuild 1207 RMD160 dcba0557045fb18bc6ffab8cc660d699e47f7a39 SHA1 efa5e3c2df45cc0efb34ac9cbb2b6f289728aa3d SHA256 6968c30d712c0034139755a36565e88bda68427e99c14c12c1b5f701d8fe57cd
-MD5 88e308dabb6d4a02522fae1f19ce6819 synaptics-0.14.6.ebuild 1207
-RMD160 dcba0557045fb18bc6ffab8cc660d699e47f7a39 synaptics-0.14.6.ebuild 1207
-SHA256 6968c30d712c0034139755a36565e88bda68427e99c14c12c1b5f701d8fe57cd synaptics-0.14.6.ebuild 1207
-MISC ChangeLog 14493 RMD160 7b15093dbd7df63669483b1a99f1cc28cb5589dc SHA1 b10973e47c3cb07b42370ec82562c514bec3632a SHA256 aba4ec102c1f4f16d4115fa8a39f22aedc085fe8c6ab13cf24b8028e3a6a218d
-MD5 74a018e823e5109c02ddf31fb07a0da9 ChangeLog 14493
-RMD160 7b15093dbd7df63669483b1a99f1cc28cb5589dc ChangeLog 14493
-SHA256 aba4ec102c1f4f16d4115fa8a39f22aedc085fe8c6ab13cf24b8028e3a6a218d ChangeLog 14493
+EBUILD synaptics-0.14.6.ebuild 1250 RMD160 693c6e1a99a3a1cd26435d3213068c96bc151f82 SHA1 2e7e8f7db46698032ea2809b15e2c8257535721b SHA256 c54bde83c40e12b17431adc8ff62043a1bbc63583617c3471879a188553f4ae5
+MD5 369b488bd9ff1955481e538a81c7a702 synaptics-0.14.6.ebuild 1250
+RMD160 693c6e1a99a3a1cd26435d3213068c96bc151f82 synaptics-0.14.6.ebuild 1250
+SHA256 c54bde83c40e12b17431adc8ff62043a1bbc63583617c3471879a188553f4ae5 synaptics-0.14.6.ebuild 1250
+MISC ChangeLog 14697 RMD160 22d94ade606040bce776d7c4fb77337ff3887e1b SHA1 0147557ebf51863d0f8c0c707a660efbe759cf25 SHA256 9a08971529375a21b6da616b4aeb743562867e206890cf12e677a94d455073cd
+MD5 5001168ae9e3b656296c9f1937be2fe5 ChangeLog 14697
+RMD160 22d94ade606040bce776d7c4fb77337ff3887e1b ChangeLog 14697
+SHA256 9a08971529375a21b6da616b4aeb743562867e206890cf12e677a94d455073cd ChangeLog 14697
 MISC metadata.xml 164 RMD160 063e280135023e17863dd0b1154787fbb13d98d1 SHA1 6b624c0de1c67e3014f357344afe6dbb818f64bd SHA256 8bb377723c4bb750b364a747cc43f6438cd13731e361728f416ab6f4928bcb58
 MD5 1f4a7b552c4631b5e826df2324e7f45e metadata.xml 164
 RMD160 063e280135023e17863dd0b1154787fbb13d98d1 metadata.xml 164
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() {