Support input ABI 12

[Artem Popov]

ABI 12 is not supported, and this results in the following errors during build:

art@teaquetzl:/tmp/xserver-xorg-input-wizardpen-0.7.4$ make
make all-recursive
make[1]: Вход в каталог `/tmp/xserver-xorg-input-wizardpen-0.7.4'
Making all in src
make[2]: Вход в каталог `/tmp/xserver-xorg-input-wizardpen-0.7.4/src'
/bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I.. -g -O2 -fvisibility=hidden -I/usr/include/xorg -I/usr/include/pixman-1 -I../src -MT wizardpen.lo -MD -MP -MF .deps/wizardpen.Tpo -c -o wizardpen.lo wizardpen.c
libtool: compile: gcc -DHAVE_CONFIG_H -I. -I.. -g -O2 -fvisibility=hidden -I/usr/include/xorg -I/usr/include/pixman-1 -I../src -MT wizardpen.lo -MD -MP -MF .deps/wizardpen.Tpo -c wizardpen.c -fPIC -DPIC -o .libs/wizardpen.o
In file included from wizardpen.c:77:0:
wizardpen.h:134:1: warning: parameter names (without types) in function declaration
wizardpen.h:138:54: error: expected declaration specifiers or ‘...’ before ‘IDevPtr’
wizardpen.h:141:5: warning: parameter names (without types) in function declaration
wizardpen.h:142:5: warning: parameter names (without types) in function declaration
wizardpen.h:144:55: error: expected ‘)’ before ‘int’
wizardpen.c:98:5: warning: initialization from incompatible pointer type
wizardpen.c:200:38: error: expected ‘)’ before ‘local’
wizardpen.c:301:38: error: expected declaration specifiers or ‘...’ before ‘IDevPtr’
wizardpen.c: In function ‘WizardPenPreInit’:
wizardpen.c:303:5: error: ‘LocalDevicePtr’ undeclared (first use in this function)
wizardpen.c:303:5: note: each undeclared identifier is reported only once for each function it appears in
wizardpen.c:303:20: error: expected ‘;’ before ‘local’
wizardpen.c:304:5: warning: ‘Xcalloc’ is deprecated (declared at /usr/include/xorg/os.h:226)
wizardpen.c:309:11: error: ‘local’ undeclared (first use in this function)
wizardpen.c:314:19: error: ‘dev’ undeclared (first use in this function)
wizardpen.c:316:20: error: ‘XI86_POINTER_CAPABLE’ undeclared (first use in this function)
wizardpen.c:316:43: error: ‘XI86_SEND_DRAG_EVENTS’ undeclared (first use in this function)
wizardpen.c:326:5: error: too many arguments to function ‘xf86CollectInputOptions’
/usr/include/xorg/xf86Xinput.h:180:23: note: declared here
wizardpen.c:542:21: error: ‘XI86_CONFIGURED’ undeclared (first use in this function)
wizardpen.c:567:9: warning: ‘Xfree’ is deprecated (declared at /usr/include/xorg/os.h:235)
wizardpen.c: In function ‘DeviceOn’:
wizardpen.c:602:5: error: ‘LocalDevicePtr’ undeclared (first use in this function)
wizardpen.c:602:20: error: expected ‘;’ before ‘local’
wizardpen.c:603:55: error: ‘local’ undeclared (first use in this function)
wizardpen.c: In function ‘DeviceOff’:
wizardpen.c:645:5: error: ‘LocalDevicePtr’ undeclared (first use in this function)
wizardpen.c:645:20: error: expected ‘;’ before ‘local’
wizardpen.c:646:55: error: ‘local’ undeclared (first use in this function)
wizardpen.c: In function ‘DeviceClose’:
wizardpen.c:670:5: error: ‘LocalDevicePtr’ undeclared (first use in this function)
wizardpen.c:670:20: error: expected ‘;’ before ‘local’
wizardpen.c:672:49: error: ‘local’ undeclared (first use in this function)
wizardpen.c: In function ‘ControlProc’:
wizardpen.c:680:5: error: ‘LocalDevicePtr’ undeclared (first use in this function)
wizardpen.c:680:20: error: expected ‘;’ before ‘local’
wizardpen.c:682:49: error: ‘local’ undeclared (first use in this function)
wizardpen.c: In function ‘DeviceInit’:
wizardpen.c:689:5: error: ‘LocalDevicePtr’ undeclared (first use in this function)
wizardpen.c:689:20: error: expected ‘;’ before ‘local’
wizardpen.c:690:55: error: ‘local’ undeclared (first use in this function)
wizardpen.c:767:17: error: too few arguments to function ‘InitValuatorAxisStruct’
/usr/include/xorg/exevents.h:43:23: note: declared here
wizardpen.c:777:17: error: too few arguments to function ‘InitValuatorAxisStruct’
/usr/include/xorg/exevents.h:43:23: note: declared here
wizardpen.c:787:17: error: too few arguments to function ‘InitValuatorAxisStruct’
/usr/include/xorg/exevents.h:43:23: note: declared here
wizardpen.c: At top level:
wizardpen.c:829:30: error: expected ‘)’ before ‘local’
wizardpen.c:1234:27: error: expected ‘)’ before ‘local’
wizardpen.c:1284:34: error: expected ‘)’ before ‘local’
wizardpen.h:134:13: warning: ‘CloseProc’ used but never defined
wizardpen.h:141:17: warning: ‘USBReadInput’ used but never defined
wizardpen.h:142:17: warning: ‘USBQueryHardware’ used but never defined
make[2]: *** [wizardpen.lo] Ошибка 1
make[2]: Выход из каталога `/tmp/xserver-xorg-input-wizardpen-0.7.4/src'
make[1]: *** [all-recursive] Ошибка 1
make[1]: Выход из каталога `/tmp/xserver-xorg-input-wizardpen-0.7.4'
make: *** [all] Ошибка 2
art@teaquetzl:/tmp/xserver-xorg-input-wizardpen-0.7.4$

[kagarrache (kagarrache-gmail)]

Same error here with 0.8 in Arch, Xorg 1.10 :

/bin/sh ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I.. -march=x86-64 -mtune=generic -O2 -pipe -fvisibility=hidden -I/usr/include/xorg -I/usr/include/pixman-1 -I../src -MT wizardpen.lo -MD -MP -MF .deps/wizardpen.Tpo -c -o wizardpen.lo wizardpen.c
libtool: compile: gcc -DHAVE_CONFIG_H -I. -I.. -march=x86-64 -mtune=generic -O2 -pipe -fvisibility=hidden -I/usr/include/xorg -I/usr/include/pixman-1 -I../src -MT wizardpen.lo -MD -MP -MF .deps/wizardpen.Tpo -c wizardpen.c -fPIC -DPIC -o .libs/wizardpen.o
In file included from wizardpen.c:77:0:
wizardpen.h:134:1: warning: parameter names (without types) in function declaration
wizardpen.h:138:54: error: expected declaration specifiers or '...' before 'IDevPtr'
wizardpen.h:141:5: warning: parameter names (without types) in function declaration
wizardpen.h:142:5: warning: parameter names (without types) in function declaration
wizardpen.h:144:55: error: expected ')' before 'int'
wizardpen.c:98:5: warning: initialization from incompatible pointer type
wizardpen.c:200:38: error: expected ')' before 'local'
wizardpen.c:301:38: error: expected declaration specifiers or '...' before 'IDevPtr'
wizardpen.c: In function 'WizardPenPreInit':
wizardpen.c:303:5: error: 'LocalDevicePtr' undeclared (first use in this function)
wizardpen.c:303:5: note: each undeclared identifier is reported only once for each function it appears in
wizardpen.c:303:20: error: expected ';' before 'local'
wizardpen.c:304:5: warning: 'Xcalloc' is deprecated (declared at /usr/include/xorg/os.h:226)
wizardpen.c:309:11: error: 'local' undeclared (first use in this function)
wizardpen.c:314:19: error: 'dev' undeclared (first use in this function)
wizardpen.c:316:20: error: 'XI86_POINTER_CAPABLE' undeclared (first use in this function)
wizardpen.c:316:43: error: 'XI86_SEND_DRAG_EVENTS' undeclared (first use in this function)
wizardpen.c:326:5: error: too many arguments to function 'xf86CollectInputOptions'
/usr/include/xorg/xf86Xinput.h:180:23: note: declared here
wizardpen.c:542:21: error: 'XI86_CONFIGURED' undeclared (first use in this function)
wizardpen.c:567:9: warning: 'Xfree' is deprecated (declared at /usr/include/xorg/os.h:235)
wizardpen.c: In function 'DeviceOn':
wizardpen.c:602:5: error: 'LocalDevicePtr' undeclared (first use in this function)
wizardpen.c:602:20: error: expected ';' before 'local'
wizardpen.c:603:55: error: 'local' undeclared (first use in this function)
wizardpen.c: In function 'DeviceOff':
wizardpen.c:645:5: error: 'LocalDevicePtr' undeclared (first use in this function)
wizardpen.c:645:20: error: expected ';' before 'local'
wizardpen.c:646:55: error: 'local' undeclared (first use in this function)
wizardpen.c: In function 'DeviceClose':
wizardpen.c:670:5: error: 'LocalDevicePtr' undeclared (first use in this function)
wizardpen.c:670:20: error: expected ';' before 'local'
wizardpen.c:672:49: error: 'local' undeclared (first use in this function)
wizardpen.c: In function 'ControlProc':
wizardpen.c:680:5: error: 'LocalDevicePtr' undeclared (first use in this function)
wizardpen.c:680:20: error: expected ';' before 'local'
wizardpen.c:682:4...

[lp3 (lev-panov)]

-9999 version gives same compilation error :(

[Artem Popov (artfwo)]

I managed to use Genius G-Pen tablet with distro-provided aiptek driver in Natty, so there is an alternate driver at least for the G-Pens.

[Alejandro Mery (amery)]

I have zero previous experience related to Xorg programming and I'm not really sure what I'm doing but I think I'm on the right track. The attached patch compiles fine, but segfaults :p It's published here so someone else can take it over and finish the job if I don't do it first.

[Alejandro Mery (amery)]

now it works ;-)

[YAFU (yafu)]

@mnemoc , This patch works!
I've tried it in version 0.7.4 driver
Thanks!

[Martin Owens (doctormo)]

@mnemoc - That patch doesn't apply to the latest wizardpen driver code, all hunks fail to apply. Can you check what's gone wrong with this code branch:

https://code.launchpad.net/~wizardpen-devs/wizardpen/trunk

As soon as I have a working branch, I'll update the ppa with the working natty driver.

[Alejandro Mery (amery)]

$ rm -rf wizardpen
$ bzr branch lp:wizardpen
Branched 45 revision(s).
$ cd wizardpen
$ patch -p0 < ../wizardpen-abi12.patch.txt
patching file src/wizardpen.c
patching file src/wizardpen.h
$

applies just fine here :-/ I actually wrote it against bzr's trunk

[Alejandro Mery (amery)]

I just did `bzr push lp:wizardpen` and "oops"... passed ;-)

Thanks Martin. I hope to not have damaged anything

[Martin Owens (doctormo)]

Ah I must have applied the patch backwards, sorry about that!

Thanks for the push, I'm trying to make a dist now but it's got failures. Are you any good with auto tools? It could do with some attention to figure out why it won't build a dist any more.

[Martin Owens (doctormo)]

OK no panic, got it sorted out and the fix is released as tarball and deb in the ppa. version 0.8.1

[Alejandro Mery (amery)]

About autotools, I've used it but I'm not a fan... but ordered a book about it last week hoping to understand it one day ;-)

looking forward for a binary 0.8.1 in natty's ppa :-)