diff options
author | Joshua Baergen <joshuabaergen@gentoo.org> | 2006-09-16 16:16:31 +0000 |
---|---|---|
committer | Joshua Baergen <joshuabaergen@gentoo.org> | 2006-09-16 16:16:31 +0000 |
commit | e6a64113ba133bfbfe86d96879c91ba730f4486d (patch) | |
tree | 8047a9532b92e74ba9a732a203eebbefc9fc0818 /x11-drivers | |
parent | Revision bump, fixing compilation with gcc-4 (#146138, thanks to Janne Pikkar... (diff) | |
download | gentoo-2-e6a64113ba133bfbfe86d96879c91ba730f4486d.tar.gz gentoo-2-e6a64113ba133bfbfe86d96879c91ba730f4486d.tar.bz2 gentoo-2-e6a64113ba133bfbfe86d96879c91ba730f4486d.zip |
Add a fix for an absolute axis crasher. (Bug #147794, Priit Laes)
(Portage version: 2.1.2_pre1)
Diffstat (limited to 'x11-drivers')
5 files changed, 47 insertions, 1 deletions
diff --git a/x11-drivers/xf86-input-evdev/ChangeLog b/x11-drivers/xf86-input-evdev/ChangeLog index b61a900e4657..8bdeddeb4f89 100644 --- a/x11-drivers/xf86-input-evdev/ChangeLog +++ b/x11-drivers/xf86-input-evdev/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-drivers/xf86-input-evdev # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-evdev/ChangeLog,v 1.34 2006/09/12 18:20:16 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-evdev/ChangeLog,v 1.35 2006/09/16 16:16:31 joshuabaergen Exp $ + +*xf86-input-evdev-1.1.2-r2 (16 Sep 2006) + + 16 Sep 2006; Joshua Baergen <joshuabaergen@gentoo.org> + +files/1.1.2-absolute-axis-fix.patch, +xf86-input-evdev-1.1.2-r2.ebuild: + Add a fix for an absolute axis crasher. (Bug #147794, Priit Laes) 12 Sep 2006; Gustavo Zacarias <gustavoz@gentoo.org> xf86-input-evdev-1.1.2-r1.ebuild: diff --git a/x11-drivers/xf86-input-evdev/files/1.1.2-absolute-axis-fix.patch b/x11-drivers/xf86-input-evdev/files/1.1.2-absolute-axis-fix.patch new file mode 100644 index 000000000000..a714e9deaad1 --- /dev/null +++ b/x11-drivers/xf86-input-evdev/files/1.1.2-absolute-axis-fix.patch @@ -0,0 +1,11 @@ +--- a/src/evdev_axes.c ++++ b/src/evdev_axes.c +@@ -385,7 +385,7 @@ EvdevAxisAbsNew(InputInfoPtr pInfo) + k = xf86SetIntOption(pInfo->options, "AbsoluteScreen", 0); + else + k = xf86SetIntOption(pInfo->options, "AbsoluteScreen", -1); +- if (k < screenInfo.numScreens) { ++ if (k < screenInfo.numScreens && k >= 0) { + state->abs->screen = k; + xf86Msg(X_CONFIG, "%s: AbsoluteScreen: %d.\n", pInfo->name, k); + } else { diff --git a/x11-drivers/xf86-input-evdev/files/digest-xf86-input-evdev-1.0.0.5 b/x11-drivers/xf86-input-evdev/files/digest-xf86-input-evdev-1.0.0.5 index 40a2abb7cb2b..0c4cc5728d2e 100644 --- a/x11-drivers/xf86-input-evdev/files/digest-xf86-input-evdev-1.0.0.5 +++ b/x11-drivers/xf86-input-evdev/files/digest-xf86-input-evdev-1.0.0.5 @@ -2,3 +2,5 @@ MD5 1b8cfd2923836ee93eda69abe50dda04 x11-driver-patches-1.tar.bz2 389 RMD160 0c57d4b235d83f3d7c46691c13857fd121ddec2d x11-driver-patches-1.tar.bz2 389 SHA256 64787d5b57d2845c0fa9297a9d924093ba191fc3551798239d9983f0bcca9b3e x11-driver-patches-1.tar.bz2 389 MD5 70a3b3e8416e3fd536c8894511f13a67 xf86-input-evdev-1.0.0.5.tar.bz2 216077 +RMD160 b69b85e06d5eac50906cc44b432877d128ce635d xf86-input-evdev-1.0.0.5.tar.bz2 216077 +SHA256 68e2a8a6af50685cb26f5420623e82506b16e894a30f29aa24efca999d145e0f xf86-input-evdev-1.0.0.5.tar.bz2 216077 diff --git a/x11-drivers/xf86-input-evdev/files/digest-xf86-input-evdev-1.1.2-r2 b/x11-drivers/xf86-input-evdev/files/digest-xf86-input-evdev-1.1.2-r2 new file mode 100644 index 000000000000..18222ed941e4 --- /dev/null +++ b/x11-drivers/xf86-input-evdev/files/digest-xf86-input-evdev-1.1.2-r2 @@ -0,0 +1,6 @@ +MD5 1b8cfd2923836ee93eda69abe50dda04 x11-driver-patches-1.tar.bz2 389 +RMD160 0c57d4b235d83f3d7c46691c13857fd121ddec2d x11-driver-patches-1.tar.bz2 389 +SHA256 64787d5b57d2845c0fa9297a9d924093ba191fc3551798239d9983f0bcca9b3e x11-driver-patches-1.tar.bz2 389 +MD5 2932a39f080bae68bbcdc11fc125d990 xf86-input-evdev-1.1.2.tar.bz2 225390 +RMD160 de528edf7a127959158460c3d557b886af579444 xf86-input-evdev-1.1.2.tar.bz2 225390 +SHA256 8b479702f61e6798a3dca73bad2f2053082a157e1608d9d87f0a2f1d91e75b95 xf86-input-evdev-1.1.2.tar.bz2 225390 diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-1.1.2-r2.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-1.1.2-r2.ebuild new file mode 100644 index 000000000000..8cbfdd9ad997 --- /dev/null +++ b/x11-drivers/xf86-input-evdev/xf86-input-evdev-1.1.2-r2.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-evdev/xf86-input-evdev-1.1.2-r2.ebuild,v 1.1 2006/09/16 16:16:31 joshuabaergen Exp $ + +# Must be before x-modular eclass is inherited +#SNAPSHOT="yes" + +inherit x-modular + +DESCRIPTION="X.Org driver for evdev input devices" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" +RDEPEND="x11-base/xorg-server" +DEPEND="${RDEPEND} + || ( >=sys-kernel/linux-headers-2.6 >=sys-kernel/mips-headers-2.6 ) + x11-proto/inputproto + x11-proto/randrproto + x11-proto/xproto" + +PATCHES="${FILESDIR}/${PV}-CVS-20060520.patch + ${FILESDIR}/${P}-mips-syscalls.patch + ${FILESDIR}/${PV}-absolute-axis-fix.patch" |