xorg-server: Changes to 'ubuntu-quantal'
debian/changelog | 12 ++- debian/patches/CVE-2013-1940.patch | 36 + debian/patches/dix-fix-zaphod-screen-crossing.diff | 36 + debian/patches/series |2 + 4 files changed, 85 insertions(+), 1 deletion(-) New commits: commit e2b34b1ba3b2ac2c2b640b62b8a6523b6fbcb180 Author: Timo Aaltonen Date: Thu Oct 10 17:03:01 2013 +0300 release to quantal-proposed diff --git a/debian/changelog b/debian/changelog index ea66b01..34114b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.13.0-0ubuntu6.3) UNRELEASED; urgency=low +xorg-server (2:1.13.0-0ubuntu6.3) quantal-proposed; urgency=low [ Maarten Lankhorst ] * add patch to fix starting xorg-server with no outputs connected (LP: #1122072) commit e647875e48767186ef99594e444af3cd0b09b274 Author: Timo Aaltonen Date: Thu Oct 10 16:41:28 2013 +0300 include changes from -0u6.2 diff --git a/debian/changelog b/debian/changelog index 5ab2f01..ea66b01 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.13.0-0ubuntu6.2) UNRELEASED; urgency=low +xorg-server (2:1.13.0-0ubuntu6.3) UNRELEASED; urgency=low [ Maarten Lankhorst ] * add patch to fix starting xorg-server with no outputs connected (LP: #1122072) @@ -15,6 +15,15 @@ xorg-server (2:1.13.0-0ubuntu6.2) UNRELEASED; urgency=low -- Maarten Lankhorst Tue, 12 Feb 2013 15:18:32 +0100 +xorg-server (2:1.13.0-0ubuntu6.2) quantal-security; urgency=low + + * SECURITY UPDATE: input event leak via inactive VT +- debian/patches/CVE-2013-1940.patch: fix flush input to work with + Linux evdev devices in hw/xfree86/os-support/shared/posix_tty.c. +- CVE-2013-1940 + + -- Marc Deslauriers Thu, 11 Apr 2013 08:08:53 -0400 + xorg-server (2:1.13.0-0ubuntu6.1) quantal-proposed; urgency=low [ Maarten Lankhorst ] diff --git a/debian/patches/CVE-2013-1940.patch b/debian/patches/CVE-2013-1940.patch new file mode 100644 index 000..0c45279 --- /dev/null +++ b/debian/patches/CVE-2013-1940.patch @@ -0,0 +1,36 @@ +From 88394b5cf39f298ebaa9a8ce4ace9bef14c2c6ee Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Wed, 10 Apr 2013 16:09:01 +1000 +Subject: [PATCH] xf86: fix flush input to work with Linux evdev devices. + +So when we VT switch back and attempt to flush the input devices, +we don't succeed because evdev won't return part of an event, +since we were only asking for 4 bytes, we'd only get -EINVAL back. + +This could later cause events to be flushed that we shouldn't have +gotten. + +This is a fix for CVE-2013-1940. + +Signed-off-by: Dave Airlie +--- + hw/xfree86/os-support/shared/posix_tty.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/hw/xfree86/os-support/shared/posix_tty.c b/hw/xfree86/os-support/shared/posix_tty.c +index ab3757a..4d08c1e 100644 +--- a/hw/xfree86/os-support/shared/posix_tty.c b/hw/xfree86/os-support/shared/posix_tty.c +@@ -421,7 +421,8 @@ xf86FlushInput(int fd) + { + fd_set fds; + struct timeval timeout; +-char c[4]; ++/* this needs to be big enough to flush an evdev event. */ ++char c[256]; + + DebugF("FlushingSerial\n"); + if (tcflush(fd, TCIFLUSH) == 0) +-- +1.8.2 + diff --git a/debian/patches/series b/debian/patches/series index 31cd601..fa24ae9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -37,6 +37,7 @@ fixup-headless.patch ## from upstream, drop when rebasing to a new version 229_udev-fix.diff +CVE-2013-1940.patch 230-fix-compat-output-selection.patch 231-scan-pci-after-probing-devices.patch 237-dix-set-the-device-transformation-matrix.patch commit d049624a843a7dda9d057d137bf21f1f90633c03 Author: Timo Aaltonen Date: Thu Oct 10 16:35:48 2013 +0300 dix-fix-zaphod-screen-crossing.diff: Fix pointer screen crossing. (LP: #1068920) diff --git a/debian/changelog b/debian/changelog index 3bd3317..5ab2f01 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ xorg-server (2:1.13.0-0ubuntu6.2) UNRELEASED; urgency=low [ Timo Aaltonen ] * Fix patch 500 to apply. + * dix-fix-zaphod-screen-crossing.diff: Fix pointer screen crossing. (LP: #1068920) -- Maarten Lankhorst Tue, 12 Feb 2013 15:18:32 +0100 diff --git a/debian/patches/dix-fix-zaphod-screen-crossing.diff b/debian/patches/dix-fix-zaphod-screen-crossing.diff new file mode 100644 index 000..b097334 --- /dev/null +++ b/debian/patches/dix-fix-zaphod-screen-crossing.diff @@ -0,0 +1,36 @@ +commit e7cd5cce740e653000fb1192b600268dcf77dde2 +Author: Peter Hutterer +Date: Thu Oct 18 15:11:31 2012 +1000 + +dix: fix zaphod screen scrossing (#54654) + +POINTER_SCREEN coordinates are screen-relative. For a Zaphod setup, the +coordinates after a screen crossing are already relative to the new screen's +origin. Add that offset to the coordinates before re-setti
xorg-server: Changes to 'ubuntu-quantal'
debian/changelog |9 ++ debian/patches/238-fix-erratic-cursor-movement.patch | 61 +++ debian/patches/500_pointer_barrier_thresholds.diff |2 debian/patches/series|1 4 files changed, 71 insertions(+), 2 deletions(-) New commits: commit 44ae4c3fdd57662fae109a309530706d6f914d06 Author: Timo Aaltonen Date: Tue Aug 27 14:54:01 2013 +0300 Fix patch 500 to apply. diff --git a/debian/changelog b/debian/changelog index 2e94ef7..3bd3317 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ xorg-server (2:1.13.0-0ubuntu6.2) UNRELEASED; urgency=low when using cursor movement when using "Coordinate Transformation Matrix". (LP: #1212123) + [ Timo Aaltonen ] + * Fix patch 500 to apply. + -- Maarten Lankhorst Tue, 12 Feb 2013 15:18:32 +0100 xorg-server (2:1.13.0-0ubuntu6.1) quantal-proposed; urgency=low diff --git a/debian/patches/500_pointer_barrier_thresholds.diff b/debian/patches/500_pointer_barrier_thresholds.diff index b61dcfc..9206298 100644 --- a/debian/patches/500_pointer_barrier_thresholds.diff +++ b/debian/patches/500_pointer_barrier_thresholds.diff @@ -816,8 +816,6 @@ index 71f88a9..8b204dc 100644 /* Xinerama */ extern int (*PanoramiXSaveXFixesVector[XFixesNumberRequests]) (ClientPtr); void PanoramiXFixesInit(void); -diff --git a/dix/dixutils.c b/dix/dixutils.c -index 9eb5489..521bdce 100644 diff -Nru /dev/null xorg-server/test/gtest/dummy.conf --- /dev/null 1970-01-01 01:00:00.0 +0100 +++ xorg-server/test/gtest/dummy.conf 2012-05-21 18:00:45.996945542 +0200 commit 6adaa1361fcbc57e6d69c04c11ce14447c355af2 Author: Timo Aaltonen Date: Tue Aug 27 14:45:07 2013 +0300 Add 238-fix-erratic-cursor-movement.patch to fix erratic cursor movement when using cursor movement when using "Coordinate Transformation Matrix". (LP: #1212123) diff --git a/debian/changelog b/debian/changelog index 9351786..2e94ef7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ xorg-server (2:1.13.0-0ubuntu6.2) UNRELEASED; urgency=low + [ Maarten Lankhorst ] * add patch to fix starting xorg-server with no outputs connected (LP: #1122072) - fixup-headless.patch + [ Shih-Yuan Lee ] + * Add 238-fix-erratic-cursor-movement.patch to fix erratic cursor movement +when using cursor movement when using "Coordinate Transformation Matrix". +(LP: #1212123) + -- Maarten Lankhorst Tue, 12 Feb 2013 15:18:32 +0100 xorg-server (2:1.13.0-0ubuntu6.1) quantal-proposed; urgency=low diff --git a/debian/patches/238-fix-erratic-cursor-movement.patch b/debian/patches/238-fix-erratic-cursor-movement.patch new file mode 100644 index 000..38e09c2 --- /dev/null +++ b/debian/patches/238-fix-erratic-cursor-movement.patch @@ -0,0 +1,61 @@ +## Description: dix: Save touchpoint last coordinates before transform. +## Origin/Author: Yuly Novikov +## Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49347 +Index: xorg-server-lts-quantal-1.13.0/dix/getevents.c +=== +--- xorg-server-lts-quantal-1.13.0.orig/dix/getevents.c2013-08-14 13:59:15.110805225 +0800 xorg-server-lts-quantal-1.13.0/dix/getevents.c 2013-08-14 14:05:01.452522627 +0800 +@@ -1964,32 +1964,27 @@ + default: + return 0; + } +-if (t->mode == XIDirectTouch && !(flags & TOUCH_CLIENT_ID)) { +-if (!valuator_mask_isset(&mask, 0)) +-valuator_mask_set_double(&mask, 0, +- valuator_mask_get_double(touchpoint.ti-> +- valuators, 0)); +-if (!valuator_mask_isset(&mask, 1)) +-valuator_mask_set_double(&mask, 1, +- valuator_mask_get_double(touchpoint.ti-> +- valuators, 1)); +-} + + /* Get our screen event co-ordinates (root_x/root_y/event_x/event_y): + * these come from the touchpoint in Absolute mode, or the sprite in + * Relative. */ + if (t->mode == XIDirectTouch) { +-transformAbsolute(dev, &mask); +- + if (!(flags & TOUCH_CLIENT_ID)) { +-for (i = 0; i < valuator_mask_size(&mask); i++) { ++for (i = 0; i < max(valuator_mask_size(&mask), 2); i++) { + double val; + + if (valuator_mask_fetch_double(&mask, i, &val)) + valuator_mask_set_double(touchpoint.ti->valuators, i, val); ++/* If the device doesn't post new X and Y axis values, ++ * use the last values posted. ++ */ ++else if (i < 2 && ++valuator_mask_fetch_double(touchpoint.ti->valuators, i, &val)) ++valuator_mask_set_double(&mask, i, val); + } + } + ++transformAbsolut
xorg-server: Changes to 'ubuntu-quantal'
debian/changelog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit edb5fca012c8b86e9ee650a3f5b527386ac3c45d Author: Maarten Lankhorst Date: Wed Mar 6 15:19:04 2013 +0100 fixup u6.2 This upload was rejected, and I didn't mean to push the change to git. Regardless, it wouldn't be a bad idea to SRU this xorg-server at some point, maybe as part of a micro-release. diff --git a/debian/changelog b/debian/changelog index 17378a7..9351786 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.13.0-0ubuntu6.2) quantal-proposed; urgency=low +xorg-server (2:1.13.0-0ubuntu6.2) UNRELEASED; urgency=low * add patch to fix starting xorg-server with no outputs connected (LP: #1122072) - fixup-headless.patch -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1udfcw-0003if...@vasks.debian.org
xorg-server: Changes to 'ubuntu-quantal'
debian/changelog|7 +++ debian/patches/fixup-headless.patch | 36 debian/patches/series |3 +++ 3 files changed, 46 insertions(+) New commits: commit 044e6c9ffe627f9898dcb231ed65bd79d7d6aa14 Author: Maarten Lankhorst Date: Tue Feb 12 15:21:18 2013 +0100 add patch to fix starting xorg-server with no outputs connected (LP: #1122072) * add patch to fix starting xorg-server with no outputs connected (LP: #1122072) - fixup-headless.patch diff --git a/debian/changelog b/debian/changelog index 1eec1d4..17378a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xorg-server (2:1.13.0-0ubuntu6.2) quantal-proposed; urgency=low + + * add patch to fix starting xorg-server with no outputs connected (LP: #1122072) +- fixup-headless.patch + + -- Maarten Lankhorst Tue, 12 Feb 2013 15:18:32 +0100 + xorg-server (2:1.13.0-0ubuntu6.1) quantal-proposed; urgency=low [ Maarten Lankhorst ] diff --git a/debian/patches/fixup-headless.patch b/debian/patches/fixup-headless.patch new file mode 100644 index 000..19e6ef7 --- /dev/null +++ b/debian/patches/fixup-headless.patch @@ -0,0 +1,36 @@ +commit d71a17cfab6536df9df46a342a24dd415c020192 +Author: Chris Wilson +Date: Sat Nov 10 10:26:08 2012 + + +xf86: select a fake output for headless servers + +Following commit 37d956e3ac9513b74078882dff489f9b0a7a5a28 +Author: Keith Packard +Date: Mon Sep 10 11:14:20 2012 +1000 + +xf86: fix compat output selection for no output GPUs + +headless servers can no longer startup as we no longer select a compat +output for the fake framebuffer. + +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=56343 +Signed-off-by: Chris Wilson +Reviewed-by: Dave Airlie +Signed-off-by: Keith Packard +(cherry picked from commit e54f71a2c7a1677a5c5032d1e7dc099d5204144b) + +diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c +index 177f7ac..13251cf 100644 +--- a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c +@@ -1847,6 +1847,10 @@ SetCompatOutput(xf86CrtcConfigPtr config) + output = config->output[config->compat_output]; + } + ++/* All outputs are disconnected, select one to fake */ ++if (!output && config->num_output) ++output = config->output[0]; ++ + return output; + } + diff --git a/debian/patches/series b/debian/patches/series index 0065af3..c4f7381 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -28,6 +28,9 @@ 235-composite-tracking.diff 236-use-fbdev-for-poulsbo-oaktrail-medfield.patch +# upstream +fixup-headless.patch + ## waiting for review by upstream 111_armel-drv-fallbacks.patch 500_pointer_barrier_thresholds.diff -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1udf8b-000351...@vasks.debian.org
xorg-server: Changes to 'ubuntu-quantal'
debian/changelog | 13 + 1 file changed, 1 insertion(+), 12 deletions(-) New commits: commit 35f17ad1be18016a91dbfdc736cadf811c3d354b Author: Timo Aaltonen Date: Tue Nov 27 08:11:00 2012 +0200 fix the changelog, we're releasing -0u6.1 after all diff --git a/debian/changelog b/debian/changelog index dc6b5b7..1eec1d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,3 @@ -xorg-server (2:1.13.0-0ubuntu6.2) quantal-proposed; urgency=low - - * Revert the change to 500_pointer_barrier_thresholds.diff, causes -issues with unity launcher. - - -- Timo Aaltonen Thu, 22 Nov 2012 17:30:15 +0200 - xorg-server (2:1.13.0-0ubuntu6.1) quantal-proposed; urgency=low [ Maarten Lankhorst ] @@ -21,11 +14,7 @@ xorg-server (2:1.13.0-0ubuntu6.1) quantal-proposed; urgency=low transformation matrix to an identity matrix. Thanks to a7x. (LP: #1041063) - [ Tim Lunn ] - * 500_pointer_barrier_thresholds.diff: Update to fix gaps above -barriers at edge of screen (LP: #1073724) - - -- Bryce Harrington Fri, 16 Nov 2012 15:56:23 -0800 + -- Timo Aaltonen Tue, 27 Nov 2012 08:09:59 +0200 xorg-server (2:1.13.0-0ubuntu6) quantal; urgency=low -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1tdeqp-0003re...@vasks.debian.org
xorg-server: Changes to 'ubuntu-quantal'
debian/changelog |9 - debian/patches/500_pointer_barrier_thresholds.diff |6 -- 2 files changed, 12 insertions(+), 3 deletions(-) New commits: commit a3a8e6e087659719f20946d53e5831dc860e721e Author: Timo Aaltonen Date: Thu Nov 22 17:30:30 2012 +0200 upload to quantal-proposed diff --git a/debian/changelog b/debian/changelog index c948331..dc6b5b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -xorg-server (2:1.13.0-0ubuntu6.2) UNRELEASED; urgency=low +xorg-server (2:1.13.0-0ubuntu6.2) quantal-proposed; urgency=low * Revert the change to 500_pointer_barrier_thresholds.diff, causes issues with unity launcher. - -- Timo Aaltonen Thu, 22 Nov 2012 17:29:36 +0200 + -- Timo Aaltonen Thu, 22 Nov 2012 17:30:15 +0200 xorg-server (2:1.13.0-0ubuntu6.1) quantal-proposed; urgency=low commit cdcbf947b65920c5eaa64a7b2666986afd02098d Author: Timo Aaltonen Date: Mon Nov 19 12:16:32 2012 +0200 Revert the change to 500_pointer_barrier_thresholds.diff, causes issues with unity launcher. Conflicts: debian/changelog diff --git a/debian/changelog b/debian/changelog index 05eb38e..c948331 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xorg-server (2:1.13.0-0ubuntu6.2) UNRELEASED; urgency=low + + * Revert the change to 500_pointer_barrier_thresholds.diff, causes +issues with unity launcher. + + -- Timo Aaltonen Thu, 22 Nov 2012 17:29:36 +0200 + xorg-server (2:1.13.0-0ubuntu6.1) quantal-proposed; urgency=low [ Maarten Lankhorst ] @@ -13,7 +20,7 @@ xorg-server (2:1.13.0-0ubuntu6.1) quantal-proposed; urgency=low jumping with absolute pointing device. Initializes device transformation matrix to an identity matrix. Thanks to a7x. (LP: #1041063) - + [ Tim Lunn ] * 500_pointer_barrier_thresholds.diff: Update to fix gaps above barriers at edge of screen (LP: #1073724) diff --git a/debian/patches/500_pointer_barrier_thresholds.diff b/debian/patches/500_pointer_barrier_thresholds.diff index 70020b7..b61dcfc 100644 --- a/debian/patches/500_pointer_barrier_thresholds.diff +++ b/debian/patches/500_pointer_barrier_thresholds.diff @@ -392,7 +392,8 @@ index 602b906..cab5b31 100644 +dir = barrier_get_direction(ox, oy, unclamped_prex, unclamped_prey); +barrier_calculate_velocity_components(ox, oy, unclamped_prex, unclamped_prey, &vel_x, &vel_y); - nearest = barrier_find_nearest(cs, dir, ox, oy, *x, *y); +-nearest = barrier_find_nearest(cs, dir, ox, oy, *x, *y); ++nearest = barrier_find_nearest(cs, dir, ox, oy, unclamped_prex, unclamped_prey); if (nearest) { -barrier_clamp_to_barrier(nearest, dir, x, y); + int velocity = barrier_is_vertical(nearest) ? vel_x : vel_y; @@ -418,7 +419,8 @@ index 602b906..cab5b31 100644 oy = *y; } - nearest = barrier_find_nearest(cs, dir, ox, oy, *x, *y); +-nearest = barrier_find_nearest(cs, dir, ox, oy, *x, *y); ++nearest = barrier_find_nearest(cs, dir, ox, oy, unclamped_prex, unclamped_prey); if (nearest) { -barrier_clamp_to_barrier(nearest, dir, x, y); + velocity = barrier_is_vertical(nearest) ? vel_x : vel_y; -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1tbyly-mx...@vasks.debian.org
xorg-server: Changes to 'ubuntu-quantal-nexus7'
debian/changelog | 10 debian/patches/233_dix_save_touchpoint_coords_before_transform.patch | 205 ++ debian/patches/series|3 3 files changed, 218 insertions(+) New commits: commit b3cc7a2bfebd6c12aacd2f8aa65422dbc0ee0bab Author: Bryce Harrington Date: Wed Nov 21 15:18:54 2012 -0800 Update changelog for release to nexus7 ppa diff --git a/debian/changelog b/debian/changelog index 766c962..dad1c42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -xorg-server (2:1.13.0-0ubuntu7) UNRELEASED; urgency=low +xorg-server (2:1.13.0-0ubuntu6.1~nexus7.1) quantal; urgency=low - * Add 233_dix_save_touchpoint_coords_before_transform.patch: Patch -proposed to xorg-devel@ to fix issue where when a transformation -matrix is applied on input, it gets applied multiple times. -(LP: #1076627) + * Add 233_dix_save_touchpoint_coords_before_transform.patch: Fixes issue +where input transformation matrix gets applied multiple times. This +patch was proposed to xorg-devel@ and has not yet been merged to +the upstream tree, so should be replaced with what gets applied. +(LP: #1075415, #1076567, #1076627) -- Bryce Harrington Wed, 21 Nov 2012 19:29:41 + commit 90def7f6690e2346ee9e408a94735effe9d8a70a Author: Bryce Harrington Date: Wed Nov 21 14:23:25 2012 -0800 Add patch 233 to fix touch input while rotated diff --git a/debian/changelog b/debian/changelog index bf4e911..766c962 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +xorg-server (2:1.13.0-0ubuntu7) UNRELEASED; urgency=low + + * Add 233_dix_save_touchpoint_coords_before_transform.patch: Patch +proposed to xorg-devel@ to fix issue where when a transformation +matrix is applied on input, it gets applied multiple times. +(LP: #1076627) + + -- Bryce Harrington Wed, 21 Nov 2012 19:29:41 + + xorg-server (2:1.13.0-0ubuntu6) quantal; urgency=low [ Timo Aaltonen ] diff --git a/debian/patches/233_dix_save_touchpoint_coords_before_transform.patch b/debian/patches/233_dix_save_touchpoint_coords_before_transform.patch new file mode 100644 index 000..adb9d64 --- /dev/null +++ b/debian/patches/233_dix_save_touchpoint_coords_before_transform.patch @@ -0,0 +1,205 @@ +From fetchmail Thu Nov 8 14:21:57 2012 +Return-Path: +X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on + humber.bryceharrington.org +X-Spam-Level: +X-Spam-Status: No, score=-7.4 required=5.0 tests=BWH_DEBIAN,BWH_DEBIAN_2, + BWH_FREE,BWH_FREE_2,BWH_PATCH_1,BWH_PATCH_2,BWH_PATCH_3,BWH_SPELLING_2b, + DKIM_SIGNED,MISSING_FROM,T_DKIM_INVALID autolearn=ham version=3.3.2 +Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) + by vinyl.outflux.net (8.14.4/8.14.4/Debian-2ubuntu2) with ESMTP id qA8MHM9S009852 + for ; Thu, 8 Nov 2012 14:17:22 -0800 +Received: from cluster-j.mailcontrol.com (cluster-j.mailcontrol.com [85.115.54.190]) + by fiordland.canonical.com (Postfix) with ESMTP id C7169A18CF4 + for ; Thu, 8 Nov 2012 22:17:16 + (UTC) +Received: from arctowski.canonical.com (arctowski.canonical.com [91.189.94.158]) + by rly27j.srv.mailcontrol.com (MailControl) with ESMTP id qA8MHFbx032037 + for ; Thu, 8 Nov 2012 22:17:15 GMT +Received: from fiordland.canonical.com ([91.189.94.145]) + by arctowski.canonical.com with esmtp (Exim 4.71) + (envelope-from ) + id 1TWaPT-0006Wp-Ft + for bryce.harring...@cleanmail.canonical.com; Thu, 08 Nov 2012 22:17:15 + +Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) + by fiordland.canonical.com (Postfix) with ESMTP id 137A3A18CF4 + for ; Thu, 8 Nov 2012 22:17:15 + (UTC) +Received: from gabe.freedesktop.org (localhost [127.0.0.1]) + by gabe.freedesktop.org (Postfix) with ESMTP id 6323D9EF0A + for ; Thu, 8 Nov 2012 14:17:14 -0800 (PST) +X-Original-To: xorg-de...@lists.x.org +Delivered-To: xorg-de...@lists.x.org +Received: from mail-ie0-f170.google.com (mail-ie0-f170.google.com + [209.85.223.170]) + by gabe.freedesktop.org (Postfix) with ESMTP id A19AE9E8E1 + for ; Thu, 8 Nov 2012 14:14:11 -0800 (PST) +Received: by mail-ie0-f170.google.com with SMTP id c12so4623944ieb.15 + for ; Thu, 08 Nov 2012 14:14:11 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; + h=from:to:cc:subject:date:message-id:x-mailer; + bh=ChYBhB6uKrVo4Ao196l73x2fAcIlO26+FQDoBGw1w+Q=; + b=jUNE0YMNkPVtK3L8aDM9vAkeTj895KvO6R39IsvdAJLojh5/jNdMluqAJjqIVlAdcy + aSH9eKSyQgpZgq1z6k00gShenCU5LbGcE589ERCy+G88IDzbIt2gVl3kBPtn1afjMKlR + cO7vkm9wjRSbdURKdiM09DrcjDb2uP2LfBAKI= +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=google.com; s=20120113; + h=from:to:cc:subject:date:message-id:x
xorg-server: Changes to 'ubuntu-quantal-nexus7'
New branch 'ubuntu-quantal-nexus7' available with the following commits: -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1tbigq-00019c...@vasks.debian.org
xorg-server: Changes to 'ubuntu-quantal'
debian/changelog | 13 + debian/patches/236-use-fbdev-for-poulsbo-oaktrail-medfield.patch | 88 ++ debian/patches/237-dix-set-the-device-transformation-matrix.patch | 42 debian/patches/series |2 4 files changed, 143 insertions(+), 2 deletions(-) New commits: commit 1b68c17c0c91b427d33217f124a889131a0dc1c3 Author: Bryce Harrington Date: Wed Nov 21 14:19:08 2012 -0800 SRU latest raring change to quantal diff --git a/debian/changelog b/debian/changelog index 105864d..05eb38e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.13.0-0ubuntu6.1) raring; urgency=low +xorg-server (2:1.13.0-0ubuntu6.1) quantal-proposed; urgency=low [ Maarten Lankhorst ] * add 233-xf86events-valgrind.patch to fix a xserver corruption @@ -18,7 +18,7 @@ xorg-server (2:1.13.0-0ubuntu6.1) raring; urgency=low * 500_pointer_barrier_thresholds.diff: Update to fix gaps above barriers at edge of screen (LP: #1073724) - -- Timo Aaltonen Tue, 09 Oct 2012 10:22:24 +0300 + -- Bryce Harrington Fri, 16 Nov 2012 15:56:23 -0800 xorg-server (2:1.13.0-0ubuntu6) quantal; urgency=low commit 4af1d9adbb515e2c9d01c514fbaf7a81ad3a225c Author: Bryce Harrington Date: Fri Nov 16 15:45:46 2012 -0800 SRU patches 236 and 237 from raring diff --git a/debian/changelog b/debian/changelog index 564405c..105864d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,19 @@ -xorg-server (2:1.13.0-0ubuntu6.1) UNRELEASED; urgency=low +xorg-server (2:1.13.0-0ubuntu6.1) raring; urgency=low [ Maarten Lankhorst ] * add 233-xf86events-valgrind.patch to fix a xserver corruption when acpid is stopped before Xorg is. (LP: #1070481) * add 235-composite-tracking.diff to fix exa corruption. (LP: #1010794) + [ Bryce Harrington ] + * Add 236-use-fbdev-for-poulsbo-oaktrail-medfield.patch: Never use Intel +driver on Poulsbo/Oaktrail/Medfield. Thanks to Matthias Klumpp. +(LP: #1069031) + * Add 237-dix-set-the-device-transformation-matrix.patch: Fix pointer +jumping with absolute pointing device. Initializes device +transformation matrix to an identity matrix. Thanks to a7x. +(LP: #1041063) + [ Tim Lunn ] * 500_pointer_barrier_thresholds.diff: Update to fix gaps above barriers at edge of screen (LP: #1073724) diff --git a/debian/patches/236-use-fbdev-for-poulsbo-oaktrail-medfield.patch b/debian/patches/236-use-fbdev-for-poulsbo-oaktrail-medfield.patch new file mode 100644 index 000..dbf210d --- /dev/null +++ b/debian/patches/236-use-fbdev-for-poulsbo-oaktrail-medfield.patch @@ -0,0 +1,88 @@ +From ec3ce5493ec00ca0a9304b705a58a40e364f88fb Mon Sep 17 00:00:00 2001 +From: Stefan Dirsch +Date: Sun, 22 Jul 2012 12:29:51 +0200 +Subject: [PATCH 3/3] Do not use intel driver on Poulsbo, Oaktrail, Medfield, CDV. + +IDs stolen from Kernel psb driver. +--- + hw/xfree86/common/xf86pciBus.c | 64 +++- + 1 files changed, 56 insertions(+), 8 deletions(-) + +diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c +index a2c18eb..258988a 100644 +--- a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c +@@ -1147,14 +1147,62 @@ xf86VideoPtrToDriverList(struct pci_device *dev, + driverList[0] = "i128"; + break; + case 0x8086: +-if ((dev->device_id == 0x00d1) || (dev->device_id == 0x7800)) { +-driverList[0] = "i740"; +-} +-else if (dev->device_id == 0x8108) { +-break; /* "hooray" for poulsbo */ +-} +-else { +-driverList[0] = "intel"; ++ switch (dev->device_id) ++ { ++ /* Intel i740 */ ++ case 0x00d1: ++ case 0x7800: ++ driverList[0] = "i740"; ++ break; ++ /* GMA500/Poulsbo */ ++ case 0x8108: ++ case 0x8109: ++ /* Try psb driver on Poulsbo - if available */ ++ driverList[0] = "psb"; ++ driverList[1] = "psb_drv"; ++ break; ++ /* GMA600/Oaktrail */ ++ case 0x4100: ++ case 0x4101: ++ case 0x4102: ++ case 0x4103: ++ case 0x4104: ++ case 0x4105: ++ case 0x4106: ++ case 0x4107: ++ /* Atom E620/Oaktrail */ ++ case 0x4108: ++ /* Medfield */ ++ case 0x0130: ++ case 0x0131: ++ case 0x0132: ++ case 0x0133: ++ case 0x0134: ++ case 0x0135: ++ case 0x0136: ++ case 0x0137: ++ /* GMA 3600/CDV */ ++ case 0x0be0: ++ case 0x0be1: ++ case 0x0be2: ++
xorg-server: Changes to 'ubuntu-quantal'
debian/changelog |4 debian/patches/500_pointer_barrier_thresholds.diff |6 ++ 2 files changed, 6 insertions(+), 4 deletions(-) New commits: commit 98324889b2d56905757396359f9904fa2d99aa83 Author: Timo Aaltonen Date: Thu Nov 8 12:55:21 2012 +0200 500_pointer_barrier_thresholds.diff: Update to fix gaps above barriers at edge of screen (LP: #1073724) Conflicts: debian/changelog diff --git a/debian/changelog b/debian/changelog index cf97252..564405c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,10 @@ xorg-server (2:1.13.0-0ubuntu6.1) UNRELEASED; urgency=low when acpid is stopped before Xorg is. (LP: #1070481) * add 235-composite-tracking.diff to fix exa corruption. (LP: #1010794) + [ Tim Lunn ] + * 500_pointer_barrier_thresholds.diff: Update to fix gaps above +barriers at edge of screen (LP: #1073724) + -- Timo Aaltonen Tue, 09 Oct 2012 10:22:24 +0300 xorg-server (2:1.13.0-0ubuntu6) quantal; urgency=low diff --git a/debian/patches/500_pointer_barrier_thresholds.diff b/debian/patches/500_pointer_barrier_thresholds.diff index b61dcfc..70020b7 100644 --- a/debian/patches/500_pointer_barrier_thresholds.diff +++ b/debian/patches/500_pointer_barrier_thresholds.diff @@ -392,8 +392,7 @@ index 602b906..cab5b31 100644 +dir = barrier_get_direction(ox, oy, unclamped_prex, unclamped_prey); +barrier_calculate_velocity_components(ox, oy, unclamped_prex, unclamped_prey, &vel_x, &vel_y); --nearest = barrier_find_nearest(cs, dir, ox, oy, *x, *y); -+nearest = barrier_find_nearest(cs, dir, ox, oy, unclamped_prex, unclamped_prey); + nearest = barrier_find_nearest(cs, dir, ox, oy, *x, *y); if (nearest) { -barrier_clamp_to_barrier(nearest, dir, x, y); + int velocity = barrier_is_vertical(nearest) ? vel_x : vel_y; @@ -419,8 +418,7 @@ index 602b906..cab5b31 100644 oy = *y; } --nearest = barrier_find_nearest(cs, dir, ox, oy, *x, *y); -+nearest = barrier_find_nearest(cs, dir, ox, oy, unclamped_prex, unclamped_prey); + nearest = barrier_find_nearest(cs, dir, ox, oy, *x, *y); if (nearest) { -barrier_clamp_to_barrier(nearest, dir, x, y); + velocity = barrier_is_vertical(nearest) ? vel_x : vel_y; -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1twkyy-0005du...@vasks.debian.org
xorg-server: Changes to 'ubuntu-quantal'
New branch 'ubuntu-quantal' available with the following commits: commit 7b7250310ba40352afa43319c9af5203048604df Author: Maarten Lankhorst Date: Thu Oct 25 14:21:36 2012 +0200 postpone fix for LP #1065113 -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1trmsq-0008rz...@vasks.debian.org