debian/changelog | 11 +++++++++++
debian/patches/124_fix_randr_no_crtc.patch | 13 +++++++++++++
debian/patches/series | 1 +
3 files changed, 25 insertions(+)
New commits:
commit 80c9bdd8ae23383e5c68ab23b9170112bdf86db0
Author: Bryce Harrington <[EMAIL PROTECTED]>
Date: Tue Jul 15 07:03:18 2008 -0700
Adding patch to fix bug with gdk apps crashing when using -vesa
diff --git a/debian/changelog b/debian/changelog
index 0a26dd1..c8e07db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xorg-server (2:1.4.99.905-0ubuntu3) intrepid; urgency=low
+
+ * patches/124_fix_randr_no_crtc.patch:
+ + In certain circumstances, xrandr multiscreen initialization fails
+ to associate crtcs with monitors, resulting in startup failures
+ in some GDK-based applications when using -vesa. This occurs
+ because mode-Clock, mode->HTotal, and mode->VTotal are all 0.
+ (LP: #246585)
+
+ -- Bryce Harrington <[EMAIL PROTECTED]> Tue, 15 Jul 2008 07:01:13 -0700
+
xorg-server (2:1.4.99.905-0ubuntu1) intrepid; urgency=low
* Merge with Debian experimental, remaining changes:
diff --git a/debian/patches/124_fix_randr_no_crtc.patch
b/debian/patches/124_fix_randr_no_crtc.patch
new file mode 100644
index 0000000..21a8281
--- /dev/null
+++ b/debian/patches/124_fix_randr_no_crtc.patch
@@ -0,0 +1,13 @@
+Index: xorg-server/hw/xfree86/common/xf86RandR.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/common/xf86RandR.c
++++ xorg-server/hw/xfree86/common/xf86RandR.c
+@@ -54,6 +54,8 @@
+ {
+ if (mode->VRefresh)
+ return (int) (mode->VRefresh + 0.5);
++ else if (mode->Clock == 0)
++ return 0;
+ else
+ return (int) (mode->Clock * 1000.0 / mode->HTotal / mode->VTotal + 0.5);
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 73dfebd..65fb432 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
120_fedora_xserver-xaa-evict-pixmaps.patch
121_only_switch_vt_when_active.diff
123_no_composite_for_xvfb_run.patch
+124_fix_randr_no_crtc.patch
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
