Fix acceleration on xorg-server-1.12, thanks to anarchy for testing.

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

4 files changed, 96 insertions, 2 deletions

diff --git a/x11-drivers/xf86-input-synaptics/ChangeLog b/x11-drivers/xf86-input-synaptics/ChangeLog
index 98ffab42f03b..95e988165508 100644
--- a/x11-drivers/xf86-input-synaptics/ChangeLog
+++ b/x11-drivers/xf86-input-synaptics/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-input-synaptics
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/ChangeLog,v 1.67 2012/03/18 19:33:44 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/ChangeLog,v 1.68 2012/03/18 22:27:42 chithanh Exp $
+
+*xf86-input-synaptics-1.5.0-r1 (18 Mar 2012)
+
+  18 Mar 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xf86-input-synaptics-1.5.0-abi-14-acceleration.patch,
+  +xf86-input-synaptics-1.5.0-r1.ebuild:
+  Fix acceleration on xorg-server-1.12, thanks to anarchy for testing.
 
   18 Mar 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   +files/xf86-input-synaptics-1.5.0-abi-lt14.patch,
diff --git a/x11-drivers/xf86-input-synaptics/Manifest b/x11-drivers/xf86-input-synaptics/Manifest
index cc256cf570d9..021a5aca9747 100644
--- a/x11-drivers/xf86-input-synaptics/Manifest
+++ b/x11-drivers/xf86-input-synaptics/Manifest
@@ -1,3 +1,4 @@
+AUX xf86-input-synaptics-1.5.0-abi-14-acceleration.patch 1709 RMD160 3d06f6a6934c37912d1a80032f4cf168c7330e40 SHA1 25d14935efe7e04938a4a434107e45991cf3595c SHA256 27c88d166203ffb7350d6f554f04a07d7a890ca86670d4976864f803da6f25ee
 AUX xf86-input-synaptics-1.5.0-abi-lt14.patch 1179 RMD160 52abb2e8e51e68ed3fb7af3d04154f01ca5392b9 SHA1 ce51ddeb0398b0ee7afdc1dbe7aeb38cd524ff2e SHA256 6e4a7b126c1f860f72965f42f8a0959cfeb954e1c0035d8e575fa14e5aaeee78
 AUX xf86-input-synaptics-1.5.0-xf86optionrec.patch 8922 RMD160 56ca1d3dc386ea05e970e8fe77d6f0f4c4ff7b76 SHA1 60d255d80dd22cc668144dffc0941249dc7a0751 SHA256 460f24f9b5d6d86a2fa3a1ac6e481cef8ac737474ac9ca6f94bfac63db769ab8
 AUX xf86-input-synaptics-1.5.0-xf86setstroption.patch 2730 RMD160 7fba1b303c2adf60a5dc2cf254d679e91e3654ad SHA1 195d3615f9119a4d0249b8a6adc7bcb8a47aad84 SHA256 27cb494038bb120a121843a4ac4c19853cffa92d5a7e494334c335ccdab56d21
@@ -7,7 +8,8 @@ DIST xf86-input-synaptics-1.5.0.tar.bz2 431123 RMD160 90d70ea2e0cc7605e137375cb0
 DIST xf86-input-synaptics-1.5.99.901.tar.bz2 416733 RMD160 cf63de4d57b6f622ef69adb0a222db6ba0999bb6 SHA1 8836b1c2bf443b2c11f38457e203c5309698d9d0 SHA256 da37ec8100dab7f370bcc06bec664298b6c16f39c0b8b900e53024d3d0a4a526
 EBUILD xf86-input-synaptics-1.3.0.ebuild 1003 RMD160 a41c2237892ce61ed64e98d8160845800d5af871 SHA1 7ecf50b1526daf2478373b4ebe7cd9976b0fe380 SHA256 c4525cd9440f908fbb6d082ae0d552a27fc77e525e18a7795c0a8d5bf2677584
 EBUILD xf86-input-synaptics-1.4.0.ebuild 968 RMD160 448c1028e6c8f813f23722ff83a9cf62e367d852 SHA1 d35e904e54267bdbaa3f21d9ce7ce37cb63f7038 SHA256 a731c3fdc3faf1b7c0281b8caeac722cb0d1c4f19f68410377d45d0c1e08c0e8
+EBUILD xf86-input-synaptics-1.5.0-r1.ebuild 1159 RMD160 ea17d060c0bafaa3d9e38ec4d216d5737133449c SHA1 6c633bc2a061f1a1d7f48ae5277b2a237e1149a6 SHA256 1f87860464cadd5ec571750e1cc3336aa842583d568d84977508a536e1605828
 EBUILD xf86-input-synaptics-1.5.0.ebuild 1103 RMD160 675e337ee32dd3832d1fa1f741fef0ec3941c568 SHA1 cba1c21f124a88721b56c4cef09183df782ceba8 SHA256 1957f4e722afd1f5a6ab00b79fa30652db467ce9c01ea53cc307070cc294db88
 EBUILD xf86-input-synaptics-1.5.99.901.ebuild 993 RMD160 12e74af59cdfcb922cf19eaacf7e7f804aa1e747 SHA1 4c543256fe15510247544c432e4b6603b9176e91 SHA256 012a373761afb3c11608536abb1c158f2df64ef5eab67038390cae47fc1e3154
-MISC ChangeLog 13666 RMD160 952a99b71fdc97b1c084ccc0dbabdfeaf6194b6c SHA1 6d9cc13075bcef589fbb509ec5ba21f945b3d7b8 SHA256 bf599b0d20179f7bfef12fabfa73eab4cbbcc9074fb68f7449d3b670049236bc
+MISC ChangeLog 13957 RMD160 47020bef88640e07c096ea98f9dc98bbb22ff307 SHA1 2cedb06cd34b0e8f4810c5e8f2a6870e08634723 SHA256 eab9e8baea8d5495ff6c03ab4fbfb943f38f54031b6cec411a319d9a75983d2e
 MISC metadata.xml 397 RMD160 c01cf603d8ef6fc1fd03c04008ea2c62cbfab2d3 SHA1 a008e54ae2bf5800719e4d2a67ceae6b913a7f52 SHA256 fece0557310dc7deb0f0dc3a7a13b9a33b1b9ad18895eedc493fc1a488573bd4
diff --git a/x11-drivers/xf86-input-synaptics/files/xf86-input-synaptics-1.5.0-abi-14-acceleration.patch b/x11-drivers/xf86-input-synaptics/files/xf86-input-synaptics-1.5.0-abi-14-acceleration.patch
new file mode 100644
index 000000000000..61a0680eec26
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/files/xf86-input-synaptics-1.5.0-abi-14-acceleration.patch
@@ -0,0 +1,42 @@
+From 7c0361d4ec6b1f1325cb6551d0ee2e7f5cfae15b Mon Sep 17 00:00:00 2001
+From: Daniel Stone <daniel@fooishbar.org>
+Date: Thu, 09 Jun 2011 19:03:05 +0000
+Subject: Adjust acceleration scheme for input ABI v14
+
+v14 wants doubles, rather than floats, from acceleration schemes.
+
+Signed-off-by: Daniel Stone <daniel@fooishbar.org>
+Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+diff --git a/src/synaptics.c b/src/synaptics.c
+index c44d1f7..e05147e 100644
+--- a/src/synaptics.c
++++ b/src/synaptics.c
+@@ -593,11 +593,22 @@ static void set_default_parameters(InputInfoPtr pInfo)
+     }
+ }
+ 
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 14
++static double SynapticsAccelerationProfile(DeviceIntPtr dev,
++                                           DeviceVelocityPtr vel,
++                                           double velocity,
++                                           double thr,
++                                           double acc) {
++#else
+ static float SynapticsAccelerationProfile(DeviceIntPtr dev,
+                                           DeviceVelocityPtr vel,
+-                                          float velocity,
+-                                          float thr,
+-                                          float acc) {
++                                          float velocity_f,
++                                          float thr_f,
++                                          float acc_f) {
++    double velocity = velocity_f;
++    double thr = thr_f;
++    double acc = acc_f;
++#endif
+     InputInfoPtr pInfo = dev->public.devicePrivate;
+     SynapticsPrivate *priv = (SynapticsPrivate *) (pInfo->private);
+     SynapticsParameters* para = &priv->synpara;
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.5.0-r1.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.5.0-r1.ebuild
new file mode 100644
index 000000000000..e64d774f7961
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.5.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.5.0-r1.ebuild,v 1.1 2012/03/18 22:27:42 chithanh Exp $
+
+EAPI=4
+
+inherit linux-info xorg-2
+
+DESCRIPTION="Driver for Synaptics touchpads"
+HOMEPAGE="http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=x11-base/xorg-server-1.8
+	>=x11-libs/libXi-1.2
+	>=x11-libs/libXtst-1.1.0"
+DEPEND="${RDEPEND}
+	>=x11-proto/recordproto-1.14"
+
+DOCS=( "README" )
+
+pkg_pretend() {
+	linux-info_pkg_setup
+	# Just a friendly warning
+	if ! linux_config_exists \
+			|| ! linux_chkconfig_present INPUT_EVDEV; then
+		echo
+		ewarn "This driver requires event interface support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Input device support --->"
+		ewarn "      <*>     Event interface"
+		echo
+	fi
+}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.0-xf86optionrec.patch
+	"${FILESDIR}"/${PN}-1.5.0-abi-14-acceleration.patch
+	"${FILESDIR}"/${PN}-1.5.0-xf86setstroption.patch
+	"${FILESDIR}"/${PN}-1.5.0-abi-lt14.patch
+)