diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-07 17:31:10 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-07 17:31:10 +0100 |
| commit | 0e48701e4ef754a7d5aab1e8fa1ef6ba8ff3c441 (patch) | |
| tree | a01dc4371165970aa77e40aaaf74ba1eae8daf47 /extra/xf86-input-wacom | |
| parent | 1ac5165814a8df7108dae57ebb527efd21873461 (diff) | |
| parent | d8d675cb1e75787b0db061756e4cbebe3c5a03fa (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/busybox/PKGBUILD
community/glpng/PKGBUILD
community/hercules/PKGBUILD
community/libnetfilter_acct/PKGBUILD
community/libvirt/PKGBUILD
extra/crypto++/PKGBUILD
extra/hexedit/PKGBUILD
extra/kdesdk-kate/PKGBUILD
extra/kdesdk/PKGBUILD
extra/libmp3splt/PKGBUILD
extra/ntfs-3g_ntfsprogs/PKGBUILD
extra/opencv/PKGBUILD
extra/qemu-kvm/PKGBUILD
extra/xf86-input-wacom/PKGBUILD
extra/xfce4-eyes-plugin/PKGBUILD
extra/xfdesktop/PKGBUILD
Diffstat (limited to 'extra/xf86-input-wacom')
| -rw-r--r-- | extra/xf86-input-wacom/70-wacom.rules | 3 | ||||
| -rw-r--r-- | extra/xf86-input-wacom/PKGBUILD | 15 |
2 files changed, 11 insertions, 7 deletions
diff --git a/extra/xf86-input-wacom/70-wacom.rules b/extra/xf86-input-wacom/70-wacom.rules index f6aa20835..2b32b1234 100644 --- a/extra/xf86-input-wacom/70-wacom.rules +++ b/extra/xf86-input-wacom/70-wacom.rules @@ -8,5 +8,8 @@ ACTION!="add|change", GOTO="wacom_end" SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="WACf*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}" SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="FUJ*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}" +# inputattach +SUBSYSTEM=="tty|pnp", KERNEL=="ttyS[0-9]*", ATTRS{id}=="WACf*", RUN+="/usr/sbin/modprobe wacom_w8001", RUN+="/usr/sbin/inputattach --daemon -w8001 /dev/%k" + LABEL="wacom_end" diff --git a/extra/xf86-input-wacom/PKGBUILD b/extra/xf86-input-wacom/PKGBUILD index d2ebb0595..932546060 100644 --- a/extra/xf86-input-wacom/PKGBUILD +++ b/extra/xf86-input-wacom/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 174296 2013-01-04 03:24:43Z heftig $ +# $Id: PKGBUILD 179522 2013-03-05 21:45:35Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: M Rawash <mrawash@gmail.com> pkgname=xf86-input-wacom -pkgver=0.19.0 +pkgver=0.20.0 pkgrel=1 pkgdesc="X.Org Wacom tablet driver" arch=('i686' 'x86_64' 'mips64el') url="http://linuxwacom.sourceforge.net/" -license=('GPL') +license=(GPL) backup=('etc/X11/xorg.conf.d/50-wacom.conf') -depends=('libxi' 'libxrandr' 'libxinerama') -makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') +depends=(libxi libxinerama libxrandr) +makedepends=('X-ABI-XINPUT_VERSION=18' xorg-server-devel resourceproto scrnsaverproto) conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') +optdepends=('inputattach: support for serial tablets') options=(!libtool) source=(http://downloads.sourceforge.net/project/linuxwacom/$pkgname/$pkgname-$pkgver.tar.bz2 70-wacom.rules) -md5sums=('bdc66047bb0afb4ac29882cca16cdfaa' - '10db4f8272286690255c1bcc18bfdd92') +md5sums=('a726649cb05c98cb1b18a3b7a4f079ed' + 'cc46dcb399d5ee62c9feb610c60d1270') build() { cd $pkgname-$pkgver |