Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=a4e8a4e2659db04bdfeff8e0a6e3b5704777643e
commit a4e8a4e2659db04bdfeff8e0a6e3b5704777643e Author: Michel Hermier <[email protected]> Date: Thu Dec 1 14:55:16 2011 +0100 xf86-input-wacom-0.12.0-1-i686 * Bump version. diff --git a/source/x11-extra/xf86-input-wacom/60-wacom.rules b/source/x11-extra/xf86-input-wacom/60-wacom.rules deleted file mode 100644 index 19cb4f5..0000000 --- a/source/x11-extra/xf86-input-wacom/60-wacom.rules +++ /dev/null @@ -1,74 +0,0 @@ -# udev rules for wacom tablets. -# These rules were compiled for the Debian GNU/Linux distribution, -# but others may, and indeed are encouraged to, use them also. -# -# Should you do so, PLEASE CO-ORDINATE ANY CHANGES OR ADDITIONS -# of new devices with Ron <[email protected]> so that we can try -# to present users with with a standard set of device nodes -# which they can rely on across the board. - -# Convenience link for the common case of a single tablet. -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", SYMLINK="input/wacom" - -# Port specific link for users of multiple tablets of the same type. -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ENV{ID_PATH}=="?*", SYMLINK+="input/by-path/$env{ID_PATH}-wacom" - -# Type-named links for multiple tablets. If you want to use multiple -# tablets of the _same_ type, you will probably need to use the links -# from /dev/input/by-path to identify which is plugged into what usb -# port. For different types though, just pick your links from the -# list below. -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0000", SYMLINK+="input/tablet-penpartner" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0010", SYMLINK+="input/tablet-graphire" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0011", SYMLINK+="input/tablet-graphire2-4x5" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0012", SYMLINK+="input/tablet-graphire2-5x7" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0013", SYMLINK+="input/tablet-graphire3" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0014", SYMLINK+="input/tablet-graphire3-6x8" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0015", SYMLINK+="input/tablet-graphire4-4x5" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0016", SYMLINK+="input/tablet-graphire4-6x8" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0060", SYMLINK+="input/tablet-volito" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0061", SYMLINK+="input/tablet-penstation2" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0062", SYMLINK+="input/tablet-volito2-4x5" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0063", SYMLINK+="input/tablet-volito2-2x3" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0064", SYMLINK+="input/tablet-penpartner2" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0020", SYMLINK+="input/tablet-intuos-4x5" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0021", SYMLINK+="input/tablet-intuos-6x8" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0022", SYMLINK+="input/tablet-intuos-9x12" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0023", SYMLINK+="input/tablet-intuos-12x12" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0024", SYMLINK+="input/tablet-intuos-12x18" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0030", SYMLINK+="input/tablet-pl400" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0031", SYMLINK+="input/tablet-pl500" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0032", SYMLINK+="input/tablet-pl600" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0033", SYMLINK+="input/tablet-pl600sx" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0034", SYMLINK+="input/tablet-pl550" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0035", SYMLINK+="input/tablet-pl800" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0037", SYMLINK+="input/tablet-pl700" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0038", SYMLINK+="input/tablet-pl510" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0039", SYMLINK+="input/tablet-dtu710" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00C0", SYMLINK+="input/tablet-dtf521" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00C4", SYMLINK+="input/tablet-dtf720" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0003", SYMLINK+="input/tablet-cintiq_partner" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0041", SYMLINK+="input/tablet-intuos2-4x5" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0042", SYMLINK+="input/tablet-intuos2-6x8" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0043", SYMLINK+="input/tablet-intuos2-9x12" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0044", SYMLINK+="input/tablet-intuos2-12x12" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0045", SYMLINK+="input/tablet-intuos2-12x18" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00B0", SYMLINK+="input/tablet-intuos3-4x5" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00B1", SYMLINK+="input/tablet-intuos3-6x8" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00B2", SYMLINK+="input/tablet-intuos3-9x12" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00B3", SYMLINK+="input/tablet-intuos3-12x12" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00B4", SYMLINK+="input/tablet-intuos3-12x19" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00B5", SYMLINK+="input/tablet-intuos3-6x11" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="003F", SYMLINK+="input/tablet-cintiq21ux" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0047", SYMLINK+="input/tablet-intuos2-6x8a" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0065", SYMLINK+="input/tablet-bamboo" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00c6", SYMLINK+="input/tablet-cintiq12wx" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0017", SYMLINK+="input/tablet-bamboofun-4x5" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0018", SYMLINK+="input/tablet-bamboofun-6x8" -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0069", SYMLINK+="input/tablet-bamboo1" - -# Check and repossess the device if a module other than the wacom one -# is already bound to it. - -KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ACTION=="add", RUN+="/lib/udev/check_driver wacom $devpath $env{ID_BUS}" - diff --git a/source/x11-extra/xf86-input-wacom/FrugalBuild b/source/x11-extra/xf86-input-wacom/FrugalBuild index ffe9f31..bec2004 100644 --- a/source/x11-extra/xf86-input-wacom/FrugalBuild +++ b/source/x11-extra/xf86-input-wacom/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: Michel Hermier <[email protected]> pkgname=xf86-input-wacom -pkgver=0.11.1 -pkgrel=2 +pkgver=0.12.0 +pkgrel=1 pkgdesc="Drivers, libraries, and doc for configuring and running Wacom tablets." url="http://linuxwacom.sourceforge.net/" _F_sourceforge_dirname="linuxwacom" Finclude sourceforge -depends=('xorg-server>=1.11.0' 'libxi>=1.1.3' 'xrandr') +depends=('libxi>=1.1.3' 'libxinerama' 'xorg-server>=1.11.0' 'xrandr') makedepends=('inputproto' 'randrproto' 'util-macros') rodepends=('udev') provides=('linuxwacom') @@ -16,20 +16,6 @@ replaces=('linuxwacom') conflicts=('linuxwacom') groups=('x11-extra') archs=('i686' 'x86_64' 'ppc') -source=("${source[@]}" \ - check_driver{,.1} \ - 60-wacom.rules ) -sha1sums=('c36ebbe0af49b5a2032ea13a0b2b58d5c592b57c' \ - '12ae37807a03f36be2c5cc47e444475677b41693' \ - '7adf948f2d6f29635e80f4cc336799b7962d2a9a' \ - 'c8063c86189a7b3459a33b3c5ccfca36fa5439fd') - -build() -{ - Fbuild - Fexe /lib/udev/check_driver - Fman check_driver.1 - Ffile /lib/udev/rules.d/60-wacom.rules -} +sha1sums=('9f5d973abcfaa5252ede548591e17832ee4e76af') # optimization OK diff --git a/source/x11-extra/xf86-input-wacom/check_driver b/source/x11-extra/xf86-input-wacom/check_driver deleted file mode 100644 index 6e49aa1..0000000 --- a/source/x11-extra/xf86-input-wacom/check_driver +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# - -#logger check_driver called with: $1 - $2 - $3 - - -wanted=$1 -devpath=$2 -bustype=$3 - -device=$(readlink /sys/$devpath/device) -device=${device##*/} -driver=$(readlink /sys/$devpath/device/driver) -driver=${driver##*/} - -logger device $device is bound to the $driver driver - -if [ "$driver" != "$wanted" ]; then - logger must rebind - echo -n "$device" > /sys/$devpath/device/driver/unbind - echo -n "$device" > /sys/bus/$bustype/drivers/$wanted/bind -else - logger no need to rebind -fi - diff --git a/source/x11-extra/xf86-input-wacom/check_driver.1 b/source/x11-extra/xf86-input-wacom/check_driver.1 deleted file mode 100644 index 5016cbb..0000000 --- a/source/x11-extra/xf86-input-wacom/check_driver.1 +++ /dev/null @@ -1,21 +0,0 @@ -.TH wacom\-tools 1 "5 Nov 2004" "Frugalware Linux" "Frugalware" -.SH NAME -check_driver \- Linux 2.6(.16+) userspace device rebinding helper. - -.SH SYNOPSIS -.B check_driver driver devpath bustype - -.SH DESCRIPTION -This is a \fBRUN\fP script that may be invoked from a udev rule to ensure the -correct driver is bound to a particular device, in situations where a -basic driver may bind to it first but a more specialised one is available. - -.SH EXAMPLE -For the wacom device, a rule like this is used: - -KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", ACTION=="add", RUN+="/lib/udev/check_driver wacom $devpath $env{ID_BUS}" - -.SH COPYRIGHT -2006, Ron Lee <[email protected]>. Created for the Debian GNU/Linux -distribution. It may be freely distributed elsewhere. - _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
