summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Auty <ikelos@gentoo.org>2009-12-31 16:12:01 +0000
committerMike Auty <ikelos@gentoo.org>2009-12-31 16:12:01 +0000
commit05a93832e08f65c7c0c510df4a232ae9cb13bd7b (patch)
tree8d38502cb87fe46792d91969295b1c6bd6a53e53 /x11-drivers
parentstable x86, bug 297010 (diff)
downloadgentoo-2-05a93832e08f65c7c0c510df4a232ae9cb13bd7b.tar.gz
gentoo-2-05a93832e08f65c7c0c510df4a232ae9cb13bd7b.tar.bz2
gentoo-2-05a93832e08f65c7c0c510df4a232ae9cb13bd7b.zip
Fix bug 298547, and tidy up older versions.
(Portage version: 2.2_rc60/cvs/Linux i686)
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/xf86-input-wacom/ChangeLog9
-rw-r--r--x11-drivers/xf86-input-wacom/files/0.10.3-protocol-4.patch13
-rw-r--r--x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.0.ebuild25
-rw-r--r--x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.3-r1.ebuild (renamed from x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.2.ebuild)10
4 files changed, 29 insertions, 28 deletions
diff --git a/x11-drivers/xf86-input-wacom/ChangeLog b/x11-drivers/xf86-input-wacom/ChangeLog
index 11564e769932..fc2b4a02b9a9 100644
--- a/x11-drivers/xf86-input-wacom/ChangeLog
+++ b/x11-drivers/xf86-input-wacom/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for x11-drivers/xf86-input-wacom
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/ChangeLog,v 1.8 2009/12/23 23:48:41 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/ChangeLog,v 1.9 2009/12/31 16:12:01 ikelos Exp $
+
+*xf86-input-wacom-0.10.3-r1 (31 Dec 2009)
+
+ 31 Dec 2009; Mike Auty <ikelos@gentoo.org>
+ -xf86-input-wacom-0.10.0.ebuild, -xf86-input-wacom-0.10.2.ebuild,
+ +xf86-input-wacom-0.10.3-r1.ebuild, +files/0.10.3-protocol-4.patch:
+ Fix bug 298547, and tidy up older versions.
*xf86-input-wacom-0.10.3 (23 Dec 2009)
diff --git a/x11-drivers/xf86-input-wacom/files/0.10.3-protocol-4.patch b/x11-drivers/xf86-input-wacom/files/0.10.3-protocol-4.patch
new file mode 100644
index 000000000000..1559a44e11a3
--- /dev/null
+++ b/x11-drivers/xf86-input-wacom/files/0.10.3-protocol-4.patch
@@ -0,0 +1,13 @@
+diff --git a/src/wcmUSB.c b/src/wcmUSB.c
+index 7d72473..954af06 100644
+--- a/src/wcmUSB.c
++++ b/src/wcmUSB.c
+@@ -888,7 +888,7 @@ static void usbParseEvent(LocalDevicePtr local,
+ }
+
+ /* ignore events without information */
+- if (common->wcmEventCnt <= 2)
++ if ((common->wcmEventCnt <= 2) && common->wcmLastToolSerial)
+ {
+ DBG(3, common, "%s: dropping empty event"
+ " for serial %d\n", local->name, common->wcmLastToolSerial);
diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.0.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.0.ebuild
deleted file mode 100644
index ae37d72a4a41..000000000000
--- a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.0.ebuild,v 1.4 2009/12/10 08:51:36 zmedico Exp $
-
-inherit x-modular
-
-DESCRIPTION="Driver for Wacom tablets and drawing devices"
-LICENSE="GPL-2"
-EGIT_REPO_URI="git://anongit.freedesktop.org/~whot/xf86-input-wacom"
-[[ ${PV} != 9999* ]] && \
- SRC_URI="http://people.freedesktop.org/~whot/${PN}/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="debug"
-
-COMMON_DEPEND=">=x11-base/xorg-server-1.6"
-RDEPEND="${COMMON_DEPEND}
- !x11-drivers/linuxwacom"
-DEPEND="${COMMON_DEPEND}
- x11-proto/inputproto
- x11-proto/xproto"
-
-pkg_setup() {
- CONFIGURE_OPTIONS="$(use_enable debug)"
-}
diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.2.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.3-r1.ebuild
index c93ed5cfa99d..fd17aa37b4b3 100644
--- a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.2.ebuild
+++ b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.2.ebuild,v 1.2 2009/12/10 08:51:37 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.3-r1.ebuild,v 1.1 2009/12/31 16:12:01 ikelos Exp $
EAPI="2"
@@ -29,6 +29,11 @@ pkg_setup() {
CONFIGURE_OPTIONS="$(use_enable debug)"
}
+src_prepare() {
+ epatch "${FILESDIR}/0.10.3-protocol-4.patch"
+ x-modular_src_prepare
+}
+
src_install() {
x-modular_src_install
@@ -41,7 +46,8 @@ src_install() {
pkg_postinst() {
x-modular_pkg_postinst
- if ! linux_chkconfig_present TABLET_USB_WACOM \
+ if ! linux_config_exists \
+ || ! linux_chkconfig_present TABLET_USB_WACOM \
|| ! linux_chkconfig_present INPUT_EVDEV; then
echo
ewarn "If you use a USB Wacom tablet, you need to enable support in your kernel"