diff options
author | Mike Auty <ikelos@gentoo.org> | 2009-04-02 08:58:59 +0000 |
---|---|---|
committer | Mike Auty <ikelos@gentoo.org> | 2009-04-02 08:58:59 +0000 |
commit | 7df0c5fcf887889e0ec55927a3bade57a8ae1a05 (patch) | |
tree | c5634e06d868c931869f0f043e5e8d2f5c396141 /x11-drivers/linuxwacom | |
parent | Install into proper docdir (bug #241292). (diff) | |
download | gentoo-2-7df0c5fcf887889e0ec55927a3bade57a8ae1a05.tar.gz gentoo-2-7df0c5fcf887889e0ec55927a3bade57a8ae1a05.tar.bz2 gentoo-2-7df0c5fcf887889e0ec55927a3bade57a8ae1a05.zip |
Version bump to 0.8.2_p2 (fixing bug 255087).
(Portage version: 2.2_rc28/cvs/Linux i686)
Diffstat (limited to 'x11-drivers/linuxwacom')
-rw-r--r-- | x11-drivers/linuxwacom/ChangeLog | 10 | ||||
-rw-r--r-- | x11-drivers/linuxwacom/files/linuxwacom-0.8.2-kernel-2.6.29.patch | 13 | ||||
-rw-r--r-- | x11-drivers/linuxwacom/linuxwacom-0.8.2_p2.ebuild | 117 |
3 files changed, 138 insertions, 2 deletions
diff --git a/x11-drivers/linuxwacom/ChangeLog b/x11-drivers/linuxwacom/ChangeLog index c9700aa1bae7..f4adf1034ceb 100644 --- a/x11-drivers/linuxwacom/ChangeLog +++ b/x11-drivers/linuxwacom/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-drivers/linuxwacom -# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/ChangeLog,v 1.27 2008/12/18 00:02:41 ikelos Exp $ +# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/ChangeLog,v 1.28 2009/04/02 08:58:59 ikelos Exp $ + +*linuxwacom-0.8.2_p2 (02 Apr 2009) + + 02 Apr 2009; Mike Auty <ikelos@gentoo.org> + +files/linuxwacom-0.8.2-kernel-2.6.29.patch, +linuxwacom-0.8.2_p2.ebuild: + Version bump to 0.8.2_p2 (fixing bug 255087). *linuxwacom-0.8.2 (18 Dec 2008) diff --git a/x11-drivers/linuxwacom/files/linuxwacom-0.8.2-kernel-2.6.29.patch b/x11-drivers/linuxwacom/files/linuxwacom-0.8.2-kernel-2.6.29.patch new file mode 100644 index 000000000000..0d7f8bbed58a --- /dev/null +++ b/x11-drivers/linuxwacom/files/linuxwacom-0.8.2-kernel-2.6.29.patch @@ -0,0 +1,13 @@ +diff --git a/src/2.6.27/wacom_sys.c b/src/2.6.27/wacom_sys.c +index 9e534d1..bc54e9f 100755 +--- a/src/2.6.27/wacom_sys.c ++++ b/src/2.6.27/wacom_sys.c +@@ -539,7 +539,7 @@ static int __init wacom_init(void) + wacom_driver.id_table = get_device_table(); + result = usb_register(&wacom_driver); + if (result == 0) +- info(DRIVER_VERSION ":" DRIVER_DESC); ++ printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" DRIVER_DESC "\n"); + return result; + } + diff --git a/x11-drivers/linuxwacom/linuxwacom-0.8.2_p2.ebuild b/x11-drivers/linuxwacom/linuxwacom-0.8.2_p2.ebuild new file mode 100644 index 000000000000..0253a8400225 --- /dev/null +++ b/x11-drivers/linuxwacom/linuxwacom-0.8.2_p2.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.8.2_p2.ebuild,v 1.1 2009/04/02 08:58:59 ikelos Exp $ + +inherit eutils autotools toolchain-funcs linux-mod + +DESCRIPTION="Input driver for Wacom tablets and drawing devices" +HOMEPAGE="http://linuxwacom.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P/_p/-}.tar.bz2" + +IUSE="gtk tcl tk usb module" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + +RDEPEND="x11-proto/inputproto + x11-base/xorg-server + gtk? ( >=x11-libs/gtk+-2 ) + tcl? ( dev-lang/tcl ) + tk? ( dev-lang/tk ) + sys-fs/udev + sys-libs/ncurses" + +DEPEND="${RDEPEND} + dev-util/pkgconfig + usb? ( >=sys-kernel/linux-headers-2.6 )" +S=${WORKDIR}/${P/_p/-} + +MODULE_NAMES="wacom(input:${S}/src:${S}/src)" + +wacom_check() { + if use module ; then + ebegin "Checking for wacom module" + linux_chkconfig_module TABLET_USB_WACOM + eend $? + + if [[ $? -ne 0 ]] || ! [ -f "/lib/modules/${KV}/kernel/drivers/input/tablet/wacom.ko" ]; then + eerror "You need to have your kernel compiled with wacom as a module" + eerror "to let linuxwacom overwrite it." + eerror "Enable it in the kernel, found at:" + eerror + eerror " Device Drivers" + eerror " Input device support" + eerror " Tablets" + eerror " <M> Wacom Intuos/Graphire tablet support (USB)" + eerror + eerror "(in the "USB support" page it is suggested to include also:" + eerror "EHCI , OHCI , USB Human Interface Device+HID input layer)" + eerror + eerror "Then recompile kernel. Otherwise, remove the module USE flag." + die "Wacom not compiled in kernel as a module!" + fi + fi +} + +pkg_setup() { + linux-mod_pkg_setup + # echo "kernel version is ${KV} , name is ${KV%%-*}" + ewarn "Versions of linuxwacom >= 0.7.9 require gcc >= 4.2 to compile." + wacom_check +} + +src_unpack() { + unpack ${A} + cd "${S}" + + # Fix multilib-strict error for Tcl/Tk library install + sed -i -e "s:WCM_EXECDIR/lib:WCM_EXECDIR/$(get_libdir):" configure.in + + # Remove warning parameters for gcc < 4, bug 205139 + if [[ $(gcc-major-version) -lt 4 ]]; then + sed -i -e "s:-Wno-variadic-macros::" src/xdrv/Makefile.am + fi + + epatch "${FILESDIR}/${PN}-0.8.2-kernel-2.6.29.patch" + + eautoreconf +} + +src_compile() { + if use module; then + myconf="${myconf} --enable-wacom" + myconf="${myconf} --with-kernel=${KV_OUT_DIR}" + fi + + econf ${myconf} \ + $(use_with tcl tcl) \ + $(use_with tk tk) \ + --enable-wacomdrv --enable-wacdump \ + --enable-xsetwacom --enable-dlloader || die "econf failed" + + #$(use_enable quirks quirk-tablet-rescale) \ + + unset ARCH + emake || die "emake failed." +} + +src_install() { + emake DESTDIR="${D}" install || die "Install failed." + + # Inelegant attempt to work around a nasty build system + if use module; then + cp "${S}"/src/*/wacom.{o,ko} "${S}"/src/ + linux-mod_src_install + fi + + insinto /etc/udev/rules.d/ + newins "${FILESDIR}"/${P%_p*}-xserver-xorg-input-wacom.udev 60-wacom.rules + + exeinto /lib/udev/ + doexe "${FILESDIR}"/check_driver + doman "${FILESDIR}"/check_driver.1 + + dohtml -r docs/* + dodoc AUTHORS ChangeLog NEWS README +} |