xorg-server: Changes to 'ubuntu'
debian/changelog | 9 +++++++++
debian/patches/162_null_crtc_in_rotation.patch | 14 ++++++++++++++
debian/patches/series | 1 +
3 files changed, 24 insertions(+)
New commits:
commit f3fc4e6b3fc3d302fadc943cb11f06af3766af45
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Wed Feb 25 20:02:04 2009 -0800
Patch for crash in bug #139990
diff --git a/debian/changelog b/debian/changelog
index 893b423..867b303 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.5.99.902-0ubuntu8) UNRELEASED; urgency=low
+
+ * Add 162_null_crtc_in_rotation.patch: Fixes crash when two displays on
+ separate cards are attached. X doesn't work with multiple cards yet,
+ but crashing is not an appropriate way to handle such a situation.
+ (LP: #139990)
+
+ -- Bryce Harrington <bryce@ubuntu.com> Wed, 25 Feb 2009 20:01:54 -0800
+
xorg-server (2:1.5.99.902-0ubuntu7) jaunty; urgency=low
* Add 161_force_paired_kbd_device.patch: Fixes issue where a multimedia
diff --git a/debian/patches/162_null_crtc_in_rotation.patch b/debian/patches/162_null_crtc_in_rotation.patch
new file mode 100644
index 0000000..5b0b244
--- /dev/null
+++ b/debian/patches/162_null_crtc_in_rotation.patch
@@ -0,0 +1,14 @@
+diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
+index 362229c..85f6f1c 100644
+--- a/hw/xfree86/modes/xf86RandR12.c
++++ b/hw/xfree86/modes/xf86RandR12.c
+@@ -719,7 +719,8 @@ xf86RandR12SetRotations (ScreenPtr pScreen, Rotation rotations)
+ for (c = 0; c < config->num_crtc; c++) {
+ xf86CrtcPtr crtc = config->crtc[c];
+
+- RRCrtcSetRotations (crtc->randr_crtc, rotations);
++ if (crtc != NULL)
++ RRCrtcSetRotations (crtc->randr_crtc, rotations);
+ }
+ #endif
+ randrp->supported_rotations = rotations;
diff --git a/debian/patches/series b/debian/patches/series
index 48823a8..e69a364 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,3 +19,4 @@
160_log_timestamping.patch
999_default_modedebug_on.patch
161_force_paired_kbd_device.patch
+162_null_crtc_in_rotation.patch
Reply to: