Apply configurable polling interval patch from Novell so that syndaemon doesn't wake up CPU so often. Bug 216679, thanks to Roland Tapken, Thomas Kirchner and Krister Bäckman.

Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.26-rc3 x86_64

4 files changed, 171 insertions, 12 deletions

diff --git a/x11-drivers/synaptics/ChangeLog b/x11-drivers/synaptics/ChangeLog
index a1f5e8371223..7c4df65436cc 100644
--- a/x11-drivers/synaptics/ChangeLog
+++ b/x11-drivers/synaptics/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-drivers/synaptics
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/ChangeLog,v 1.36 2008/04/07 15:17:56 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/ChangeLog,v 1.37 2008/07/30 13:13:24 drac Exp $
+
+*synaptics-0.14.6-r3 (30 Jul 2008)
+
+  30 Jul 2008; Samuli Suominen <drac@gentoo.org>
+  +files/synaptics-0.14.6-configurable_polling_interval.patch,
+  +synaptics-0.14.6-r3.ebuild:
+  Apply configurable polling interval patch from Novell so that syndaemon
+  doesn't wake up CPU so often. Bug 216679, thanks to Roland Tapken, Thomas
+  Kirchner and Krister Bäckman.
 
   07 Apr 2008; Doug Goldstein <cardoe@gentoo.org> synaptics-0.14.6.ebuild,
   synaptics-0.14.6-r1.ebuild, synaptics-0.14.6-r2.ebuild:
diff --git a/x11-drivers/synaptics/Manifest b/x11-drivers/synaptics/Manifest
index 891533d7ce0d..d5ff5eafc7ac 100644
--- a/x11-drivers/synaptics/Manifest
+++ b/x11-drivers/synaptics/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 11-x11-synaptics.fdi 460 RMD160 973e332bd506d0160e573a028115bf3c0924e334 SHA1 77cc42785faecc3fb9b33ffac0b433ba9ba03808 SHA256 51c0da7a8e7048a753afa83d2d81e62fa8b61e0a1718083a2cc110767a76a8a3
 AUX rc.conf 330 RMD160 75825d70b749ae4e8b59b4066428d73815b19d70 SHA1 639736e2b424fcd3d6a78d0e6a3f90bed49ee6f4 SHA256 1776915a739c2f1432ab1602717cac1ff2464160a9d33d20124853a93605f6a5
 AUX rc.init 440 RMD160 82c30d248ef010cdd41600e3b19878b9f2ea6ff0 SHA1 cfb299682f9ec85340950917cbfebe5387080b32 SHA256 314d7d7c7d20608a398b439427e9c74cfaf2521996abc50af8a7963f1e7f22b8
@@ -8,6 +5,7 @@ AUX synaptics-0.14.4-r2-makefile-fpic.patch 681 RMD160 492189b170c19043e35e28d9d
 AUX synaptics-0.14.4-r2-makefile.patch 531 RMD160 64ac6a8bd06befe99f126a1cad08028c38714c8b SHA1 4bbc1f9bba91efdada4bedb7b4676dab0c42fccf SHA256 4797db102c69d06d56bdfb761308df5a2349bfa75c09383d3b67e3d6e4487ec9
 AUX synaptics-0.14.5-makefile-fpic.patch 604 RMD160 610b6f52382cab61d669c7ed126796a7ba0c96f2 SHA1 ff235d5ea1b20a4b19a5339fc31afeb88750f8d3 SHA256 bfe89f8ecae8a0af6e8b478ed29f5fe652bf3aa6016d6c41a7a678fc25f92c36
 AUX synaptics-0.14.5-xorg-7.1-compile-fix.patch 2249 RMD160 639955f8ae5162d4c3b4f527a6e6bb1cf4c0bb26 SHA1 0d59b2d11dbb94127ee843310e3badcaff6b61e1 SHA256 0de534613bd1df8b0b36f0387fcea858e463833bb6f4248b71c0975d7effae19
+AUX synaptics-0.14.6-configurable_polling_interval.patch 1880 RMD160 ca90cd33992df42c573547645633b30e377a146e SHA1 e3abb85af87ee6b3c356be635898840d42819c74 SHA256 f4ed2db4c2e20f703cebea778f8605187be0a84ba77fde0b69512c15462d697e
 AUX synaptics-0.14.x-gcc4-the-sentinels-have-attacked.patch 538 RMD160 aec4ddbe8c93439d2245aeea1909eeb0e9ee555f SHA1 985ee12c3b61cdb89c97d150a52da4df85e2f236 SHA256 81cd1a662faf37141ca1e731c0ef63ba493a99b2c794d8ceb9510a7367e4f97c
 AUX synaptics-fix-xinerama.patch 602 RMD160 128bc48024c04d789cc1393462e81c2dbe6bae5c SHA1 225993afe0f2ec6be5df7e132f60a92db0c54815 SHA256 8feb3ca55e1c476b068dda6b411ad6a317ac8fa4d3569fe38a0e5af14b8cb1c7
 AUX synaptics-fixeventgrab.diff 2826 RMD160 0888ceb9cb2847d336be4c267ee8a4f6aee76a1d SHA1 38de7f5c4c94f89e5170b4ff6306cc6b1d7fac84 SHA256 90f49ad2885202a23ad70e3630d712dc26249c4d3035cff2e0094de2f806dab8
@@ -18,13 +16,7 @@ DIST synaptics-0.14.6.tar.bz2 126833 RMD160 7a8b103aa314eb13dc512c663c501108cc24
 EBUILD synaptics-0.14.5-r1.ebuild 1353 RMD160 d3071d9aae10467cef885a291afe2d53bda4ed48 SHA1 c49b2b5d9053d8ea415d3cf27cf58927d9a8c87f SHA256 d51a03799fe941502ac0431976c543462e19983e9b8eb5d601b1d51131361929
 EBUILD synaptics-0.14.6-r1.ebuild 1496 RMD160 fc1ea964251ff6d90b36cac0ce18a7947cdf75ff SHA1 6c36eeedd7f42d6bf392679dcc6e0819b2b98d7d SHA256 3a7954671361955aa9bb6ed3432350a7959b2fb9be80b15a945de5cebfcf796b
 EBUILD synaptics-0.14.6-r2.ebuild 2668 RMD160 c9522389758831bff4a04ff378fd86a72b3fe224 SHA1 f2dbc5ffb0cee371e6a3e0f3f2f817ec48f1f0cf SHA256 8def1f5a331ebf7dda383fa8128d09879f7b27c700668f44577c6e7c4022d67d
+EBUILD synaptics-0.14.6-r3.ebuild 2801 RMD160 048a6e21e4e457bd532557588da70d46f44e0390 SHA1 941605c80fd23dbb91e59774f8047ecfbbe14431 SHA256 c42b7f6e0156383cd3c88cf1346a40ab041230b5739204980644fe8805c3c24b
 EBUILD synaptics-0.14.6.ebuild 1286 RMD160 5001b92fda3d0acf80d325611ebcc65f179b6028 SHA1 9364cda9afc70e1e2d6ce593c6bcf2b364fd155f SHA256 8a14d65bfdbb6f5b9ecae840ed5f6c2cd41c1821b8a5f35e2e9fb085ee2b3222
-MISC ChangeLog 16836 RMD160 c9b25025aaa528dcb2e1d1244a71050f0a9a87c9 SHA1 9c6e99ac7ce47af77b42474e60e1cca7427564ac SHA256 04bb13bee8478704f5e46b69153856eb30dc731ea0eb65712fb6adac5e31804a
+MISC ChangeLog 17197 RMD160 846544f04fb88310adf3f74e3ee1f2ca2bd481cd SHA1 1ed3c40ee205ba431fa549e0342c8b0d69e01825 SHA256 aaf94bac99f9df2b341f06bc0755cf0174003af1d042f273a954db1b4b52f095
 MISC metadata.xml 164 RMD160 063e280135023e17863dd0b1154787fbb13d98d1 SHA1 6b624c0de1c67e3014f357344afe6dbb818f64bd SHA256 8bb377723c4bb750b364a747cc43f6438cd13731e361728f416ab6f4928bcb58
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkf6O6oACgkQoeSe8B0zEfzRGACfTe6SZjSABXkFG/Z4QshMaCSk
-wqoAn1wTEwJ/5xOA1g4cdtjNiDOg+gOx
-=l1RU
------END PGP SIGNATURE-----
diff --git a/x11-drivers/synaptics/files/synaptics-0.14.6-configurable_polling_interval.patch b/x11-drivers/synaptics/files/synaptics-0.14.6-configurable_polling_interval.patch
new file mode 100644
index 000000000000..8c6ea279d140
--- /dev/null
+++ b/x11-drivers/synaptics/files/synaptics-0.14.6-configurable_polling_interval.patch
@@ -0,0 +1,58 @@
+--- ./syndaemon.c	2006-04-16 21:31:43.000000000 +0200
++++ ./syndaemon.c	2007-10-16 13:40:02.000000000 +0200
+@@ -43,9 +43,11 @@
+ static void
+ usage()
+ {
+-    fprintf(stderr, "Usage: syndaemon [-i idle-time] [-d] [-t] [-k]\n");
++    fprintf(stderr, "Usage: syndaemon [-i idle-time] [-m poll-delay] [-d] [-t] [-k]\n");
+     fprintf(stderr, "  -i How many seconds to wait after the last key press before\n");
+     fprintf(stderr, "     enabling the touchpad. (default is 2.0s)\n");
++    fprintf(stderr, "  -m How many milli-seconds to wait until next poll.\n");
++    fprintf(stderr, "     (default is 20ms)\n");
+     fprintf(stderr, "  -d Start as a daemon, ie in the background.\n");
+     fprintf(stderr, "  -p Create a pid file with the specified name.\n");
+     fprintf(stderr, "  -t Only disable tapping and scrolling, not mouse movements.\n");
+@@ -159,9 +161,8 @@
+ }
+ 
+ static void
+-main_loop(Display *display, double idle_time)
++main_loop(Display *display, double idle_time, int poll_delay)
+ {
+-    const int poll_delay = 20000;	    /* 20 ms */
+     double last_activity = 0.0;
+     double current_time;
+ 
+@@ -228,17 +229,21 @@
+ main(int argc, char *argv[])
+ {
+     double idle_time = 2.0;
++	int poll_delay = 20000;	    /* 20 ms */
+     Display *display;
+     int c;
+     int shmid;
+     int ignore_modifier_keys = 0;
+ 
+     /* Parse command line parameters */
+-    while ((c = getopt(argc, argv, "i:dtp:kK?")) != EOF) {
++    while ((c = getopt(argc, argv, "i:m:dtp:kK?")) != EOF) {
+ 	switch(c) {
+ 	case 'i':
+ 	    idle_time = atof(optarg);
+ 	    break;
++	case 'm':
++	    poll_delay = atoi(optarg) * 1000;
++	    break;
+ 	case 'd':
+ 	    background = 1;
+ 	    break;
+@@ -314,7 +319,7 @@
+     setup_keyboard_mask(display, ignore_modifier_keys);
+ 
+     /* Run the main loop */
+-    main_loop(display, idle_time);
++    main_loop(display, idle_time, poll_delay);
+ 
+     return 0;
+ }
diff --git a/x11-drivers/synaptics/synaptics-0.14.6-r3.ebuild b/x11-drivers/synaptics/synaptics-0.14.6-r3.ebuild
new file mode 100644
index 000000000000..fbd416b70f97
--- /dev/null
+++ b/x11-drivers/synaptics/synaptics-0.14.6-r3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2008 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-r3.ebuild,v 1.1 2008/07/30 13:13:24 drac Exp $
+
+inherit toolchain-funcs eutils linux-info
+
+IUSE="hal"
+
+DESCRIPTION="Driver for Synaptics touchpads"
+HOMEPAGE="http://w1.894.telia.com/~u89404340/touchpad/"
+SRC_URI="http://w1.894.telia.com/~u89404340/touchpad/files/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="x11-libs/libXext
+	 hal? ( sys-apps/hal )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-server
+	x11-proto/inputproto
+	>=sys-apps/sed-4"
+
+evdev-input_check() {
+	# Check kernel config for required event interface support (either
+	# built-in or as a module. Bug #134309.
+
+	ebegin "Checking kernel config for event device support"
+	linux_chkconfig_present INPUT_EVDEV
+	eend $?
+
+	if [[ $? -ne 0 ]] ; then
+		ewarn "Synaptics driver requires event interface support."
+		ewarn "Please enable the event interface in your kernel config."
+		ewarn "The option can be found at:"
+		ewarn
+		ewarn "  Device Drivers"
+		ewarn "    Input device support"
+		ewarn "      -*- Generic input layer"
+		ewarn "        <*> Event interface"
+		ewarn
+		ewarn "Then rebuild the kernel or install the module."
+		epause 5
+	fi
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	evdev-input_check
+}
+
+src_unpack() {
+	unpack ${A} ; cd "${S}"
+
+	# Switch up the CC and CFLAGS stuff.
+	sed -i \
+		-e "s:CC = gcc:CC = $(tc-getCC):g" \
+		-e "s:CDEBUGFLAGS = -O2:CDEBUGFLAGS = ${CFLAGS}:g" \
+		"${S}"/Makefile
+
+	# Fix grabbing of event devices so it will not stop working together with
+	# packages which grab their devices at their own like sys-apps/inputd does.
+	epatch "${FILESDIR}"/synaptics-fixeventgrab.diff
+
+	epatch "${FILESDIR}"/synaptics_input_api.diff
+
+	# Patch the Makefile to install the library as executable. Bug #215323.
+	epatch "${FILESDIR}"/synaptics-install-so-exec.patch
+
+	# Fix to handle multiple screens through Xinerama properly. Bug #206614.
+	epatch "${FILESDIR}"/synaptics-fix-xinerama.patch
+
+	# Adds configurable polling interval. Patch from Novell. Bug #216679.
+	epatch "${FILESDIR}"/${P}-configurable_polling_interval.patch
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	make \
+		DESTDIR="${D}" \
+		PREFIX=/usr \
+		MANDIR="${D}"/usr/share/man \
+		install || die
+
+	dodoc script/usbmouse script/usbhid alps.patch trouble-shooting.txt
+	dodoc COMPATIBILITY FILES INSTALL* NEWS TODO README*
+
+	# Stupid new daemon, didn't work for me because of shm issues
+	newinitd "${FILESDIR}"/rc.init syndaemon
+	newconfd "${FILESDIR}"/rc.conf syndaemon
+
+	if use hal ; then
+		# Have HAL assign this driver to supported touchpads.
+		insinto /usr/share/hal/fdi/policy/10osvendor
+		doins "${FILESDIR}"/11-x11-synaptics.fdi
+	fi
+}