diff options
| author |   Bryan Stine <battousai@gentoo.org> | 2008-04-02 03:52:01 +0000 |
|---|---|---|
| committer | Bryan Stine <battousai@gentoo.org> | 2008-04-02 03:52:01 +0000 |
| commit | 3da927508dcef34170409ddcd4fe1ab0ae5cd0a5 (patch) | |
| tree | 6c8e6f58d8ba068378bc2765673a07f502f9f9aa /x11-drivers | |
| parent | Version bump. (diff) | |
| download | gentoo-2-3da927508dcef34170409ddcd4fe1ab0ae5cd0a5.tar.gz gentoo-2-3da927508dcef34170409ddcd4fe1ab0ae5cd0a5.tar.bz2 gentoo-2-3da927508dcef34170409ddcd4fe1ab0ae5cd0a5.zip | |
Add HAL policy to report correct driver for touchpads. Suggested by dberkholz.
(Portage version: 2.1.4.4)
Diffstat (limited to 'x11-drivers')
| -rw-r--r-- | x11-drivers/synaptics/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-drivers/synaptics/files/10-synaptics.fdi | 13 | ||||
| -rw-r--r-- | x11-drivers/synaptics/synaptics-0.14.6-r2.ebuild | 13 |
3 files changed, 29 insertions, 4 deletions
diff --git a/x11-drivers/synaptics/ChangeLog b/x11-drivers/synaptics/ChangeLog index 343966ffe1e8..1ca17299a27e 100644 --- a/x11-drivers/synaptics/ChangeLog +++ b/x11-drivers/synaptics/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-drivers/synaptics # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/ChangeLog,v 1.33 2008/04/01 23:57:31 battousai Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/ChangeLog,v 1.34 2008/04/02 03:52:01 battousai Exp $ + + 02 Apr 2008; Bryan Stine <battousai@gentoo.org> +files/10-synaptics.fdi, + synaptics-0.14.6-r2.ebuild: + Add HAL policy to report input driver as synaptics for supported + touchpads. Suggested by dberkholz. *synaptics-0.14.6-r2 (01 Apr 2008) diff --git a/x11-drivers/synaptics/files/10-synaptics.fdi b/x11-drivers/synaptics/files/10-synaptics.fdi new file mode 100644 index 000000000000..05c84286da42 --- /dev/null +++ b/x11-drivers/synaptics/files/10-synaptics.fdi @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<deviceinfo version="0.2"> + <device> + <match key="info.capabilities" contains="input.touchpad"> + <match key="info.product" contains="Synaptics TouchPad"> + <merge key="input.x11_driver" type="string">synaptics</merge> + </match> + <match key="info.product" contains="AlpsPS/2 ALPS"> + <merge key="input.x11_driver" type="string">synaptics</merge> + </match> + </match> + </device> +</deviceinfo> diff --git a/x11-drivers/synaptics/synaptics-0.14.6-r2.ebuild b/x11-drivers/synaptics/synaptics-0.14.6-r2.ebuild index 318860ca3587..5f25879a88e6 100644 --- a/x11-drivers/synaptics/synaptics-0.14.6-r2.ebuild +++ b/x11-drivers/synaptics/synaptics-0.14.6-r2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/synaptics-0.14.6-r2.ebuild,v 1.1 2008/04/01 23:57:31 battousai Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/synaptics-0.14.6-r2.ebuild,v 1.2 2008/04/02 03:52:01 battousai Exp $ inherit toolchain-funcs eutils linux-info -IUSE="" +IUSE="hal" DESCRIPTION="Driver for Synaptics touchpads" HOMEPAGE="http://w1.894.telia.com/~u89404340/touchpad/" @@ -14,7 +14,8 @@ SLOT="0" LICENSE="GPL-2" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -RDEPEND="x11-libs/libXext" +RDEPEND="x11-libs/libXext + hal? ( sys-apps/hal )" DEPEND="${RDEPEND} x11-base/xorg-server >=sys-apps/sed-4" @@ -86,4 +87,10 @@ src_install() { # Stupid new daemon, didn't work for me because of shm issues newinitd "${FILESDIR}"/rc.init syndaemon newconfd "${FILESDIR}"/rc.conf syndaemon + + if use hal ; then + # Have HAL assign this driver to supported touchpads. + insinto /usr/share/hal/fdi/policy/10osvendor + doins "${FILESDIR}"/10-synaptics.fdi + fi } |