From fdb5de1b89d21e8b45a50a44983cb7d787f9b92e Mon Sep 17 00:00:00 2001 From: Chí-Thanh Christopher Nguyễn Date: Wed, 14 May 2014 16:42:20 +0000 Subject: Version bumps. Drop some old versions. (Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit) --- x11-drivers/xf86-input-synaptics/ChangeLog | 12 ++++- ...-synaptics-1.6.2-reset-num_active_touches.patch | 51 ---------------------- .../xf86-input-synaptics-1.6.2-r1.ebuild | 42 ------------------ .../xf86-input-synaptics-1.7.2.ebuild | 39 ----------------- .../xf86-input-synaptics-1.7.3.ebuild | 38 ---------------- .../xf86-input-synaptics-1.7.6.ebuild | 38 ++++++++++++++++ .../xf86-input-synaptics-1.8.0.ebuild | 38 ++++++++++++++++ 7 files changed, 87 insertions(+), 171 deletions(-) delete mode 100644 x11-drivers/xf86-input-synaptics/files/xf86-input-synaptics-1.6.2-reset-num_active_touches.patch delete mode 100644 x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.6.2-r1.ebuild delete mode 100644 x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.7.2.ebuild delete mode 100644 x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.7.3.ebuild create mode 100644 x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.7.6.ebuild create mode 100644 x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.8.0.ebuild (limited to 'x11-drivers') diff --git a/x11-drivers/xf86-input-synaptics/ChangeLog b/x11-drivers/xf86-input-synaptics/ChangeLog index b6498d2b4b0f..9ea1c99ef021 100644 --- a/x11-drivers/xf86-input-synaptics/ChangeLog +++ b/x11-drivers/xf86-input-synaptics/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for x11-drivers/xf86-input-synaptics # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/ChangeLog,v 1.103 2014/04/16 07:44:06 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/ChangeLog,v 1.104 2014/05/14 16:42:20 chithanh Exp $ + +*xf86-input-synaptics-1.7.6 (14 May 2014) +*xf86-input-synaptics-1.8.0 (14 May 2014) + + 14 May 2014; Chí-Thanh Christopher Nguyễn + +xf86-input-synaptics-1.7.6.ebuild, +xf86-input-synaptics-1.8.0.ebuild, + -files/xf86-input-synaptics-1.6.2-reset-num_active_touches.patch, + -xf86-input-synaptics-1.6.2-r1.ebuild, -xf86-input-synaptics-1.7.2.ebuild, + -xf86-input-synaptics-1.7.3.ebuild: + Version bumps. Drop some old versions. 16 Apr 2014; Agostino Sarubbo xf86-input-synaptics-1.7.4.ebuild: diff --git a/x11-drivers/xf86-input-synaptics/files/xf86-input-synaptics-1.6.2-reset-num_active_touches.patch b/x11-drivers/xf86-input-synaptics/files/xf86-input-synaptics-1.6.2-reset-num_active_touches.patch deleted file mode 100644 index 9493ff6b5f95..000000000000 --- a/x11-drivers/xf86-input-synaptics/files/xf86-input-synaptics-1.6.2-reset-num_active_touches.patch +++ /dev/null @@ -1,51 +0,0 @@ -From eae444eb1a85d2401501d29f9a6c654c046f806b Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Thu, 30 Aug 2012 06:38:38 +0000 -Subject: Reset num_active_touches on DeviceOff (#52496) - -When disabling the device, reset num_active_touches to zero. Otherwise, -num_active_touches stays at the value it was on DeviceOff(). Future touches -add to that value until the index may go past priv->open_slots[]. -That causes spurious memory corruption on touch ends. - -And as of 55fc42e7c9b4948cadd4f98ef7b6a3b12e268e3e we ignore pre-existing -touches anyway. - -Test-case: -- place num_touches fingers on the touchpad -- xinput disable -- lift fingers -- xinput enable -- place finger on device, num_active_touches is now (num_touches + 1) - -X.Org Bug 52496 - -Signed-off-by: Peter Hutterer -Reviewed-by: Chase Douglas -(cherry picked from commit a245d42f53096b1ae81e6702729f97ca508e5b5b) - -Conflicts: - src/synaptics.c ---- -diff --git a/src/synaptics.c b/src/synaptics.c -index cd9f936..a28e984 100644 ---- a/src/synaptics.c -+++ b/src/synaptics.c -@@ -1154,6 +1154,7 @@ SynapticsReset(SynapticsPrivate * priv) - priv->prev_z = 0; - priv->prevFingers = 0; - #ifdef HAVE_MULTITOUCH -+ priv->num_active_touches = 0; - memset(priv->open_slots, 0, priv->num_slots * sizeof(int)); - #endif - } -@@ -3118,6 +3119,7 @@ UpdateTouchState(InputInfoPtr pInfo, struct SynapticsHwState *hw) - if (hw->slot_state[i] == SLOTSTATE_OPEN) { - priv->open_slots[priv->num_active_touches] = i; - priv->num_active_touches++; -+ BUG_WARN(priv->num_active_touches > priv->num_slots); - } - else if (hw->slot_state[i] == SLOTSTATE_CLOSE) { - Bool found = FALSE; --- -cgit v0.9.0.2-2-gbebe diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.6.2-r1.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.6.2-r1.ebuild deleted file mode 100644 index 86b432384a4a..000000000000 --- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.6.2-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2014 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.6.2-r1.ebuild,v 1.7 2014/01/26 19:49:57 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 arm ~mips ppc ppc64 x86" -IUSE="" - -RDEPEND="sys-libs/mtdev - >=x11-base/xorg-server-1.8 - =x11-libs/libXi-1.2 - >=x11-libs/libXtst-1.1.0" -DEPEND="${RDEPEND} - >=sys-kernel/linux-headers-2.6.37 - >=x11-proto/recordproto-1.14" - -DOCS=( "README" ) - -PATCHES=( - "${FILESDIR}"/${P}-reset-num_active_touches.patch -) - -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 -} diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.7.2.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.7.2.ebuild deleted file mode 100644 index 747b2cd05c7b..000000000000 --- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.7.2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2014 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.7.2.ebuild,v 1.2 2014/01/26 19:49:57 chithanh Exp $ - -EAPI=5 - -inherit linux-info xorg-2 - -DESCRIPTION="Driver for Synaptics touchpads" -HOMEPAGE="http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/" - -KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" -IUSE="" - -RDEPEND="sys-libs/mtdev - >=x11-base/xorg-server-1.12 - =x11-libs/libXi-1.2 - >=x11-libs/libXtst-1.1.0" -DEPEND="${RDEPEND} - >=sys-kernel/linux-headers-2.6.37 - >=x11-proto/inputproto-2.1.99.3 - >=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 -} diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.7.3.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.7.3.ebuild deleted file mode 100644 index 5b91a689e21c..000000000000 --- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.7.3.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2014 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.7.3.ebuild,v 1.1 2014/01/26 19:49:57 chithanh Exp $ - -EAPI=5 - -inherit linux-info xorg-2 - -DESCRIPTION="Driver for Synaptics touchpads" -HOMEPAGE="http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/" - -KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" -IUSE="" - -RDEPEND="sys-libs/mtdev - >=x11-base/xorg-server-1.12 - >=x11-libs/libXi-1.2 - >=x11-libs/libXtst-1.1.0" -DEPEND="${RDEPEND} - >=sys-kernel/linux-headers-2.6.37 - >=x11-proto/inputproto-2.1.99.3 - >=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 -} diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.7.6.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.7.6.ebuild new file mode 100644 index 000000000000..1ece8d4d39fc --- /dev/null +++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.7.6.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2014 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.7.6.ebuild,v 1.1 2014/05/14 16:42:20 chithanh Exp $ + +EAPI=5 + +inherit linux-info xorg-2 + +DESCRIPTION="Driver for Synaptics touchpads" +HOMEPAGE="http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/" + +KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86" +IUSE="" + +RDEPEND="sys-libs/mtdev + >=x11-base/xorg-server-1.12 + >=x11-libs/libXi-1.2 + >=x11-libs/libXtst-1.1.0" +DEPEND="${RDEPEND} + >=sys-kernel/linux-headers-2.6.37 + >=x11-proto/inputproto-2.1.99.3 + >=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 +} diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.8.0.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.8.0.ebuild new file mode 100644 index 000000000000..f663788b12fe --- /dev/null +++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.8.0.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2014 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.8.0.ebuild,v 1.1 2014/05/14 16:42:20 chithanh Exp $ + +EAPI=5 + +inherit linux-info xorg-2 + +DESCRIPTION="Driver for Synaptics touchpads" +HOMEPAGE="http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/" + +KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" +IUSE="kernel_linux" + +RDEPEND="kernel_linux? ( >=dev-libs/libevdev-0.4 ) + >=x11-base/xorg-server-1.12 + >=x11-libs/libXi-1.2 + >=x11-libs/libXtst-1.1.0" +DEPEND="${RDEPEND} + >=sys-kernel/linux-headers-2.6.37 + >=x11-proto/inputproto-2.1.99.3 + >=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 +} -- cgit v1.2.3-65-gdbad