xserver-xorg-input-microtouch: Changes to 'upstream-experimental'
configure.ac | 2 +-
man/Makefile.am | 1 -
src/microtouch.c | 4 ++++
3 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit d17c9694e4f83bdae28c9b6154158823ca1d62b0
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 20 16:22:05 2008 -0400
microtouch 1.2.0
diff --git a/configure.ac b/configure.ac
index 72f274d..070d52b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-microtouch],
- 1.1.1,
+ 1.2.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-microtouch)
commit 2116b7e9cb14f695e45eaee462fdbb66bfb6ce22
Author: Matthieu Herrb <matthieu@bluenote.herrb.net>
Date: Sat Mar 8 23:08:51 2008 +0100
Makefile.am: nuke RCS Id
diff --git a/man/Makefile.am b/man/Makefile.am
index bf7ec17..f0eb29b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
commit 23a5994f7fe30438cb9b081ba203b8417558e746
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Wed Jan 30 17:18:31 2008 -0200
Don't call xf86XInputSetSendCoreEvents.
Only call that function if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0.
diff --git a/src/microtouch.c b/src/microtouch.c
index af60a21..b18a22f 100644
--- a/src/microtouch.c
+++ b/src/microtouch.c
@@ -157,7 +157,9 @@ static const char *reqSymbols[] = {
"xf86SetSerial",
"xf86SetStrOption",
"xf86XInputSetScreen",
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
"xf86XInputSetSendCoreEvents",
+#endif
"xf86memset",
"xf86sscanf",
"xf86strcmp",
@@ -561,11 +563,13 @@ SwitchMode (ClientPtr client, DeviceIntPtr dev, int mode)
priv->reporting_mode = mode;
return (Success);
}
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
else if ((mode == SendCoreEvents) || (mode == DontSendCoreEvents))
{
xf86XInputSetSendCoreEvents (local, (mode == SendCoreEvents));
return (Success);
}
+#endif
else
return (!Success);
}
Reply to: