summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2008-06-06 21:49:53 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2008-06-06 21:49:53 +0000
commit33f965485e92e9ff0fee4b4be68a0e27108fe6e8 (patch)
tree03712515cec72bfafe257d7a794b2b7ca073cb2b /x11-drivers
parentInitial commit for bug 182333. Ebuild partly by Matthias Vill. (diff)
downloadgentoo-2-33f965485e92e9ff0fee4b4be68a0e27108fe6e8.tar.gz
gentoo-2-33f965485e92e9ff0fee4b4be68a0e27108fe6e8.tar.bz2
gentoo-2-33f965485e92e9ff0fee4b4be68a0e27108fe6e8.zip
Bump. Mostly minor fixes.
(Portage version: 2.1.5.2)
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/xf86-input-elo2300/ChangeLog9
-rw-r--r--x11-drivers/xf86-input-elo2300/files/0001-Check-for-XINPUT-ABI-3.patch28
-rw-r--r--x11-drivers/xf86-input-elo2300/xf86-input-elo2300-1.1.2.ebuild18
3 files changed, 54 insertions, 1 deletions
diff --git a/x11-drivers/xf86-input-elo2300/ChangeLog b/x11-drivers/xf86-input-elo2300/ChangeLog
index da5e37779fb8..d0f72b702679 100644
--- a/x11-drivers/xf86-input-elo2300/ChangeLog
+++ b/x11-drivers/xf86-input-elo2300/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for x11-drivers/xf86-input-elo2300
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-elo2300/ChangeLog,v 1.31 2008/02/24 02:15:46 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-elo2300/ChangeLog,v 1.32 2008/06/06 21:49:52 dberkholz Exp $
+
+*xf86-input-elo2300-1.1.2 (06 Jun 2008)
+
+ 06 Jun 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+ +files/0001-Check-for-XINPUT-ABI-3.patch,
+ +xf86-input-elo2300-1.1.2.ebuild:
+ Bump. Mostly minor fixes.
24 Feb 2008; Donnie Berkholz <dberkholz@gentoo.org>; ChangeLog:
Update my email.
diff --git a/x11-drivers/xf86-input-elo2300/files/0001-Check-for-XINPUT-ABI-3.patch b/x11-drivers/xf86-input-elo2300/files/0001-Check-for-XINPUT-ABI-3.patch
new file mode 100644
index 000000000000..77844ac053ef
--- /dev/null
+++ b/x11-drivers/xf86-input-elo2300/files/0001-Check-for-XINPUT-ABI-3.patch
@@ -0,0 +1,28 @@
+From cc77936174d60ae25aab137225190dc6d31eba92 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Mon, 26 May 2008 22:06:23 +0930
+Subject: [PATCH] Check for XINPUT ABI 3.
+
+---
+ src/elo.c | 5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/src/elo.c b/src/elo.c
+index 5ed67f0..8382313 100644
+--- a/src/elo.c
++++ b/src/elo.c
+@@ -309,7 +309,10 @@ DeviceInit( DeviceIntPtr dev )
+ * Device reports motions on 2 axes in absolute coordinates.
+ * Device may reports touch pressure on the 3rd axis.
+ */
+- if (InitValuatorClassDeviceStruct (dev, priv->axes, xf86GetMotionEvents,
++ if (InitValuatorClassDeviceStruct (dev, priv->axes,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
++ xf86GetMotionEvents,
++#endif
+ local->history_size, Absolute) == FALSE)
+ {
+ ErrorF ("Unable to allocate Elographics touchscreen ValuatorClassDeviceStruct\n");
+--
+1.5.5.1
+
diff --git a/x11-drivers/xf86-input-elo2300/xf86-input-elo2300-1.1.2.ebuild b/x11-drivers/xf86-input-elo2300/xf86-input-elo2300-1.1.2.ebuild
new file mode 100644
index 000000000000..a460b97597ff
--- /dev/null
+++ b/x11-drivers/xf86-input-elo2300/xf86-input-elo2300-1.1.2.ebuild
@@ -0,0 +1,18 @@
+# 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-elo2300/xf86-input-elo2300-1.1.2.ebuild,v 1.1 2008/06/06 21:49:52 dberkholz Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org driver for elo2300 input devices"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}
+ x11-proto/inputproto
+ x11-proto/randrproto
+ x11-proto/xproto"
+
+PATCHES="${FILESDIR}/0001-Check-for-XINPUT-ABI-3.patch"