xorg-server: Changes to 'ubuntu'
debian/changelog | 8 +++++
debian/patches/196_xvfb-fbscreeninit-handling.patch | 29 ++++++++++++++++++++
debian/patches/197_xvfb-randr.patch | 17 +++++++++++
debian/patches/series | 2 +
4 files changed, 56 insertions(+)
New commits:
commit b2f1ef1e241a3edd188b3508b4b6b35540f2b2b6
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Thu Feb 4 10:57:37 2010 -0800
Add xrandr support to xvfb
diff --git a/debian/changelog b/debian/changelog
index ba13427..822d4d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.7.3.902-1ubuntu11) lucid; urgency=low
+
+ * Add 196_xvfb-fbscreeninit-handling.patch and 197_xvfb-randr.patch:
+ Adds xrandr support to xvfb. Thanks lifeless!
+ (LP: #516123)
+
+ -- Bryce Harrington <bryce@ubuntu.com> Thu, 04 Feb 2010 10:56:12 -0800
+
xorg-server (2:1.7.3.902-1ubuntu10) lucid; urgency=low
* 100_rethrow_signals.patch: Fix SigAbortServer to cleanly exit(1) on a
diff --git a/debian/patches/196_xvfb-fbscreeninit-handling.patch b/debian/patches/196_xvfb-fbscreeninit-handling.patch
new file mode 100644
index 0000000..61041e6
--- /dev/null
+++ b/debian/patches/196_xvfb-fbscreeninit-handling.patch
@@ -0,0 +1,29 @@
+=== modified file 'hw/vfb/InitOutput.c'
+--- hw/vfb/InitOutput.c 2009-06-11 20:34:06 +0000
++++ hw/vfb/InitOutput.c 2010-02-02 16:34:02 +0000
+@@ -66,6 +66,7 @@
+ #endif /* HAS_SHM */
+ #include "dix.h"
+ #include "miline.h"
++#include "randrstr.h"
+
+ #define VFB_DEFAULT_WIDTH 1280
+ #define VFB_DEFAULT_HEIGHT 1024
+@@ -904,13 +905,13 @@
+
+ ret = fbScreenInit(pScreen, pbits, pvfb->width, pvfb->height,
+ dpix, dpiy, pvfb->paddedWidth,pvfb->bitsPerPixel);
++ if (!ret) return FALSE;
++
+ #ifdef RENDER
+- if (ret && Render)
++ if (Render)
+ fbPictureInit (pScreen, 0, 0);
+ #endif
+
+- if (!ret) return FALSE;
+-
+ miInitializeBackingStore(pScreen);
+
+ /*
+
diff --git a/debian/patches/197_xvfb-randr.patch b/debian/patches/197_xvfb-randr.patch
new file mode 100644
index 0000000..2723f05
--- /dev/null
+++ b/debian/patches/197_xvfb-randr.patch
@@ -0,0 +1,17 @@
+=== modified file 'hw/vfb/InitOutput.c'
+--- hw/vfb/InitOutput.c 2010-02-02 16:34:02 +0000
++++ hw/vfb/InitOutput.c 2010-02-02 16:36:42 +0000
+@@ -912,6 +912,12 @@
+ fbPictureInit (pScreen, 0, 0);
+ #endif
+
++ if (!miRandRInit(pScreen))
++ /* Not sure how to emit warnings in xorg. Should warn here though:
++ * ("Could not initialise RANDR\n");
++ */
++ return FALSE;
++
+ miInitializeBackingStore(pScreen);
+
+ /*
+
diff --git a/debian/patches/series b/debian/patches/series
index 625d6ac..6e0bd15 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -32,3 +32,5 @@
189_xserver_1.5.0_bg_none_root.patch
190_cache-xkbcomp_output_for_fast_start_up.patch
191-Xorg-add-an-extra-module-path.patch
+196_xvfb-fbscreeninit-handling.patch
+197_xvfb-randr.patch
Reply to: