xorg-server: Changes to 'ubuntu'
debian/changelog | 10 ++++++
debian/patches/163_thinko_in_xf86targetpreferred.patch | 26 +++++++++++++++++
debian/patches/series | 1
3 files changed, 37 insertions(+)
New commits:
commit 1dd7b10efcab6aefea3f55e839c7986662e787ea
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Wed Mar 18 20:27:36 2009 -0700
Add patch for getting modes detected when no preferred monitor is
defined.
diff --git a/debian/changelog b/debian/changelog
index 7e75786..616cb6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xorg-server (2:1.6.0-0ubuntu2) UNRELEASED; urgency=low
+
+ * Add thinko_in_xf86targetpreferred.patch: For monitors that do not
+ define a "preferred" mode, if the monitor is not connected to the
+ first output, X wouldn't pick up the mode correctly, resulting in a
+ "No modes" error in Xorg.0.log and dropping user to failsafe-X mode.
+ (LP: #335214)
+
+ -- Bryce Harrington <bryce@ubuntu.com> Wed, 18 Mar 2009 20:27:09 -0700
+
xorg-server (2:1.6.0-0ubuntu1) jaunty; urgency=low
[ Bryce Harrington ]
diff --git a/debian/patches/163_thinko_in_xf86targetpreferred.patch b/debian/patches/163_thinko_in_xf86targetpreferred.patch
new file mode 100644
index 0000000..78d5fdb
--- /dev/null
+++ b/debian/patches/163_thinko_in_xf86targetpreferred.patch
@@ -0,0 +1,26 @@
+From 8a6ed44a8b2fc5f14729dc54fec17607ced03859 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Mon, 02 Mar 2009 19:26:23 +0000
+Subject: randr: Fix thinko in xf86TargetPreferred
+
+The only-one-output case would only work right if that also happened to
+be the zeroth output. Oops.
+---
+diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
+index 7226f4f..7d6feaf 100644
+--- a/hw/xfree86/modes/xf86Crtc.c
++++ b/hw/xfree86/modes/xf86Crtc.c
+@@ -2085,9 +2085,9 @@ xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
+ (float)config->output[p]->mm_height;
+
+ if (aspect)
+- preferred_match[0] = bestModeForAspect(config, enabled, aspect);
++ preferred_match[p] = bestModeForAspect(config, enabled, aspect);
+
+- if (preferred_match[0])
++ if (preferred_match[p])
+ ret = TRUE;
+
+ } while (0);
+--
+cgit v0.8.2
diff --git a/debian/patches/series b/debian/patches/series
index 353b282..619449b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,3 +19,4 @@
160_log_timestamping.patch
162_null_crtc_in_rotation.patch
999_default_modedebug_on.patch
+163_thinko_in_xf86targetpreferred.patch
Reply to: