diff options
author | Tony Vroon <chainsaw@gentoo.org> | 2008-08-22 17:09:35 +0000 |
---|---|---|
committer | Tony Vroon <chainsaw@gentoo.org> | 2008-08-22 17:09:35 +0000 |
commit | 0e8b240ed124f9cb086cf0a92636d342951ae83f (patch) | |
tree | 5ae6b9de4ba8019d2d0fd4ef0ccd98facf356ba9 /x11-drivers | |
parent | Version bump. Dropped buggy versions. (diff) | |
download | gentoo-2-0e8b240ed124f9cb086cf0a92636d342951ae83f.tar.gz gentoo-2-0e8b240ed124f9cb086cf0a92636d342951ae83f.tar.bz2 gentoo-2-0e8b240ed124f9cb086cf0a92636d342951ae83f.zip |
Initial commit, ebuild patching and suggestions by Nirbheek Chauhan <nirbheek.chauhan@gmail.com>, closes bug #234794 by Christian Loosli <fuchs@fuchsnet.ch>.
(Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc4-dirty x86_64)
Diffstat (limited to 'x11-drivers')
8 files changed, 153 insertions, 0 deletions
diff --git a/x11-drivers/xf86-input-synaptics/ChangeLog b/x11-drivers/xf86-input-synaptics/ChangeLog new file mode 100644 index 000000000000..34bf9751e5d7 --- /dev/null +++ b/x11-drivers/xf86-input-synaptics/ChangeLog @@ -0,0 +1,13 @@ +# ChangeLog for x11-drivers/xf86-input-synaptics +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/ChangeLog,v 1.1 2008/08/22 17:09:35 chainsaw Exp $ + +*xf86-input-synaptics-0.15.0 (22 Aug 2008) + + 22 Aug 2008; <chainsaw@gentoo.org> +files/11-x11-synaptics.fdi, + +files/rc.conf, +files/rc.init, +files/synaptics-fix-xinerama.patch, + +metadata.xml, +xf86-input-synaptics-0.15.0.ebuild: + Initial commit, ebuild patching and suggestions by Nirbheek Chauhan + <nirbheek.chauhan@gmail.com>, closes bug #234794 by Christian Loosli + <fuchs@fuchsnet.ch>. + diff --git a/x11-drivers/xf86-input-synaptics/Manifest b/x11-drivers/xf86-input-synaptics/Manifest new file mode 100644 index 000000000000..503cdb0d6012 --- /dev/null +++ b/x11-drivers/xf86-input-synaptics/Manifest @@ -0,0 +1,8 @@ +AUX 11-x11-synaptics.fdi 460 RMD160 973e332bd506d0160e573a028115bf3c0924e334 SHA1 77cc42785faecc3fb9b33ffac0b433ba9ba03808 SHA256 51c0da7a8e7048a753afa83d2d81e62fa8b61e0a1718083a2cc110767a76a8a3 +AUX rc.conf 330 RMD160 75825d70b749ae4e8b59b4066428d73815b19d70 SHA1 639736e2b424fcd3d6a78d0e6a3f90bed49ee6f4 SHA256 1776915a739c2f1432ab1602717cac1ff2464160a9d33d20124853a93605f6a5 +AUX rc.init 440 RMD160 82c30d248ef010cdd41600e3b19878b9f2ea6ff0 SHA1 cfb299682f9ec85340950917cbfebe5387080b32 SHA256 314d7d7c7d20608a398b439427e9c74cfaf2521996abc50af8a7963f1e7f22b8 +AUX synaptics-fix-xinerama.patch 752 RMD160 5017471df5c4f47382938ccff9bbd66033c06a6f SHA1 14b53a0c4090739ddc4cff9e9ad94cb9e2499c87 SHA256 7bdec4ef00a520d52e00b8a1d0b6d61e89fde910e28baa306b8be23dd7aadd64 +DIST xf86-input-synaptics-0.15.0.tar.bz2 280770 RMD160 54648e5f3bdbcab1857ddb469f83aacba3f7af9d SHA1 41eaa1c77af11166ff5ec4abc013076f545bc676 SHA256 e7d481c375a11df55eb8f12390c329c2bfda3258c689cec11cfec27cb5895c8b +EBUILD xf86-input-synaptics-0.15.0.ebuild 1765 RMD160 07f5112b616bd93ddc686d7e2e412b0ccb2b34ad SHA1 8c48043e1e8fc1f2eec63be9af4dcf5082bdfa3e SHA256 750d04df29db661c5b982b779ee795426de5e7af8cfdb05d13f8d719dae914ff +MISC ChangeLog 533 RMD160 357eaa9b32d3c4d9718736a8e3224adda50c271e SHA1 148378d328912a7dfa328a51b326c8388c416b28 SHA256 53fd68478f308bac814e58e8a0d56188cd0d2971b91eee59ccce42bccd556044 +MISC metadata.xml 254 RMD160 c1c6e70dd9088c05d91c8188791534dae7ffa665 SHA1 2dcdc428213d896d7b0d00f46edfa49799a0f0a8 SHA256 326a5b3b205fe4d2e8822e5a595c500d19bf3d6c527ab1305a24ef476bd1c08b diff --git a/x11-drivers/xf86-input-synaptics/files/11-x11-synaptics.fdi b/x11-drivers/xf86-input-synaptics/files/11-x11-synaptics.fdi new file mode 100644 index 000000000000..05c84286da42 --- /dev/null +++ b/x11-drivers/xf86-input-synaptics/files/11-x11-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/xf86-input-synaptics/files/rc.conf b/x11-drivers/xf86-input-synaptics/files/rc.conf new file mode 100644 index 000000000000..d141d0c1d27f --- /dev/null +++ b/x11-drivers/xf86-input-synaptics/files/rc.conf @@ -0,0 +1,8 @@ +# Copyright 1999-2003 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/files/rc.conf,v 1.1 2008/08/22 17:09:35 chainsaw Exp $ + +# Config file for /etc/init.d/syndaemon + +# run `syndaemon --help` for valid cmdline options +#SYNDAEMON_OPTS="" diff --git a/x11-drivers/xf86-input-synaptics/files/rc.init b/x11-drivers/xf86-input-synaptics/files/rc.init new file mode 100644 index 000000000000..3ab67e88abe2 --- /dev/null +++ b/x11-drivers/xf86-input-synaptics/files/rc.init @@ -0,0 +1,20 @@ +#!/sbin/runscript +# Copyright 1999-2002 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/files/rc.init,v 1.1 2008/08/22 17:09:35 chainsaw Exp $ + +depend() { + use localmount +} + +start() { + ebegin "Starting syndaemon" + /usr/bin/syndaemon ${SYNDAEMON_OPTS} + eend $? +} + +stop() { + ebegin "Stopping syndaemon" + kill `cat /var/run/syndaemon.pid` + eend $? +} diff --git a/x11-drivers/xf86-input-synaptics/files/synaptics-fix-xinerama.patch b/x11-drivers/xf86-input-synaptics/files/synaptics-fix-xinerama.patch new file mode 100644 index 000000000000..943340394e9b --- /dev/null +++ b/x11-drivers/xf86-input-synaptics/files/synaptics-fix-xinerama.patch @@ -0,0 +1,16 @@ +diff -uNr xf86-input-synaptics-0.15.0.ORIG/src/synaptics.c xf86-input-synaptics-0.15.0/src/synaptics.c +--- xf86-input-synaptics-0.15.0.ORIG/src/synaptics.c 2008-08-22 17:34:20.000000000 +0100 ++++ xf86-input-synaptics-0.15.0/src/synaptics.c 2008-08-22 17:34:45.000000000 +0100 +@@ -648,10 +648,10 @@ + #endif + ); + /* X valuator */ +- xf86InitValuatorAxisStruct(dev, 0, 0, -1, 1, 0, 1); ++ xf86InitValuatorAxisStruct(dev, 0, -1, -1, 1, 0, 1); + xf86InitValuatorDefaults(dev, 0); + /* Y valuator */ +- xf86InitValuatorAxisStruct(dev, 1, 0, -1, 1, 0, 1); ++ xf86InitValuatorAxisStruct(dev, 1, -1, -1, 1, 0, 1); + xf86InitValuatorDefaults(dev, 1); + #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 + xf86MotionHistoryAllocate(local); diff --git a/x11-drivers/xf86-input-synaptics/metadata.xml b/x11-drivers/xf86-input-synaptics/metadata.xml new file mode 100644 index 000000000000..b79ed43842ba --- /dev/null +++ b/x11-drivers/xf86-input-synaptics/metadata.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer> + <email>chainsaw@gentoo.org</email> + <name>Tony Vroon</name> +</maintainer> +<herd>x11-drivers</herd> +</pkgmetadata> diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.0.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.0.ebuild new file mode 100644 index 000000000000..c2e76f21d4eb --- /dev/null +++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.0.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2008 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-0.15.0.ebuild,v 1.1 2008/08/22 17:09:35 chainsaw Exp $ + +inherit toolchain-funcs eutils linux-info x-modular + +DESCRIPTION="Driver for Synaptics touchpads" +HOMEPAGE="http://gitweb.freedesktop.org/?p=xorg/driver/xf86-input-synaptics.git;a=summary" +KEYWORDS="~amd64" +LICENSE="MIT" +IUSE="hal" +RDEPEND="x11-libs/libXext + hal? ( sys-apps/hal )" +DEPEND="${RDEPEND} + x11-base/xorg-server + x11-proto/inputproto + >=sys-apps/sed-4" + +evdev-input_check() { + # Check kernel config for required event interface support (either + # built-in or as a module. Bug #134309. + + ebegin "Checking kernel config for event device support" + linux_chkconfig_present INPUT_EVDEV + eend $? + + if [[ $? -ne 0 ]] ; then + ewarn "Synaptics driver requires event interface support." + ewarn "Please enable the event interface in your kernel config." + ewarn "The option can be found at:" + ewarn + ewarn " Device Drivers" + ewarn " Input device support" + ewarn " -*- Generic input layer" + ewarn " <*> Event interface" + ewarn + ewarn "Then rebuild the kernel or install the module." + epause 5 + fi +} + +pkg_setup() { + linux-info_pkg_setup + evdev-input_check +} + +src_unpack() { + x-modular_unpack_source + # Fix to handle multiple screens through Xinerama properly. Bug #206614. + epatch "${FILESDIR}"/synaptics-fix-xinerama.patch +} + +src_install() { + DOCS="INSTALL NEWS TODO README" + x-modular_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}"/11-x11-synaptics.fdi + fi +} |