Re: xserver-xorg-input-vmmouse: Changes to 'upstream-unstable'

[Julien Cristau <jcristau@debian.org>]

On Wed, May 28, 2008 at 20:48:00 +0000, Brice Goglin wrote:

> commit e72f4fbc61f4a0acf99a4b31f16fdebde9d339f1
> Author: Vinay Bondhugula <vinayb@vmware.com>
> Date:   Wed May 21 01:36:53 2008 -0400
> 
>     Don't call conversion_proc for older Xservers
>     
>     There was a bug in the Xserver for a while when it didn't call a driver's
>     conversion_proc to convert device space coordinates to screen space. To fix
>     this, vmmouse starting calling that method (since January), but if this is done
>     on older versions of X, the conversion gets done twice.
>     
>     The fix is to add a configure check for the right versions of X and call
>     VMMouseConvertProc() only if we are compiling against an X that has the bug.
>     
>     There's some whitespace cleanup for vmmouse.c too.
> 
> diff --git a/configure.ac b/configure.ac
> index 7013426..a57851f 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -80,7 +80,12 @@ sdkdir=$(pkg-config --variable=sdkdir xorg-server)
>  
>  PKG_CHECK_EXISTS([xorg-server >= 1.1.0],
>                   [AC_DEFINE([HAVE_XORG_SERVER_1_1_0], 1,
> -                 [Has version 1.1.0 or greater of the Xserver])])
> +                            [Has version 1.1.0 or greater of the Xserver])])
> +
> +PKG_CHECK_EXISTS([xorg-server >= 1.3.99.0 xorg-server <= 1.4.0.90],
> +                 [AC_DEFINE([CALL_CONVERSION_PROC], 1,
> +                            [Call conversion_proc from within the driver, as
> +                             Xserver doesn't])])
>  
>  CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
>  AC_SUBST([CFLAGS])

The current X server in sid is 1.4.0.90 and does call conversion_proc
(since the latest version), so the driver shouldn't call it itself.  Now
maybe we ought to bump the server version, but in any case this needs to
be fixed somehow.

Cheers,
Julien