Imported Debian patch 2:1.11.4-0ubuntu10.11
authorBryce Harrington <bryce@ubuntu.com>
Thu, 20 Dec 2012 00:39:23 +0000 (16:39 -0800)
committerXavier Boudet <x-boudet@ti.com>
Mon, 21 Jan 2013 13:22:26 +0000 (14:22 +0100)
debian/changelog
debian/patches/237-dix-set-the-device-transformation-matrix.patch [deleted file]
debian/patches/series

index 00047c06f63d4474335954ffa988a749528a898e..714c9b338f28babf1a5e8ee4f3827c1752ef79f6 100644 (file)
@@ -1,3 +1,12 @@
+xorg-server (2:1.11.4-0ubuntu10.11) precise-proposed; urgency=low
+
+  * Drop 237-dix-set-the-device-transformation-matrix.patch: 
+    Bug was targeted to precise, but is only confirmed to affect xserver
+    1.13 and newer.
+    (LP: 1041063)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Wed, 19 Dec 2012 16:39:23 -0800
+
 xorg-server (2:1.11.4-0ubuntu10.10) precise-proposed; urgency=low
 
   * Add 237-dix-set-the-device-transformation-matrix.patch: Fix pointer
diff --git a/debian/patches/237-dix-set-the-device-transformation-matrix.patch b/debian/patches/237-dix-set-the-device-transformation-matrix.patch
deleted file mode 100644 (file)
index 92a9f57..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-From 3d1051aecbb1955084804133cacd12c7f696833a Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu, 20 Sep 2012 05:56:39 +1000
-Subject: [PATCH] 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>
----
- dix/devices.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/dix/devices.c b/dix/devices.c
-index 9cf04ed..66d4406 100644
---- a/dix/devices.c
-+++ b/dix/devices.c
-@@ -306,6 +306,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,
--- 
-1.7.11.3
-
index 099965c1d85c75ce673bf1c2b40cf718a00ac4a3..568115491cfad4e6d3eca93239bbaa7cac5e8fb8 100644 (file)
@@ -54,4 +54,3 @@
 #515-dix-disable-all-devices-before-shutdown.patch
 516-dix-dont-emulate-scroll-events-for-non-existing-axes.patch
 
-237-dix-set-the-device-transformation-matrix.patch