From d8b4fab467e12d51b9cde2ac60332e6f11b9e320 Mon Sep 17 00:00:00 2001 From: Tony Vroon Date: Sat, 23 Aug 2008 21:28:55 +0000 Subject: Patch out a reference to XF86_CURRENT_VERSION which recently disappeared in upstream X.Org git and block against the older synaptics ebuild. Both thanks to papillon81 on IRC. (Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc4-00123-gd3ee1b4-dirty x86_64) --- x11-drivers/xf86-input-synaptics/ChangeLog | 11 +++- .../files/synaptics-xorg-version.patch | 14 +++++ .../xf86-input-synaptics-0.15.0-r1.ebuild | 70 ++++++++++++++++++++++ .../xf86-input-synaptics-0.15.0.ebuild | 66 -------------------- 4 files changed, 94 insertions(+), 67 deletions(-) create mode 100644 x11-drivers/xf86-input-synaptics/files/synaptics-xorg-version.patch create mode 100644 x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.0-r1.ebuild delete mode 100644 x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.0.ebuild (limited to 'x11-drivers/xf86-input-synaptics') diff --git a/x11-drivers/xf86-input-synaptics/ChangeLog b/x11-drivers/xf86-input-synaptics/ChangeLog index fdbccd982e99..2e78be3aa0ac 100644 --- a/x11-drivers/xf86-input-synaptics/ChangeLog +++ b/x11-drivers/xf86-input-synaptics/ChangeLog @@ -1,6 +1,15 @@ # 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.3 2008/08/22 17:50:48 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/ChangeLog,v 1.4 2008/08/23 21:28:55 chainsaw Exp $ + +*xf86-input-synaptics-0.15.0-r1 (23 Aug 2008) + + 23 Aug 2008; +files/synaptics-xorg-version.patch, + -xf86-input-synaptics-0.15.0.ebuild, + +xf86-input-synaptics-0.15.0-r1.ebuild: + Patch out a reference to XF86_CURRENT_VERSION which recently disappeared + in upstream X.Org git and block against the older synaptics ebuild. Both + thanks to papillon81 on IRC. 22 Aug 2008; files/11-x11-synaptics.fdi: Have FDI file also trigger for appletouch devices, from upstream commit diff --git a/x11-drivers/xf86-input-synaptics/files/synaptics-xorg-version.patch b/x11-drivers/xf86-input-synaptics/files/synaptics-xorg-version.patch new file mode 100644 index 000000000000..6580385568d9 --- /dev/null +++ b/x11-drivers/xf86-input-synaptics/files/synaptics-xorg-version.patch @@ -0,0 +1,14 @@ +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-23 22:19:55.000000000 +0100 ++++ xf86-input-synaptics-0.15.0/src/synaptics.c 2008-08-23 22:21:16.000000000 +0100 +@@ -136,8 +136,8 @@ + MODULEVENDORSTRING, + MODINFOSTRING1, + MODINFOSTRING2, +- XF86_VERSION_CURRENT, +- 1, 0, 0, ++ XORG_VERSION_CURRENT, ++ PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL, + ABI_CLASS_XINPUT, + ABI_XINPUT_VERSION, + MOD_CLASS_XINPUT, diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.0-r1.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.0-r1.ebuild new file mode 100644 index 000000000000..2eddf6db6866 --- /dev/null +++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.0-r1.ebuild @@ -0,0 +1,70 @@ +# 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-r1.ebuild,v 1.1 2008/08/23 21:28:55 chainsaw Exp $ + +inherit toolchain-funcs eutils linux-info x-modular + +DESCRIPTION="Driver for Synaptics touchpads" +HOMEPAGE="http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/" +KEYWORDS="~amd64" +LICENSE="MIT" +IUSE="hal" +RDEPEND="x11-libs/libXext + hal? ( sys-apps/hal )" +DEPEND="${RDEPEND} + !x11-drivers/synaptics + 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 + + # Recent X.Org git versions stopped defining XF86-style version. + epatch "${FILESDIR}"/synaptics-xorg-version.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 +} 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 deleted file mode 100644 index 187941c9a70f..000000000000 --- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.0.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# 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.2 2008/08/22 17:17:11 chainsaw Exp $ - -inherit toolchain-funcs eutils linux-info x-modular - -DESCRIPTION="Driver for Synaptics touchpads" -HOMEPAGE="http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/" -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 -} -- cgit v1.2.3-65-gdbad