Hello community, here is the log from the commit of package linuxconsoletools for openSUSE:Factory checked in at 2015-02-22 17:21:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linuxconsoletools (Old) and /work/SRC/openSUSE:Factory/.linuxconsoletools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "linuxconsoletools" Changes: -------- --- /work/SRC/openSUSE:Factory/linuxconsoletools/linuxconsoletools.changes 2014-02-19 07:51:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.linuxconsoletools.new/linuxconsoletools.changes 2015-02-22 17:21:15.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Feb 19 22:35:46 UTC 2015 - p.drouand@gmail.com + +- Update to version 1.4.8 + * Set up PS3 controller LEDs correctly + * inputattach supports Wacom IV tablets on kernels 3.17 and greater + +------------------------------------------------------------------- Old: ---- linuxconsoletools-1.4.7.tar.bz2 New: ---- linuxconsoletools-1.4.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxconsoletools.spec ++++++ --- /var/tmp/diff_new_pack.ckdq6m/_old 2015-02-22 17:21:16.000000000 +0100 +++ /var/tmp/diff_new_pack.ckdq6m/_new 2015-02-22 17:21:16.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package linuxconsoletools # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,16 @@ Name: linuxconsoletools -Version: 1.4.7 +Version: 1.4.8 Release: 0 Summary: A set of utilities for joysticks License: GPL-2.0+ Group: Hardware/Joystick Url: http://sourceforge.net/projects/linuxconsole/ -Source0: %{name}-%{version}.tar.bz2 +Source0: http://sourceforge.net/projects/linuxconsole/files/%{name}-%{version}.tar.bz2 BuildRequires: libSDL-devel BuildRequires: linux-kernel-headers +BuildRequires: udev # moved in 13.2 Provides: input-utils = 2007.06.22 @@ -55,12 +56,16 @@ %install %make_install PREFIX=%{_prefix} chmod 644 %{buildroot}%{_mandir}/man1/* +# Fix udev dir +mkdir -p %{buildroot}%{_libexecdir}/udev +mv %{buildroot}/lib/udev/js-set-enum-leds %{buildroot}%{_libexecdir}/udev/js-set-enum-leds %files %defattr(-,root,root) %doc COPYING NEWS README %{_bindir}/* %{_datadir}/joystick/ -%doc %{_mandir}/man1/* +%{_mandir}/man1/* +%{_libexecdir}/udev/js-set-enum-leds %changelog ++++++ linuxconsoletools-1.4.7.tar.bz2 -> linuxconsoletools-1.4.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxconsoletools-1.4.7/Makefile new/linuxconsoletools-1.4.8/Makefile --- old/linuxconsoletools-1.4.7/Makefile 2014-01-08 07:40:44.000000000 +0100 +++ new/linuxconsoletools-1.4.8/Makefile 2015-01-18 15:20:37.000000000 +0100 @@ -2,7 +2,7 @@ # # Makefile for Linux input utilities # -# © 2011-2014 Stephen Kitt <steve@sk2.org> +# © 2011-2015 Stephen Kitt <steve@sk2.org> # # 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.4.7 +VERSION := 1.4.8 PACKAGE := linuxconsoletools-$(VERSION) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxconsoletools-1.4.7/NEWS new/linuxconsoletools-1.4.8/NEWS --- old/linuxconsoletools-1.4.7/NEWS 2014-01-08 07:36:51.000000000 +0100 +++ new/linuxconsoletools-1.4.8/NEWS 2015-01-18 15:47:25.000000000 +0100 @@ -1,3 +1,12 @@ +Version 1.4.8 +------------- + +* Set up PS3 controller LEDs correctly (thanks to bri + <bri@abrij.org>). + +* inputattach supports Wacom IV tablets on kernels 3.17 and greater + (thanks to Julian Squires <julian@cipht.net>). + Version 1.4.7 ------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxconsoletools-1.4.7/README new/linuxconsoletools-1.4.8/README --- old/linuxconsoletools-1.4.7/README 2014-01-08 07:40:16.000000000 +0100 +++ new/linuxconsoletools-1.4.8/README 2015-01-18 15:43:58.000000000 +0100 @@ -1,5 +1,5 @@ linuxconsole tools - Release 1.4.7 + Release 1.4.8 http://sf.net/projects/linuxconsole/ @@ -119,6 +119,23 @@ appropriate X.org driver when using inputattach in this way is evdev. +Configuring PS3 controller LEDs +------------------------------- + +The js-set-enum-leds can be used with udev to ensure that the +controller LEDs on PS3 controllers match their identifiers as set by +Bluetooth host software. This ensures that if the controllers are +plugged in before the Bluetooth daemon starts, the LEDs still match +the identifier assigned once the daemon has initialised. + +The following udev rule achieves this: + + # Set PS3 controller leds to the same value bluez will choose for it. + # IMPORT{parent} used because $parent did not appear to be working; we + # don't need the devpath of the js device for this so it is OK to overwrite. + ACTION=="add", KERNEL=="js*", IMPORT{parent}="DEVPATH", ATTRS{name}=="Sony PLAYSTATION(R)3 Controller", RUN+="/lib/udev/js-set-enum-leds /sys/%E{DEVPATH}/device/leds/ $number" + + Contributors ------------ @@ -144,6 +161,8 @@ patch originally by Jean-Philippe Meure). * Ralf Jung: fixes for long device names. * Andrew Basterfield: fix for Spaceball 4000FLX support. +* bri: PS3 controller LED configuration +* Julian Squires: Wacom IV support. License @@ -154,7 +173,7 @@ Copyright © 2001 Oliver Hamann Copyright © 2001-2002 Johann Deneux Copyright © 2001 Arndt Schoenewald - Copyright © 2008-2014 Stephen Kitt + Copyright © 2008-2015 Stephen Kitt This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxconsoletools-1.4.7/docs/inputattach.1 new/linuxconsoletools-1.4.8/docs/inputattach.1 --- old/linuxconsoletools-1.4.7/docs/inputattach.1 2011-12-17 20:05:48.000000000 +0100 +++ new/linuxconsoletools-1.4.8/docs/inputattach.1 2015-01-18 15:43:41.000000000 +0100 @@ -143,6 +143,9 @@ allows for touch-only or pen and touch devices; for pen-only devices, "\fB\-\-baud 19200\fP" must be specified. .TP +.BR \-wacom_iv ", " \-\-wacom_iv +Wacom protocol IV tablets. +.TP .BR \-war ", " \-\-warrior WingMan Warrior. .TP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxconsoletools-1.4.7/utils/Makefile new/linuxconsoletools-1.4.8/utils/Makefile --- old/linuxconsoletools-1.4.7/utils/Makefile 2012-09-05 08:34:53.000000000 +0200 +++ new/linuxconsoletools-1.4.8/utils/Makefile 2015-01-18 15:22:53.000000000 +0100 @@ -72,5 +72,7 @@ install $(PROGRAMS) $(DESTDIR)$(PREFIX)/bin install -d $(DESTDIR)$(PREFIX)/share/joystick install extract filter ident $(DESTDIR)$(PREFIX)/share/joystick + install -d $(DESTDIR)/lib/udev + install js-set-enum-leds $(DESTDIR)/lib/udev .PHONY: compile clean distclean install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxconsoletools-1.4.7/utils/inputattach.c new/linuxconsoletools-1.4.8/utils/inputattach.c --- old/linuxconsoletools-1.4.7/utils/inputattach.c 2014-01-08 07:35:29.000000000 +0100 +++ new/linuxconsoletools-1.4.8/utils/inputattach.c 2015-01-18 15:43:41.000000000 +0100 @@ -585,6 +585,43 @@ } } +#define WACOM_IV_RESET_BAUD "\r$" +#define WACOM_IV_RESET "\r#" +#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) +{ + setline(fd, CS8 | CRTSCTS, B38400); + if (write(fd, WACOM_IV_RESET_BAUD, WACOM_IV_RESET_BAUD_LEN) != WACOM_IV_RESET_BAUD_LEN) + return -1; + usleep(250 * 1000); + if (write(fd, WACOM_IV_RESET, WACOM_IV_RESET_LEN) != WACOM_IV_RESET_LEN) + return -1; + usleep(75 * 1000); + + setline(fd, CS8 | CRTSCTS, B19200); + if (write(fd, WACOM_IV_RESET_BAUD, WACOM_IV_RESET_BAUD_LEN) != WACOM_IV_RESET_BAUD_LEN) + return -1; + usleep(250 * 1000); + if (write(fd, WACOM_IV_RESET, WACOM_IV_RESET_LEN) != WACOM_IV_RESET_LEN) + return -1; + usleep(75 * 1000); + + setline(fd, CS8 | CRTSCTS, B9600); + if (write(fd, WACOM_IV_RESET_BAUD, WACOM_IV_RESET_BAUD_LEN) != WACOM_IV_RESET_BAUD_LEN) + return -1; + usleep(250 * 1000); + if (write(fd, WACOM_IV_RESET, WACOM_IV_RESET_LEN) != WACOM_IV_RESET_LEN) + return -1; + usleep(75 * 1000); + if (write(fd, WACOM_IV_STOP, WACOM_IV_STOP_LEN) != WACOM_IV_STOP_LEN) + return -1; + usleep(30 * 1000); + + return 0; +} + struct input_types { const char *name; const char *name2; @@ -731,6 +768,9 @@ { "--w8001", "-w8001", "Wacom W8001", B38400, CS8, SERIO_W8001, 0x00, 0x00, 0, NULL }, +{ "--wacom_iv", "-wacom_iv", "Wacom protocol 4 tablet", + B9600, CS8 | CRTSCTS, + SERIO_WACOM_IV, 0x00, 0x00, 0, wacom_iv_init }, { NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, NULL } }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxconsoletools-1.4.7/utils/js-set-enum-leds new/linuxconsoletools-1.4.8/utils/js-set-enum-leds --- old/linuxconsoletools-1.4.7/utils/js-set-enum-leds 1970-01-01 01:00:00.000000000 +0100 +++ new/linuxconsoletools-1.4.8/utils/js-set-enum-leds 2015-01-18 15:16:12.000000000 +0100 @@ -0,0 +1,76 @@ +#!/bin/sh + +# js-set-enum-leds: Set gamepad enumerator LEDS to match the js device number. + +# Copyright © 2014 bri <bri@abrij.org> +# +# 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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + +# If the gamepad/joystick is bluetooth-capable, bluez may set the leds +# even before the gamepad is connected. In these cases please match what +# bluez will do (or may already have done if it is already running.) + +. /lib/udev/hotplug.functions + +# If the set_gamepad_leds function provided for convenience is to be used +# for a particular type of gamepad, the udev rule should provide the following +# postional parameters. See /lib/udev/rules.d/60-joystick for examples. + +# A partial path string containing the common part of the names of affected +# led-class sysfs directories. +LEDGLOB=$1 +# The number of the js device. These start at 0 but enumerator LEDs are +# 1-based. (Having at least one LED on lets user see controller is on.) +JSNUM=$2 + +set_gamepad_leds() { + for led in "$LEDGLOB"*; do + if [ -d $led ] && [ -w $led/brightness ] && [ "$1" ]; then + echo $1 > $led/brightness + shift 1 + else + mesg "set_gamepad_leds: wrong number of leds or values" + exit -1 + fi + done +} + +# In addition it is assumed ID_MODEL will have been set appropriately by udev +# This is used to select the appropriate actions for the particular model. + +case $ID_MODEL in + PLAYSTATION_R_3_Controller) + case $JSNUM in + 0) set_gamepad_leds 1 0 0 0; + ;; + 1) set_gamepad_leds 0 1 0 0; + ;; + 2) set_gamepad_leds 0 0 1 0; + ;; + 3) set_gamepad_leds 0 0 0 1; + ;; + 4) set_gamepad_leds 1 0 0 1; + ;; + 5) set_gamepad_leds 0 1 0 1; + ;; + 6) set_gamepad_leds 0 0 1 1; + ;; + *) set_gamepad_leds 0 0 0 0; + ;; + esac + ;; + *) mesg "called with no matching model" +esac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxconsoletools-1.4.7/utils/serio-ids.h new/linuxconsoletools-1.4.8/utils/serio-ids.h --- old/linuxconsoletools-1.4.7/utils/serio-ids.h 2012-11-27 22:22:26.000000000 +0100 +++ new/linuxconsoletools-1.4.8/utils/serio-ids.h 2015-01-18 15:43:41.000000000 +0100 @@ -125,8 +125,11 @@ #ifndef SERIO_PSMULT # define SERIO_PS2MULT 0x3c #endif +#ifndef SERIO_WACOM_IV +# define SERIO_WACOM_IV 0x3e +#endif #ifndef SERIO_EASYPEN -# define SERIO_EASYPEN 0x3e +# define SERIO_EASYPEN 0x3f #endif #endif -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org