Hello community,
here is the log from the commit of package linuxconsoletools for
openSUSE:Factory checked in at 2019-08-05 10:38:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/linuxconsoletools (Old)
and /work/SRC/openSUSE:Factory/.linuxconsoletools.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linuxconsoletools"
Mon Aug 5 10:38:29 2019 rev:9 rq:720285 version:1.6.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/linuxconsoletools/linuxconsoletools.changes
2019-01-26 22:22:59.698827558 +0100
+++
/work/SRC/openSUSE:Factory/.linuxconsoletools.new.4126/linuxconsoletools.changes
2019-08-05 10:38:34.935318619 +0200
@@ -1,0 +2,9 @@
+Thu Aug 1 18:04:18 UTC 2019 - Stefan Brüns <[email protected]>
+
+- update to 1.6.1
+ * inputattach supports the RainShadow HDMI CEC dongle (this requires
+ kernel 4.12 or later; thanks to Hans Verkuil).
+- Port ffmvforce away from SDL 1.2, add
+ 0001-Port-ffmvforce-to-SDL2-some-bugfixes.patch
+
+-------------------------------------------------------------------
Old:
----
linuxconsoletools-1.6.0.tar.bz2
New:
----
0001-Port-ffmvforce-to-SDL2-some-bugfixes.patch
linuxconsoletools-1.6.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ linuxconsoletools.spec ++++++
--- /var/tmp/diff_new_pack.yZjuFe/_old 2019-08-05 10:38:35.451318556 +0200
+++ /var/tmp/diff_new_pack.yZjuFe/_new 2019-08-05 10:38:35.451318556 +0200
@@ -17,14 +17,16 @@
Name: linuxconsoletools
-Version: 1.6.0
+Version: 1.6.1
Release: 0
Summary: A set of utilities for joysticks
License: GPL-2.0-or-later
Group: Hardware/Joystick
Url: http://sourceforge.net/projects/linuxconsole/
Source0:
http://sourceforge.net/projects/linuxconsole/files/%{name}-%{version}.tar.bz2
-BuildRequires: libSDL-devel
+# PATCH-FIX-UPSTREAM
+Patch0: 0001-Port-ffmvforce-to-SDL2-some-bugfixes.patch
+BuildRequires: libSDL2-devel
BuildRequires: linux-kernel-headers
BuildRequires: pkgconfig
BuildRequires: systemd-devel
@@ -48,6 +50,7 @@
%prep
%setup -q
+%patch0 -p1
%build
make %{?_smp_mflags} \
@@ -71,8 +74,8 @@
%{buildroot}/%{_mandir}/man1/inputattach.1
%files
-%defattr(-,root,root)
-%doc COPYING NEWS README
+%license COPYING
+%doc NEWS README
%{_bindir}/evdev-joystick
%{_bindir}/ffcfstress
%{_bindir}/ffmvforce
++++++ 0001-Port-ffmvforce-to-SDL2-some-bugfixes.patch ++++++
>From 3aa2d246550f506850d53d9f6914c3371adf0474 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <[email protected]>
Date: Thu, 1 Aug 2019 18:00:02 +0200
Subject: [PATCH] Port ffmvforce to SDL2, some bugfixes
This also adds some features and does some minor bugfixes:
- Mouse clicks are honored: a click without movement only generates
a BUTTONDOWN, but no MOTION event.
- The last position is always forwarded to the FF device, previously
all events after the last generated event were dropped if they fell
into the same update period.
- The four quadrants are shown in the window, and a line from the center
to the last event position drawn.
---
utils/Makefile | 4 +-
utils/ffmvforce.c | 100 +++++++++++++++++++++++++++++++++++-----------
2 files changed, 79 insertions(+), 25 deletions(-)
diff --git a/utils/Makefile b/utils/Makefile
index 864b017d..b565cf97 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -51,10 +51,10 @@ ffcfstress: ffcfstress.c
$(CC) $(CFLAGS) $(CPPFLAGS) -funsigned-char $^ $(LDFLAGS) -lm -o $@
ffmvforce.o: ffmvforce.c
- $(CC) $(CFLAGS) $(CPPFLAGS) -c $^ -o $@ `sdl-config --cflags`
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $^ -o $@ `sdl2-config --cflags`
ffmvforce: ffmvforce.o
- $(CC) $^ -o $@ $(LDFLAGS) -g -lm `sdl-config --libs`
+ $(CC) $^ -o $@ $(LDFLAGS) -g -lm `sdl2-config --libs`
axbtnmap.o: axbtnmap.c axbtnmap.h
diff --git a/utils/ffmvforce.c b/utils/ffmvforce.c
index efe0511c..a4bb6353 100644
--- a/utils/ffmvforce.c
+++ b/utils/ffmvforce.c
@@ -43,9 +43,12 @@
#define max(a,b) ((a)>(b)?(a):(b))
/* File descriptor of the force feedback /dev entry */
-static int ff_fd;
+static int ff_fd = -1;
static struct ff_effect effect;
+static SDL_Window* window = NULL;
+static SDL_Renderer* renderer = NULL;
+
static void welcome()
{
const char* txt[] = {
@@ -112,18 +115,29 @@ printf("level: %04x direction: %04x\n", (unsigned
int)effect.u.constant.level, (
first = 0;
}
+static void shutdown()
+{
+ SDL_DestroyRenderer(renderer);
+ SDL_DestroyWindow(window);
+
+ SDL_Quit();
+ if (ff_fd >= 0) {
+ close(ff_fd);
+ }
+}
+
int main(int argc, char** argv)
{
- SDL_Surface* screen;
const char * dev_name = "/dev/input/event0";
- int i;
- Uint32 ticks, period = 200;
+ Uint32 ticks, timeout, period = 200;
+ Sint32 x = WIN_W / 2, y = WIN_H / 2;
+ Uint32 state = 0;
welcome();
if (argc <= 1) return 0;
/* Parse parameters */
- for (i=1; i<argc; ++i) {
+ for (int i = 1; i < argc; ++i) {
if (strcmp(argv[i], "--help") == 0) {
printf("Usage: %s /dev/input/eventXX [-u update
frequency in HZ]\n", argv[0]);
printf("Generates constant force effects depending on
the position of the mouse\n");
@@ -142,14 +156,21 @@ int main(int argc, char** argv)
}
/* Initialize SDL */
- if (SDL_Init(SDL_INIT_VIDEO) < 0) {
+ if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_EVENTS) < 0) {
fprintf(stderr, "Could not initialize SDL: %s\n",
SDL_GetError());
exit(1);
}
- atexit(SDL_Quit);
- screen = SDL_SetVideoMode(WIN_W, WIN_H, 0, SDL_SWSURFACE);
- if (screen == NULL) {
- fprintf(stderr, "Could not set video mode: %s\n",
SDL_GetError());
+ atexit(&shutdown);
+
+ window = SDL_CreateWindow("ffmvforce", SDL_WINDOWPOS_CENTERED,
SDL_WINDOWPOS_CENTERED, WIN_W, WIN_H, 0);
+ if (!window) {
+ fprintf(stderr, "Could not create window: %s\n",
SDL_GetError());
+ exit(1);
+ }
+
+ renderer = SDL_CreateRenderer(window, -1, 0);
+ if (!renderer) {
+ fprintf(stderr, "Could not create renderer: %s\n",
SDL_GetError());
exit(1);
}
@@ -161,25 +182,58 @@ int main(int argc, char** argv)
}
ticks = SDL_GetTicks();
+ timeout = ticks + period;
+
/* Main loop */
for (;;) {
SDL_Event event;
- SDL_WaitEvent(&event);
- switch (event.type) {
- case SDL_QUIT:
- exit(0);
- break;
-
- case SDL_MOUSEMOTION:
- if (event.motion.state && SDL_GetTicks()-ticks >
period) {
- ticks = SDL_GetTicks();
- generate_force(event.motion.x, event.motion.y);
+ if (state) {
+ SDL_WaitEventTimeout(&event, period);
+ } else {
+ SDL_WaitEvent(&event);
+ }
+
+ do {
+ if (event.type == SDL_QUIT) {
+ exit(0);
+
+ } else if (event.type == SDL_KEYDOWN) {
+ switch(event.key.keysym.sym) {
+ case SDLK_ESCAPE:
+ case SDLK_q:
+ exit(0);
+ default:
+ break;
+ }
+
+ } else if (event.type == SDL_MOUSEBUTTONDOWN) {
+ state = event.button.state;
+ x = event.button.x;
+ y = event.button.y;
+
+ } else if (event.type == SDL_MOUSEMOTION &&
event.motion.state) {
+ state = event.motion.state;
+ x = event.motion.x;
+ y = event.motion.y;
}
-
- break;
+ } while(SDL_PollEvent(&event));
+
+ ticks = SDL_GetTicks();
+ if (state && SDL_TICKS_PASSED(ticks, timeout)) {
+ timeout = ticks + period;
+ generate_force(x, y);
+ state = 0;
}
+
+ SDL_SetRenderDrawColor(renderer, 0, 0, 0, SDL_ALPHA_OPAQUE);
+ SDL_RenderClear(renderer);
+ SDL_SetRenderDrawColor(renderer, 255, 255, 255,
SDL_ALPHA_OPAQUE);
+ SDL_RenderDrawLine(renderer, 0, WIN_H / 2, WIN_W, WIN_H / 2);
+ SDL_RenderDrawLine(renderer, WIN_W / 2, 0, WIN_W / 2, WIN_H);
+ SDL_RenderDrawLine(renderer, WIN_W / 2, WIN_H / 2, x, y);
+ SDL_RenderPresent(renderer);
}
- return 0;
+ exit(0);
}
--
2.22.0
++++++ linuxconsoletools-1.6.0.tar.bz2 -> linuxconsoletools-1.6.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxconsoletools-1.6.0/Makefile
new/linuxconsoletools-1.6.1/Makefile
--- old/linuxconsoletools-1.6.0/Makefile 2016-10-08 12:42:02.000000000
+0200
+++ new/linuxconsoletools-1.6.1/Makefile 2019-02-02 22:58:24.000000000
+0100
@@ -2,7 +2,7 @@
#
# Makefile for Linux input utilities
#
-# © 2011-2016 Stephen Kitt <[email protected]>
+# © 2011-2019 Stephen Kitt <[email protected]>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301 USA.
-VERSION := 1.6.0
+VERSION := 1.6.1
PACKAGE := linuxconsoletools-$(VERSION)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxconsoletools-1.6.0/NEWS
new/linuxconsoletools-1.6.1/NEWS
--- old/linuxconsoletools-1.6.0/NEWS 2016-10-08 12:40:22.000000000 +0200
+++ new/linuxconsoletools-1.6.1/NEWS 2019-02-02 22:57:32.000000000 +0100
@@ -1,3 +1,12 @@
+Version 1.6.1
+-------------
+
+* inputattach supports the RainShadow HDMI CEC dongle (this requires
+ kernel 4.12 or later; thanks to Hans Verkuil).
+
+* The jscal store and restore tools use udevadm on the path, instead
+ of hard-coding /sbin.
+
Version 1.6.0
-------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxconsoletools-1.6.0/README
new/linuxconsoletools-1.6.1/README
--- old/linuxconsoletools-1.6.0/README 2016-10-08 12:41:35.000000000 +0200
+++ new/linuxconsoletools-1.6.1/README 2019-02-02 22:59:05.000000000 +0100
@@ -1,5 +1,5 @@
linuxconsole tools
- Release 1.5.1
+ Release 1.6.1
http://sf.net/projects/linuxconsole/
@@ -219,7 +219,7 @@
* Böszörményi Zoltán: eGalaxTouch support, Hampshire support, systemd
notification.
* Stephen Anthony: evdev-joystick (based on G25manage).
-* Hans Verkuil: Pulse-Eight HDMI CEC dongle support.
+* Hans Verkuil: Pulse-Eight and RainShadow HDMI CEC dongle support.
* Jon Sangster: min/max axis control in evdev-joystick.
@@ -231,7 +231,7 @@
Copyright © 2001 Oliver Hamann
Copyright © 2001-2002 Johann Deneux
Copyright © 2001 Arndt Schoenewald
- Copyright © 2008-2016 Stephen Kitt
+ Copyright © 2008-2019 Stephen Kitt
Copyright © 2016 Stephen Anthony
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxconsoletools-1.6.0/utils/Makefile
new/linuxconsoletools-1.6.1/utils/Makefile
--- old/linuxconsoletools-1.6.0/utils/Makefile 2016-04-19 23:28:36.000000000
+0200
+++ new/linuxconsoletools-1.6.1/utils/Makefile 2017-08-05 10:40:02.000000000
+0200
@@ -25,7 +25,7 @@
# Edit the options below to suit your needs
#
-CFLAGS ?= -g -O2 -Wall
+CFLAGS ?= -g -O2 -Wall -Wextra
PROGRAMS = inputattach jstest jscal fftest ffmvforce ffset \
ffcfstress jscal-restore jscal-store evdev-joystick
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxconsoletools-1.6.0/utils/ffcfstress.c
new/linuxconsoletools-1.6.1/utils/ffcfstress.c
--- old/linuxconsoletools-1.6.0/utils/ffcfstress.c 2016-01-14
20:39:19.000000000 +0100
+++ new/linuxconsoletools-1.6.1/utils/ffcfstress.c 2017-08-05
19:09:04.000000000 +0200
@@ -87,7 +87,7 @@
} else if (!strcmp(argv[i],"-x")) {
if (i<argc-1) {
axis_index = atoi(argv[++i]);
- if (axis_index < 0 || axis_index >=
sizeof(axis_names)/sizeof(char*))
+ if (axis_index < 0 || axis_index >= (int)
(sizeof(axis_names) / sizeof(char*)))
help = 1;
else
axis_code = axis_codes[axis_index];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxconsoletools-1.6.0/utils/fftest.c
new/linuxconsoletools-1.6.1/utils/fftest.c
--- old/linuxconsoletools-1.6.0/utils/fftest.c 2013-05-06 23:03:10.000000000
+0200
+++ new/linuxconsoletools-1.6.1/utils/fftest.c 2017-08-05 19:08:31.000000000
+0200
@@ -123,7 +123,7 @@
if (testBit(ABS_MISC, absFeatures)) printf("Misc ,");
printf("\n [");
- for (i=0; i<sizeof(absFeatures)/sizeof(unsigned char);i++)
+ for (i = 0; i < (int) (sizeof(absFeatures) / sizeof(unsigned char));
i++)
printf("%02X ", absFeatures[i]);
printf("]\n");
@@ -148,7 +148,7 @@
if (testBit(REL_MISC, relFeatures)) printf("Misc, ");
printf("\n [");
- for (i=0; i<sizeof(relFeatures)/sizeof(unsigned char);i++)
+ for (i = 0; i < (int) (sizeof(relFeatures) / sizeof(unsigned char));
i++)
printf("%02X ", relFeatures[i]);
printf("]\n");
@@ -182,7 +182,7 @@
if (testBit(FF_CUSTOM, ffFeatures)) printf("Custom, ");
printf("\n [");
- for (i=0; i<sizeof(ffFeatures)/sizeof(unsigned char);i++)
+ for (i = 0; i < (int) (sizeof(ffFeatures) / sizeof(unsigned char)); i++)
printf("%02X ", ffFeatures[i]);
printf("]\n");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxconsoletools-1.6.0/utils/inputattach.c
new/linuxconsoletools-1.6.1/utils/inputattach.c
--- old/linuxconsoletools-1.6.0/utils/inputattach.c 2016-08-09
13:04:05.000000000 +0200
+++ new/linuxconsoletools-1.6.1/utils/inputattach.c 2019-02-02
22:47:20.000000000 +0100
@@ -105,14 +105,18 @@
return 0;
}
-static int magellan_init(int fd, unsigned long *id, unsigned long *extra)
+static int magellan_init(int fd,
+ __attribute__ ((unused)) unsigned long *id,
+ __attribute__ ((unused)) unsigned long *extra)
{
if (write(fd, "m3\rpBB\rz\r", 9) != 9)
return -1;
return 0;
}
-static int warrior_init(int fd, unsigned long *id, unsigned long *extra)
+static int warrior_init(int fd,
+ __attribute__ ((unused)) unsigned long *id,
+ __attribute__ ((unused)) unsigned long *extra)
{
if (logitech_command(fd, "*S"))
return -1;
@@ -175,7 +179,9 @@
#define SPACEBALL_4000FLX 8
#define SPACEBALL_4000FLX_L 9
-static int spaceball_init(int fd, unsigned long *id, unsigned long *extra)
+static int spaceball_init(int fd,
+ unsigned long *id,
+ __attribute__ ((unused)) unsigned long *extra)
{
char r[64];
@@ -239,7 +245,9 @@
return 0;
}
-static int stinger_init(int fd, unsigned long *id, unsigned long *extra)
+static int stinger_init(int fd,
+ __attribute__ ((unused)) unsigned long *id,
+ __attribute__ ((unused)) unsigned long *extra)
{
int i;
unsigned char c;
@@ -255,7 +263,9 @@
return 0;
}
-static int mzp_init(int fd, unsigned long *id, unsigned long *extra)
+static int mzp_init(int fd,
+ __attribute__ ((unused)) unsigned long *id,
+ __attribute__ ((unused)) unsigned long *extra)
{
if (logitech_command(fd, "*X*q"))
return -1;
@@ -264,9 +274,11 @@
return 0;
}
-static int newton_init(int fd, unsigned long *id, unsigned long *extra)
+static int newton_init(int fd,
+ __attribute__ ((unused)) unsigned long *id,
+ __attribute__ ((unused)) unsigned long *extra)
{
- int i;
+ unsigned int i;
unsigned char c;
unsigned char response[35] = {
0x16, 0x10, 0x02, 0x64, 0x5f, 0x69, 0x64, 0x00,
@@ -283,7 +295,9 @@
return 0;
}
-static int twiddler_init(int fd, unsigned long *id, unsigned long *extra)
+static int twiddler_init(int fd,
+ __attribute__ ((unused)) unsigned long *id,
+ __attribute__ ((unused)) unsigned long *extra)
{
unsigned char c[10];
int count, line;
@@ -337,9 +351,11 @@
return 0;
}
-static int pm6k_init(int fd, unsigned long *id, unsigned long *extra)
+static int pm6k_init(int fd,
+ __attribute__ ((unused)) unsigned long *id,
+ __attribute__ ((unused)) unsigned long *extra)
{
- int i = 0;
+ unsigned int i = 0;
unsigned char cmd[6] = {0xF1, 0x00, 0x00, 0x00, 0x00, 0x0E};
unsigned char data[6] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -355,7 +371,9 @@
return 0;
}
-static int fujitsu_init(int fd, unsigned long *id, unsigned long *extra)
+static int fujitsu_init(int fd,
+ __attribute__ ((unused)) unsigned long *id,
+ __attribute__ ((unused)) unsigned long *extra)
{
unsigned char cmd, data;
@@ -383,7 +401,9 @@
return 0;
}
-static int tsc40_init(int fd, unsigned long *id, unsigned long *extra)
+static int tsc40_init(int fd,
+ __attribute__ ((unused)) unsigned long *id,
+ __attribute__ ((unused)) unsigned long *extra)
{
unsigned char cmd[2], data;
unsigned int eeprom;
@@ -459,7 +479,9 @@
return 0;
}
-static int t213_init(int fd, unsigned long *id, unsigned long *extra)
+static int t213_init(int fd,
+ __attribute__ ((unused)) unsigned long *id,
+ __attribute__ ((unused)) unsigned long *extra)
{
char cmd[]={0x0a,1,'A'};
int count=10;
@@ -505,7 +527,9 @@
return -1;
}
-static int zhenhua_init(int fd, unsigned long *id, unsigned long *extra)
+static int zhenhua_init(int fd,
+ __attribute__ ((unused)) unsigned long *id,
+ __attribute__ ((unused)) unsigned long *extra)
{
/* Zhen Hua 5 byte protocol: first (synchronization) byte allways
* contain 0xF7, next four bytes are axis of controller with values
@@ -548,7 +572,9 @@
#define EP_UPPER_ORIGIN "b" /* Origin upper left */
#define EP_STREAM_MODE "@" /* Stream mode */
-static int easypen_init(int fd, unsigned long *id, unsigned long *extra)
+static int easypen_init(int fd,
+ __attribute__ ((unused)) unsigned long *id,
+ __attribute__ ((unused)) unsigned long *extra)
{
char buf[256];
@@ -570,7 +596,9 @@
return 0;
}
-static int dump_init(int fd, unsigned long *id, unsigned long *extra)
+static int dump_init(int fd,
+ __attribute__ ((unused)) unsigned long *id,
+ __attribute__ ((unused)) unsigned long *extra)
{
unsigned char c, o = 0;
@@ -596,7 +624,9 @@
#define WACOM_IV_STOP "SP\r"
enum { WACOM_IV_RESET_BAUD_LEN = 2, WACOM_IV_RESET_LEN = 2, WACOM_IV_STOP_LEN
= 3 };
-static int wacom_iv_init(int fd, unsigned long *id, unsigned long *extra)
+static int wacom_iv_init(int fd,
+ __attribute__ ((unused)) unsigned long *id,
+ __attribute__ ((unused)) unsigned long *extra)
{
setline(fd, CS8 | CRTSCTS, B38400);
if (write(fd, WACOM_IV_RESET_BAUD, WACOM_IV_RESET_BAUD_LEN) !=
WACOM_IV_RESET_BAUD_LEN)
@@ -668,7 +698,9 @@
return -1;
}
-static int egalax_init(int fd, unsigned long *id, unsigned long *extra) {
+static int egalax_init(int fd,
+ __attribute__ ((unused)) unsigned long *id,
+ __attribute__ ((unused)) unsigned long *extra) {
unsigned char packet_alive_query[3] = { 0x0a, 0x01, 'A' };
unsigned char packet_fw_ver[3] = { 0x0a, 0x01, 'D' };
unsigned char packet_ctrl_type[3] = { 0x0a, 0x01, 'E' };
@@ -867,6 +899,9 @@
{ "--pulse8-cec", "-pulse8-cec", "Pulse Eight HDMI CEC dongle",
B9600, CS8,
SERIO_PULSE8_CEC, 0x00, 0x00, 0, NULL },
+{ "--rainshadow-cec", "-rainshadow-cec", "RainShadow Tech HDMI
CEC dongle",
+ B9600, CS8,
+ SERIO_RAINSHADOW_CEC, 0x00, 0x00, 0, NULL },
{ NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, NULL }
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxconsoletools-1.6.0/utils/jscal-restore.in
new/linuxconsoletools-1.6.1/utils/jscal-restore.in
--- old/linuxconsoletools-1.6.0/utils/jscal-restore.in 2013-01-01
13:28:04.000000000 +0100
+++ new/linuxconsoletools-1.6.1/utils/jscal-restore.in 2019-02-02
22:51:22.000000000 +0100
@@ -6,7 +6,7 @@
exit 1
fi
-if [ ! -x /sbin/udevadm ]; then
+if ! udevadm --version > /dev/null; then
echo Restoring joystick configuration requires udev! >&2
exit 1
fi
@@ -30,7 +30,7 @@
# in the NAME value
IFS=$'\x0A'
-for ATTRIBUTE in $( /sbin/udevadm info -a -n $1 |
@@PREFIX@@/share/joystick/ident ); do
+for ATTRIBUTE in $( udevadm info -a -n $1 | @@PREFIX@@/share/joystick/ident );
do
ID=$( echo "$ATTRIBUTE" | cut -f 1 -d = )
VALUE=$( echo "$ATTRIBUTE" | cut -f 2 -d \" )
case $ID in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxconsoletools-1.6.0/utils/jscal-store.in
new/linuxconsoletools-1.6.1/utils/jscal-store.in
--- old/linuxconsoletools-1.6.0/utils/jscal-store.in 2013-01-01
13:28:04.000000000 +0100
+++ new/linuxconsoletools-1.6.1/utils/jscal-store.in 2019-02-02
22:51:22.000000000 +0100
@@ -12,13 +12,13 @@
exit 1
fi
-if [ ! -x /sbin/udevadm ]; then
+if ! udevadm --version > /dev/null; then
echo Storing joystick configuration requires udev! >&2
exit 1
fi
ident=$(mktemp)
-/sbin/udevadm info -a -n $1 | @@PREFIX@@/share/joystick/ident > $ident
+udevadm info -a -n $1 | @@PREFIX@@/share/joystick/ident > $ident
. $ident
rm $ident
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxconsoletools-1.6.0/utils/serio-ids.h
new/linuxconsoletools-1.6.1/utils/serio-ids.h
--- old/linuxconsoletools-1.6.0/utils/serio-ids.h 2016-08-09
13:04:05.000000000 +0200
+++ new/linuxconsoletools-1.6.1/utils/serio-ids.h 2017-08-05
10:38:18.000000000 +0200
@@ -134,5 +134,8 @@
#ifndef SERIO_PULSE8_CEC
# define SERIO_PULSE8_CEC 0x40
#endif
+#ifndef SERIO_RAINSHADOW_CEC
+# define SERIO_RAINSHADOW_CEC 0x41
+#endif
#endif
