commit c717686c34dab9d541a160866c0766ddd298cf88
Author: Marek Guevara Braun <[email protected]>
Date: Wed Feb 6 18:55:30 2013 +0100
- joystick toolkit replacement; patched for serial Wacom tablets
linuxconsoletools-awk.patch | 36 ++++++++++++++++++++++++
linuxconsoletools-wacom.patch | 65 +++++++++++++++++++++++++++++++++++++++++++
linuxconsoletools.spec | 48 ++++++++++++++++++++++++++++++++
3 files changed, 149 insertions(+)
---
diff --git a/linuxconsoletools.spec b/linuxconsoletools.spec
new file mode 100644
index 0000000..cdaddb9
--- /dev/null
+++ b/linuxconsoletools.spec
@@ -0,0 +1,48 @@
+Summary: Tools for connecting joysticks & legacy devices to the kernel's
input subsystem
+Name: linuxconsoletools
+Version: 1.4.4
+Release: 1
+License: GPLv2+
+Group: Applications
+Source0:
http://downloads.sourceforge.net/linuxconsole/%{name}-%{version}.tar.bz2
+# Source0-md5: 4ae531759fb7b2315db941a0bea52884
+Patch0: %{name}-awk.patch
+Patch1: %{name}-wacom.patch
+URL: http://sourceforge.net/projects/linuxconsole/
+BuildRequires: SDL-devel
+Provides: joystick = %{version}-%{release}
+Obsoletes: joystick < 1.2.16-1
+Conflicts: gpm < 1.20.6-26
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+This package contains utilities for testing and configuring joysticks,
+connecting legacy devices to the kernel's input subsystem (providing
+support for serial mice, touchscreens etc.), and test the input event
+layer.
+
+%prep
+%setup -q
+%patch0 -p1
+%patch1 -p1
+
+%build
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT \
+ PREFIX=%{_prefix}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(644,root,root,755)
+%doc COPYING README NEWS
+%dir %{_prefix}/share/joystick
+%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_prefix}/share/joystick/*
+%{_mandir}/man1/*
+
diff --git a/linuxconsoletools-awk.patch b/linuxconsoletools-awk.patch
new file mode 100644
index 0000000..4ef6e3f
--- /dev/null
+++ b/linuxconsoletools-awk.patch
@@ -0,0 +1,36 @@
+diff -NurP --minimal linuxconsoletools-1.4.4-orig/docs/list-inputattach-modes
linuxconsoletools-1.4.4/docs/list-inputattach-modes
+--- linuxconsoletools-1.4.4-orig/docs/list-inputattach-modes 2011-12-15
16:49:01.000000000 +0100
++++ linuxconsoletools-1.4.4/docs/list-inputattach-modes 2013-02-05
23:22:44.137334582 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/awk -f
++#!/bin/awk -f
+
+ /^ --.*-/ {
+ print ".TP";
+diff -NurP --minimal linuxconsoletools-1.4.4-orig/utils/extract
linuxconsoletools-1.4.4/utils/extract
+--- linuxconsoletools-1.4.4-orig/utils/extract 2011-12-15 16:49:01.000000000
+0100
++++ linuxconsoletools-1.4.4/utils/extract 2013-02-05 23:23:06.224000673
+0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/awk -f
++#!/bin/awk -f
+
+ # Extracts the settings for a given joystick from the joystick
+ # parameter file, matching the contents of the kernel, name, serial,
+diff -NurP --minimal linuxconsoletools-1.4.4-orig/utils/filter
linuxconsoletools-1.4.4/utils/filter
+--- linuxconsoletools-1.4.4-orig/utils/filter 2011-12-15 16:49:01.000000000
+0100
++++ linuxconsoletools-1.4.4/utils/filter 2013-02-05 23:23:38.193999839
+0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/awk -f
++#!/bin/awk -f
+
+ # Filters the joystick parameter file, keeping everything but sections
+ # matching the contents of the kernel, name, serial, vendor and
+diff -NurP --minimal linuxconsoletools-1.4.4-orig/utils/ident
linuxconsoletools-1.4.4/utils/ident
+--- linuxconsoletools-1.4.4-orig/utils/ident 2011-12-15 16:49:01.000000000
+0100
++++ linuxconsoletools-1.4.4/utils/ident 2013-02-05 23:23:23.880666880
+0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/awk -f
++#!/bin/awk -f
+
+ BEGIN {
+ FS = "\"";
diff --git a/linuxconsoletools-wacom.patch b/linuxconsoletools-wacom.patch
new file mode 100644
index 0000000..ca9a972
--- /dev/null
+++ b/linuxconsoletools-wacom.patch
@@ -0,0 +1,65 @@
+diff -NurP --minimal linuxconsoletools-1.4.4-orig/utils/inputattach.c
linuxconsoletools-1.4.4/utils/inputattach.c
+--- linuxconsoletools-1.4.4-orig/utils/inputattach.c 2013-02-05
23:04:47.970695969 +0100
++++ linuxconsoletools-1.4.4/utils/inputattach.c 2013-02-05
23:05:28.737361573 +0100
+@@ -584,6 +584,17 @@
+ }
+ }
+
++static int wacom_v_init(int fd, unsigned long *id, unsigned long *extra)
++{
++ if (write(fd, "BA19\r", 5) != 5)
++ return -1;
++
++ usleep(100 * 1000);
++
++ setline(fd, CS8, B19200);
++ return 0;
++}
++
+ struct input_types {
+ const char *name;
+ const char *name2;
+@@ -730,6 +741,12 @@
+ { "--w8001", "-w8001", "Wacom W8001",
+ B38400, CS8,
+ SERIO_W8001, 0x00, 0x00, 0, NULL },
++{ "--wacom_iv", "-wacom_iv", "Wacom protocol 4 tablet",
++ B9600, CS8,
++ SERIO_WACOM_IV, 0x00, 0x00, 0, NULL },
++{ "--wacom_v", "-wacom_v", "Wacom protocol 5 tablet",
++ B9600, CS8,
++ SERIO_WACOM_V, 0x00, 0x00, 0, wacom_v_init },
+ { NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, NULL }
+ };
+
+diff -NurP --minimal linuxconsoletools-1.4.4-orig/utils/serio-ids.h
linuxconsoletools-1.4.4/utils/serio-ids.h
+--- linuxconsoletools-1.4.4-orig/utils/serio-ids.h 2013-02-05
23:04:47.970695969 +0100
++++ linuxconsoletools-1.4.4/utils/serio-ids.h 2013-02-05 23:05:28.740694906
+0100
+@@ -128,5 +128,11 @@
+ #ifndef SERIO_EASYPEN
+ # define SERIO_EASYPEN 0x3e
+ #endif
++#ifndef SERIO_WACOM_IV
++# define SERIO_WACOM_IV 0x3d
++#endif
++#ifndef SERIO_WACOM_V
++# define SERIO_WACOM_V 0x3e
++#endif
+
+ #endif
+diff -NurP --minimal linuxconsoletools-1.4.4-orig/docs/inputattach.1
linuxconsoletools-1.4.4/docs/inputattach.1
+--- linuxconsoletools-1.4.4-orig/docs/inputattach.1 2011-12-17
20:05:48.000000000 +0100
++++ linuxconsoletools-1.4.4/docs/inputattach.1 2013-02-06 13:12:29.914073972
+0100
+@@ -148,6 +148,12 @@
+ .TP
+ .BR \-zhen ", " \-\-zhen-hua
+ Zhen Hua 5-byte protocol.
++.TP
++.BR \-wacom_iv ", " \-\-wacom_iv
++Wacom protocol 4 tablet.
++.TP
++.BR \-wacom_v ", " \-\-wacom_v
++Wacom protocol 5 tablet (Intuos and Intuos2).
+ .SH AUTHORS
+ .B inputattach
+ was written by Vojtech Pavlik and Arndt Schoenewald, and improved by
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/linuxconsoletools.git/commitdiff/c717686c34dab9d541a160866c0766ddd298cf88
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
