commit 9edb0d97f6e8677754fc973eeb12bacbba53553b
Author: Jakub Bogusz <[email protected]>
Date: Mon Jun 29 21:54:07 2015 +0200
- updated to 1.4.8
- updated wacom patch
linuxconsoletools-wacom.patch | 63 ++++++++++++++++++-------------------------
linuxconsoletools.spec | 5 ++--
2 files changed, 29 insertions(+), 39 deletions(-)
---
diff --git a/linuxconsoletools.spec b/linuxconsoletools.spec
index 077945e..21073b4 100644
--- a/linuxconsoletools.spec
+++ b/linuxconsoletools.spec
@@ -1,12 +1,12 @@
Summary: Tools for connecting joysticks & legacy devices to the kernel's
input subsystem
Summary(pl.UTF-8): Narzędzia podłączające joysticki i tradycyjne
urządzenia do podsystemu wejścia jądra
Name: linuxconsoletools
-Version: 1.4.7
+Version: 1.4.8
Release: 1
License: GPL v2+
Group: Applications/System
Source0:
http://downloads.sourceforge.net/linuxconsole/%{name}-%{version}.tar.bz2
-# Source0-md5: fc839ab0dd04718244e17eab9d137ecd
+# Source0-md5: d46f88de79d45ce1929b73022266f785
Patch0: %{name}-awk.patch
Patch1: %{name}-wacom.patch
URL: http://sourceforge.net/projects/linuxconsole/
@@ -64,6 +64,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/jstest
%dir %{_datadir}/joystick
%attr(755,root,root) %{_datadir}/joystick/*
+%attr(755,root,root) /lib/udev/js-set-enum-leds
%{_mandir}/man1/ffcfstress.1*
%{_mandir}/man1/ffmvforce.1*
%{_mandir}/man1/ffset.1*
diff --git a/linuxconsoletools-wacom.patch b/linuxconsoletools-wacom.patch
index ca9a972..3271b22 100644
--- a/linuxconsoletools-wacom.patch
+++ b/linuxconsoletools-wacom.patch
@@ -1,8 +1,7 @@
-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 @@
- }
+--- linuxconsoletools-1.4.8/utils/inputattach.c.orig 2015-01-18
15:43:41.000000000 +0100
++++ linuxconsoletools-1.4.8/utils/inputattach.c 2015-06-29
21:48:52.931946242 +0200
+@@ -622,6 +622,17 @@
+ return 0;
}
+static int wacom_v_init(int fd, unsigned long *id, unsigned long *extra)
@@ -19,47 +18,37 @@ diff -NurP --minimal
linuxconsoletools-1.4.4-orig/utils/inputattach.c linuxconso
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 },
+@@ -771,6 +782,9 @@
+ { "--wacom_iv", "-wacom_iv", "Wacom protocol 4 tablet",
+ B9600, CS8 | CRTSCTS,
+ SERIO_WACOM_IV, 0x00, 0x00, 0, wacom_iv_init },
+{ "--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
+--- linuxconsoletools-1.4.8/utils/serio-ids.h.orig 2015-01-18
15:43:41.000000000 +0100
++++ linuxconsoletools-1.4.8/utils/serio-ids.h 2015-06-29 21:50:29.495275523
+0200
+@@ -125,6 +125,9 @@
+ #ifndef SERIO_PSMULT
+ # define SERIO_PS2MULT 0x3c
#endif
-+#ifndef SERIO_WACOM_IV
-+# define SERIO_WACOM_IV 0x3d
-+#endif
+#ifndef SERIO_WACOM_V
-+# define SERIO_WACOM_V 0x3e
++# define SERIO_WACOM_V 0x3d
+#endif
-
+ #ifndef SERIO_WACOM_IV
+ # define SERIO_WACOM_IV 0x3e
#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 @@
+--- linuxconsoletools-1.4.8/docs/inputattach.1.orig 2015-01-18
15:43:41.000000000 +0100
++++ linuxconsoletools-1.4.8/docs/inputattach.1 2015-06-29 21:51:16.435273553
+0200
+@@ -146,6 +146,9 @@
+ .BR \-wacom_iv ", " \-\-wacom_iv
+ Wacom protocol IV tablets.
.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
++Wacom protocol V tablet (Intuos and Intuos2).
++.TP
+ .BR \-war ", " \-\-warrior
+ WingMan Warrior.
+ .TP
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/linuxconsoletools.git/commitdiff/9edb0d97f6e8677754fc973eeb12bacbba53553b
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
