xorg-server: Changes to 'debian-unstable'

[Julien Cristau <jcristau@alioth.debian.org>]

 debian/changelog |    3 +++
 dix/devices.c    |    3 +++
 2 files changed, 6 insertions(+)

New commits:
commit 72b776cc9dea2bef6e407401d11a68d5fa48d13e
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Nov 28 11:32:00 2012 +0100

    Update changelog

diff --git a/debian/changelog b/debian/changelog
index 5bf8070..c739f3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 xorg-server (2:1.12.4-4) UNRELEASED; urgency=low
 
   * Fix memory leak in libnettle sha1 patch.  Thanks, Yaakov Selkowitz!
+  * Cherry-pick from upstream:
+    - dix: set the device transformation matrix.  Avoids cursor jumps in
+      virtualbox (closes: #694598)
 
  -- Julien Cristau <jcristau@debian.org>  Mon, 05 Nov 2012 20:39:01 +0100
 

commit 460324393cf200b195d456f44720f85ed3e9f019
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Thu Sep 20 05:56:39 2012 +1000

    dix: set the device transformation matrix
    
    The property handler is registered after setting the property, so
    dev->transform remains as all-zeros. That causes pixman_f_transform_invert()
    to fail (in transformAbsolute()) and invert remains as garbage. This
    may then cause a cursor jump to 0,0.
    
    Since the axes are not yet initialized here and we need to allow for drivers
    changing the matrix, we cannot use the property handler for matrix
    initialization, essentially duplicating the code.
    
    Triggered by the fix to (#49347) in 749a593e49adccdf1225be28a521412ec85333f4
    
    https://bugzilla.redhat.com/show_bug.cgi?id=852841
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Reviewed-by: Chase Douglas <chase.douglas@ubuntu.com>
    Signed-off-by: Keith Packard <keithp@keithp.com>
    (cherry picked from commit 3d1051aecbb1955084804133cacd12c7f696833a)

diff --git a/dix/devices.c b/dix/devices.c
index fbc9fec..ef34a00 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -303,6 +303,9 @@ AddInputDevice(ClientPtr client, DeviceProc deviceProc, Bool autoStart)
     /* unity matrix */
     memset(transform, 0, sizeof(transform));
     transform[0] = transform[4] = transform[8] = 1.0f;
+    dev->transform.m[0][0] = 1.0;
+    dev->transform.m[1][1] = 1.0;
+    dev->transform.m[2][2] = 1.0;
 
     XIChangeDeviceProperty(dev, XIGetKnownProperty(XI_PROP_TRANSFORM),
                            XIGetKnownProperty(XATOM_FLOAT), 32,