[arch-commits] Commit in xf86-input-synaptics/repos (8 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Thu Mar 15 17:47:07 UTC 2012
Date: Thursday, March 15, 2012 @ 13:47:06
Author: andyrtr
Revision: 153531
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
xf86-input-synaptics/repos/testing-i686/
xf86-input-synaptics/repos/testing-i686/10-synaptics.conf
(from rev 153530, xf86-input-synaptics/trunk/10-synaptics.conf)
xf86-input-synaptics/repos/testing-i686/PKGBUILD
(from rev 153530, xf86-input-synaptics/trunk/PKGBUILD)
xf86-input-synaptics/repos/testing-i686/synaptics-Fix-inverted-circular-scrolling-direction.patch
(from rev 153530, xf86-input-synaptics/trunk/synaptics-Fix-inverted-circular-scrolling-direction.patch)
xf86-input-synaptics/repos/testing-x86_64/
xf86-input-synaptics/repos/testing-x86_64/10-synaptics.conf
(from rev 153530, xf86-input-synaptics/trunk/10-synaptics.conf)
xf86-input-synaptics/repos/testing-x86_64/PKGBUILD
(from rev 153530, xf86-input-synaptics/trunk/PKGBUILD)
xf86-input-synaptics/repos/testing-x86_64/synaptics-Fix-inverted-circular-scrolling-direction.patch
(from rev 153530, xf86-input-synaptics/trunk/synaptics-Fix-inverted-circular-scrolling-direction.patch)
--------------------------------------------------------------------------+
testing-i686/10-synaptics.conf | 9 +
testing-i686/PKGBUILD | 46 ++++++++++
testing-i686/synaptics-Fix-inverted-circular-scrolling-direction.patch | 40 ++++++++
testing-x86_64/10-synaptics.conf | 9 +
testing-x86_64/PKGBUILD | 46 ++++++++++
testing-x86_64/synaptics-Fix-inverted-circular-scrolling-direction.patch | 40 ++++++++
6 files changed, 190 insertions(+)
Copied: xf86-input-synaptics/repos/testing-i686/10-synaptics.conf (from rev 153530, xf86-input-synaptics/trunk/10-synaptics.conf)
===================================================================
--- testing-i686/10-synaptics.conf (rev 0)
+++ testing-i686/10-synaptics.conf 2012-03-15 17:47:06 UTC (rev 153531)
@@ -0,0 +1,9 @@
+Section "InputClass"
+ Identifier "touchpad catchall"
+ Driver "synaptics"
+ MatchIsTouchpad "on"
+ MatchDevicePath "/dev/input/event*"
+ Option "TapButton1" "1"
+ Option "TapButton2" "2"
+ Option "TapButton3" "3"
+EndSection
Copied: xf86-input-synaptics/repos/testing-i686/PKGBUILD (from rev 153530, xf86-input-synaptics/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-03-15 17:47:06 UTC (rev 153531)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: Thomas Bächler <thomas at archlinux.org>
+# Contributor: Alexander Baldeck <alexander at archlinux.org>
+
+pkgname=xf86-input-synaptics
+pkgver=1.5.99.901
+pkgrel=2
+pkgdesc="Synaptics driver for notebook touchpads"
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://xorg.freedesktop.org/"
+depends=('libxtst' 'mtdev')
+makedepends=('xorg-server-devel>=1.11.99.902' 'libxi' 'libx11')
+conflicts=('xorg-server<1.11.99.902')
+replaces=('synaptics')
+provides=('synaptics')
+conflicts=('synaptics')
+groups=('xorg-drivers' 'xorg')
+options=(!libtool)
+backup=('etc/X11/xorg.conf.d/10-synaptics.conf')
+source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+ 10-synaptics.conf
+ synaptics-Fix-inverted-circular-scrolling-direction.patch)
+sha1sums=('8836b1c2bf443b2c11f38457e203c5309698d9d0'
+ '68e1f4ef5e1038231d210eb422fa4d18c5922f0f'
+ '2e35cde5db6c435f612a5c6802f33aca8ba1b6bb')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i ${srcdir}/synaptics-Fix-inverted-circular-scrolling-direction.patch
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
+ install -m644 "${srcdir}/10-synaptics.conf" "${pkgdir}/etc/X11/xorg.conf.d/"
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+
+ rm -rf "${pkgdir}/usr/share/X11"
+}
Copied: xf86-input-synaptics/repos/testing-i686/synaptics-Fix-inverted-circular-scrolling-direction.patch (from rev 153530, xf86-input-synaptics/trunk/synaptics-Fix-inverted-circular-scrolling-direction.patch)
===================================================================
--- testing-i686/synaptics-Fix-inverted-circular-scrolling-direction.patch (rev 0)
+++ testing-i686/synaptics-Fix-inverted-circular-scrolling-direction.patch 2012-03-15 17:47:06 UTC (rev 153531)
@@ -0,0 +1,40 @@
+From patchwork Wed Mar 14 03:27:29 2012
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+Subject: [synaptics] Fix inverted circular scrolling direction
+Date: Wed, 14 Mar 2012 03:27:29 -0000
+From: Peter Hutterer <peter.hutterer at who-t.net>
+X-Patchwork-Id: 9512
+Message-Id: <20120314032729.GA16614 at yabbi.bne.redhat.com>
+To: "X.Org Devel List" <xorg-devel at lists.freedesktop.org>
+Cc: Thomas =?iso-8859-1?Q?B=E4chler?= <thomas at archlinux.org>
+
+Introduced in 26831a6eeac6762ad4d99532f62ebbab0827de10.
+In said commit, the old-style button events were changed to delta
+accumulation. Alas, for circular scrolling, a positive delta is up whereas
+for everything else a positive delta is down.
+
+Reported-by: Thomas Bächler <thomas at archlinux.org>
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+
+---
+src/synaptics.c | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/synaptics.c b/src/synaptics.c
+index fa46f0d..c9609cd 100644
+--- a/src/synaptics.c
++++ b/src/synaptics.c
+@@ -2554,9 +2554,9 @@ HandleScrolling(SynapticsPrivate *priv, struct SynapticsHwState *hw,
+ double diff = diffa(priv->scroll.last_a, angle(priv, hw->x, hw->y));
+ if (delta >= 0.005 && diff != 0.0) {
+ if (priv->circ_scroll_vert)
+- priv->scroll.delta_y += diff / delta * para->scroll_dist_vert;
++ priv->scroll.delta_y -= diff / delta * para->scroll_dist_vert;
+ else
+- priv->scroll.delta_x += diff / delta * para->scroll_dist_horiz;;
++ priv->scroll.delta_x -= diff / delta * para->scroll_dist_horiz;;
+ priv->scroll.last_a = angle(priv, hw->x, hw->y);
+ DBG(priv, 10, "circ scoll delta: %.2f diff %.2f angle %.2f\n", delta, diff, priv->scroll.last_a);
+ }
Copied: xf86-input-synaptics/repos/testing-x86_64/10-synaptics.conf (from rev 153530, xf86-input-synaptics/trunk/10-synaptics.conf)
===================================================================
--- testing-x86_64/10-synaptics.conf (rev 0)
+++ testing-x86_64/10-synaptics.conf 2012-03-15 17:47:06 UTC (rev 153531)
@@ -0,0 +1,9 @@
+Section "InputClass"
+ Identifier "touchpad catchall"
+ Driver "synaptics"
+ MatchIsTouchpad "on"
+ MatchDevicePath "/dev/input/event*"
+ Option "TapButton1" "1"
+ Option "TapButton2" "2"
+ Option "TapButton3" "3"
+EndSection
Copied: xf86-input-synaptics/repos/testing-x86_64/PKGBUILD (from rev 153530, xf86-input-synaptics/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-03-15 17:47:06 UTC (rev 153531)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: Thomas Bächler <thomas at archlinux.org>
+# Contributor: Alexander Baldeck <alexander at archlinux.org>
+
+pkgname=xf86-input-synaptics
+pkgver=1.5.99.901
+pkgrel=2
+pkgdesc="Synaptics driver for notebook touchpads"
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://xorg.freedesktop.org/"
+depends=('libxtst' 'mtdev')
+makedepends=('xorg-server-devel>=1.11.99.902' 'libxi' 'libx11')
+conflicts=('xorg-server<1.11.99.902')
+replaces=('synaptics')
+provides=('synaptics')
+conflicts=('synaptics')
+groups=('xorg-drivers' 'xorg')
+options=(!libtool)
+backup=('etc/X11/xorg.conf.d/10-synaptics.conf')
+source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+ 10-synaptics.conf
+ synaptics-Fix-inverted-circular-scrolling-direction.patch)
+sha1sums=('8836b1c2bf443b2c11f38457e203c5309698d9d0'
+ '68e1f4ef5e1038231d210eb422fa4d18c5922f0f'
+ '2e35cde5db6c435f612a5c6802f33aca8ba1b6bb')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i ${srcdir}/synaptics-Fix-inverted-circular-scrolling-direction.patch
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
+ install -m644 "${srcdir}/10-synaptics.conf" "${pkgdir}/etc/X11/xorg.conf.d/"
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+
+ rm -rf "${pkgdir}/usr/share/X11"
+}
Copied: xf86-input-synaptics/repos/testing-x86_64/synaptics-Fix-inverted-circular-scrolling-direction.patch (from rev 153530, xf86-input-synaptics/trunk/synaptics-Fix-inverted-circular-scrolling-direction.patch)
===================================================================
--- testing-x86_64/synaptics-Fix-inverted-circular-scrolling-direction.patch (rev 0)
+++ testing-x86_64/synaptics-Fix-inverted-circular-scrolling-direction.patch 2012-03-15 17:47:06 UTC (rev 153531)
@@ -0,0 +1,40 @@
+From patchwork Wed Mar 14 03:27:29 2012
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+Subject: [synaptics] Fix inverted circular scrolling direction
+Date: Wed, 14 Mar 2012 03:27:29 -0000
+From: Peter Hutterer <peter.hutterer at who-t.net>
+X-Patchwork-Id: 9512
+Message-Id: <20120314032729.GA16614 at yabbi.bne.redhat.com>
+To: "X.Org Devel List" <xorg-devel at lists.freedesktop.org>
+Cc: Thomas =?iso-8859-1?Q?B=E4chler?= <thomas at archlinux.org>
+
+Introduced in 26831a6eeac6762ad4d99532f62ebbab0827de10.
+In said commit, the old-style button events were changed to delta
+accumulation. Alas, for circular scrolling, a positive delta is up whereas
+for everything else a positive delta is down.
+
+Reported-by: Thomas Bächler <thomas at archlinux.org>
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+
+---
+src/synaptics.c | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/synaptics.c b/src/synaptics.c
+index fa46f0d..c9609cd 100644
+--- a/src/synaptics.c
++++ b/src/synaptics.c
+@@ -2554,9 +2554,9 @@ HandleScrolling(SynapticsPrivate *priv, struct SynapticsHwState *hw,
+ double diff = diffa(priv->scroll.last_a, angle(priv, hw->x, hw->y));
+ if (delta >= 0.005 && diff != 0.0) {
+ if (priv->circ_scroll_vert)
+- priv->scroll.delta_y += diff / delta * para->scroll_dist_vert;
++ priv->scroll.delta_y -= diff / delta * para->scroll_dist_vert;
+ else
+- priv->scroll.delta_x += diff / delta * para->scroll_dist_horiz;;
++ priv->scroll.delta_x -= diff / delta * para->scroll_dist_horiz;;
+ priv->scroll.last_a = angle(priv, hw->x, hw->y);
+ DBG(priv, 10, "circ scoll delta: %.2f diff %.2f angle %.2f\n", delta, diff, priv->scroll.last_a);
+ }
More information about the arch-commits
mailing list