[xorg-x11-drv-synaptics] today's git snapshot

[Peter Hutterer]

commit 729f26eabc99147d8394b4645f61c80d5fe94d96
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu Aug 19 14:46:35 2010 +1000

    today's git snapshot
    
    - synaptics-1.2.99.1-increase-accel-factor.patch: increase default accel
      factor to something more useful (#621591)
    - drop unused patches

 .gitignore                                     |    1 +
 sources                                        |    2 +-
 synaptics-1.1.0-synclient-64.patch             |   57 ---------
 synaptics-1.2.2-clickfinger-defaults.patch     |   45 -------
 synaptics-1.2.2-clickpad-support.patch         |  162 ------------------------
 synaptics-1.2.99.1-increase-accel-factor.patch |   33 +++++
 xorg-x11-drv-synaptics.spec                    |   13 ++-
 7 files changed, 46 insertions(+), 267 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 86a1740..3774832 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 xf86-input-synaptics-20100617.tar.bz2
+xf86-input-synaptics-20100819.tar.bz2
diff --git a/sources b/sources
index c7a3197..917901a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d66fea691339fb13270983e5f76f836c  xf86-input-synaptics-20100617.tar.bz2
+3c41661adfb4b55ea3c5d52ba15d5821  xf86-input-synaptics-20100819.tar.bz2
diff --git a/synaptics-1.2.99.1-increase-accel-factor.patch b/synaptics-1.2.99.1-increase-accel-factor.patch
new file mode 100644
index 0000000..3288902
--- /dev/null
+++ b/synaptics-1.2.99.1-increase-accel-factor.patch
@@ -0,0 +1,33 @@
+From b969d52ee8d1e1715bbc4cc71509799e3071fbcc Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Thu, 19 Aug 2010 14:25:29 +1000
+Subject: [PATCH] Increase the default acceleration factor.
+
+With 4e0e53fcba6fd99d458df1905d055d63360155c0 the driver got it's own
+acceleration mechanism. This slowed down the pointer movement a lot,
+especially on ALPS touchpads. Increase the default acceleration factor to
+accommodate for this.
+
+The number itself is chosen through guesswork and informal tests.
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ src/synaptics.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/synaptics.c b/src/synaptics.c
+index 3344d75..9d0bf14 100644
+--- a/src/synaptics.c
++++ b/src/synaptics.c
+@@ -455,7 +455,7 @@ static void set_default_parameters(LocalDevicePtr local)
+     tapMove = diag * .044;
+     edgeMotionMinSpeed = 1;
+     edgeMotionMaxSpeed = diag * .080;
+-    accelFactor = 50.0 / diag;
++    accelFactor = 200.0 / diag; /* trial-and-error */
+ 
+     range = priv->maxp - priv->minp;
+ 
+-- 
+1.7.2.1
+
diff --git a/xorg-x11-drv-synaptics.spec b/xorg-x11-drv-synaptics.spec
index faffdae..8dc32ad 100644
--- a/xorg-x11-drv-synaptics.spec
+++ b/xorg-x11-drv-synaptics.spec
@@ -2,12 +2,12 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir %{moduledir}/input
 
-%define gitdate 20100617
+%define gitdate 20100819
 
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 Synaptics touchpad input driver
 Version:        1.2.99.1
-Release:        3%{?gitdate:.%{gitdate}}%{?dist}
+Release:        4%{?gitdate:.%{gitdate}}%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -22,6 +22,8 @@ Source1:        50-synaptics.conf
 Source2:        make-git-snapshot.sh
 Source3:        70-touchpad-quirks.rules
 
+Patch01:        synaptics-1.2.99.1-increase-accel-factor.patch
+
 ExcludeArch:    s390 s390x
 
 BuildRequires:  libtool pkgconfig
@@ -76,6 +78,7 @@ Features:
 
 %prep
 %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
+%patch01 -p1
 
 %build
 autoreconf -v --install --force || exit 1
@@ -131,6 +134,12 @@ Development files for the Synaptics TouchPad for X.Org.
 
 
 %changelog
+* Thu Aug 19 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.2.99.1-4.20100819
+- today's git snapshot
+- synaptics-1.2.99.1-increase-accel-factor.patch: increase default accel
+  factor to something more useful (#621591)
+- drop unused patches
+
 * Thu Jul 08 2010 Adam Jackson <ajax at redhat.com> 1.2.99.1-3
 - Install COPYING