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 <maarten.lankhorst@canonical.com>
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 <maarten.lankhorst@ubuntu.com> 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 0000000..19e6ef7
--- /dev/null
+++ b/debian/patches/fixup-headless.patch
@@ -0,0 +1,36 @@
+commit d71a17cfab6536df9df46a342a24dd415c020192
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Nov 10 10:26:08 2012 +0000
+
+ xf86: select a fake output for headless servers
+
+ Following commit 37d956e3ac9513b74078882dff489f9b0a7a5a28
+ Author: Keith Packard <keithp@keithp.com>
+ 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 <chris@chris-wilson.co.uk>
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (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
Reply to: