xorg-server: Changes to 'ubuntu'
debian/changelog | 19 +++++++++++++++++++
debian/patches/157_check_null_modes.patch | 14 ++++++++++++++
debian/patches/158_raise_maxclients.patch | 13 +++++++++++++
debian/patches/159_xinerama_focus.patch | 19 +++++++++++++++++++
debian/patches/series | 3 +++
5 files changed, 68 insertions(+)
New commits:
commit 410a171681d43df84fd806d6c607f45d0a42c7b7
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Wed Feb 4 22:36:30 2009 -0800
Add kees' maxclient patch, and renumber steven's patch for consistency.
diff --git a/debian/changelog b/debian/changelog
index 1822398..ff2d3ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,13 +5,17 @@ xorg-server (2:1.5.99.902-0ubuntu2) jaunty; urgency=low
video mode selection, which can cause xserver crash when using SDL
applications with qemu/kvm.
(LP: #300310)
-
+ * Add 158_raise_maxclients.patch to raise max number of clients from 256
+ to 512. Trade-off is that this reduces client resources available to
+ 1,048,576 total resources (which should still be ample).
+ (LP: #260138)
+
[Steven Harms]
- * 151_xinerama_focus.patch: Resolves xinerama focus issues
+ * 159_xinerama_focus.patch: Resolves xinerama focus issues
with multiple screens
(LP: #41301)
- -- Bryce Harrington <bryce@ubuntu.com> Wed, 04 Feb 2009 21:10:34 -0800
+ -- Bryce Harrington <bryce@ubuntu.com> Wed, 04 Feb 2009 22:33:28 -0800
xorg-server (2:1.5.99.902-0ubuntu1) jaunty; urgency=low
diff --git a/debian/patches/151_xinerama_focus.patch b/debian/patches/151_xinerama_focus.patch
deleted file mode 100644
index 36b3dfb..0000000
--- a/debian/patches/151_xinerama_focus.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/mi/mipointer.c 2009-02-04 19:35:31.000000000 -0500
-+++ b/mi/mipointer.c 2009-02-04 19:38:21.000000000 -0500
-@@ -332,7 +332,15 @@
- pPointer->pScreen = pScreen;
- }
-
-- if (changedScreen)
-+ /* Don't call USFS if we use Xinerama, otherwise the root window is
-+ * updated to the second screen, and we never receive any events.
-+ * (FDO bug #18668) */
-+
-+ if (changedScreen
-+#ifdef PANORAMIX
-+ && noPanoramiXExtension
-+#endif
-+ )
- UpdateSpriteForScreen (pDev, pScreen) ;
- }
-
diff --git a/debian/patches/158_raise_maxclients.patch b/debian/patches/158_raise_maxclients.patch
new file mode 100644
index 0000000..737d6b0
--- /dev/null
+++ b/debian/patches/158_raise_maxclients.patch
@@ -0,0 +1,13 @@
+Index: xorg-server-1.4.99.906/include/misc.h
+===================================================================
+--- xorg-server-1.4.99.906.orig/include/misc.h 2008-08-21 10:02:24.000000000 -0700
++++ xorg-server-1.4.99.906/include/misc.h 2008-08-21 10:02:33.000000000 -0700
+@@ -86,7 +86,7 @@
+ #ifndef MAXSCREENS
+ #define MAXSCREENS 16
+ #endif
+-#define MAXCLIENTS 256
++#define MAXCLIENTS 512
+ #define MAXFORMATS 8
+
+ typedef unsigned long PIXEL;
diff --git a/debian/patches/159_xinerama_focus.patch b/debian/patches/159_xinerama_focus.patch
new file mode 100644
index 0000000..36b3dfb
--- /dev/null
+++ b/debian/patches/159_xinerama_focus.patch
@@ -0,0 +1,19 @@
+--- a/mi/mipointer.c 2009-02-04 19:35:31.000000000 -0500
++++ b/mi/mipointer.c 2009-02-04 19:38:21.000000000 -0500
+@@ -332,7 +332,15 @@
+ pPointer->pScreen = pScreen;
+ }
+
+- if (changedScreen)
++ /* Don't call USFS if we use Xinerama, otherwise the root window is
++ * updated to the second screen, and we never receive any events.
++ * (FDO bug #18668) */
++
++ if (changedScreen
++#ifdef PANORAMIX
++ && noPanoramiXExtension
++#endif
++ )
+ UpdateSpriteForScreen (pDev, pScreen) ;
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index 6ca617d..50c14ce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,7 +11,8 @@
135_rethrow_signals.patch
140_quell_acpi_errmsgs.patch
143_default_to_vesa.patch
-151_xinerama_focus.patch
153_make_dmx_compile.patch
156_exevents_copykeyclass_nullptrcheck.patch
157_check_null_modes.patch
+158_raise_maxclients.patch
+159_xinerama_focus.patch
commit be111f4cf65c1e53123a50f5afa6a70c3d319878
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Wed Feb 4 22:31:47 2009 -0800
Couple more patches
diff --git a/debian/changelog b/debian/changelog
index 896a812..1822398 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,16 @@
xorg-server (2:1.5.99.902-0ubuntu2) jaunty; urgency=low
+ [Bryce Harrington]
* Add 157_check_null_modes.patch: Catch null pointer dereference in
video mode selection, which can cause xserver crash when using SDL
applications with qemu/kvm.
(LP: #300310)
+ [Steven Harms]
+ * 151_xinerama_focus.patch: Resolves xinerama focus issues
+ with multiple screens
+ (LP: #41301)
+
-- Bryce Harrington <bryce@ubuntu.com> Wed, 04 Feb 2009 21:10:34 -0800
xorg-server (2:1.5.99.902-0ubuntu1) jaunty; urgency=low
diff --git a/debian/patches/151_xinerama_focus.patch b/debian/patches/151_xinerama_focus.patch
new file mode 100644
index 0000000..36b3dfb
--- /dev/null
+++ b/debian/patches/151_xinerama_focus.patch
@@ -0,0 +1,19 @@
+--- a/mi/mipointer.c 2009-02-04 19:35:31.000000000 -0500
++++ b/mi/mipointer.c 2009-02-04 19:38:21.000000000 -0500
+@@ -332,7 +332,15 @@
+ pPointer->pScreen = pScreen;
+ }
+
+- if (changedScreen)
++ /* Don't call USFS if we use Xinerama, otherwise the root window is
++ * updated to the second screen, and we never receive any events.
++ * (FDO bug #18668) */
++
++ if (changedScreen
++#ifdef PANORAMIX
++ && noPanoramiXExtension
++#endif
++ )
+ UpdateSpriteForScreen (pDev, pScreen) ;
+ }
+
diff --git a/debian/patches/157_check_null_modes.patch b/debian/patches/157_check_null_modes.patch
new file mode 100644
index 0000000..7bdcb8b
--- /dev/null
+++ b/debian/patches/157_check_null_modes.patch
@@ -0,0 +1,14 @@
+diff --git a/hw/xfree86/common/xf86VidMode.c b/hw/xfree86/common/xf86VidMode.c
+index d855bd1..2af8c00 100644
+--- a/hw/xfree86/common/xf86VidMode.c
++++ b/hw/xfree86/common/xf86VidMode.c
+@@ -226,6 +226,9 @@ VidModeGetFirstModeline(int scrnIndex, pointer *mode, int *dotClock)
+
+ pScrn = xf86Screens[scrnIndex];
+ pVidMode = VMPTR(pScrn->pScreen);
++ if (pScrn->modes == NULL)
++ return FALSE;
++
+ pVidMode->First = pScrn->modes;
+ pVidMode->Next = pVidMode->First->next;
+
diff --git a/debian/patches/series b/debian/patches/series
index 2802e1a..6ca617d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,6 +11,7 @@
135_rethrow_signals.patch
140_quell_acpi_errmsgs.patch
143_default_to_vesa.patch
+151_xinerama_focus.patch
153_make_dmx_compile.patch
156_exevents_copykeyclass_nullptrcheck.patch
157_check_null_modes.patch
commit cdb40260a9b327cf7314970199ae1d2dfb4c2182
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Wed Feb 4 21:14:55 2009 -0800
null pointer check for vid mode selection
diff --git a/debian/changelog b/debian/changelog
index c426fb0..896a812 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.5.99.902-0ubuntu2) jaunty; urgency=low
+
+ * Add 157_check_null_modes.patch: Catch null pointer dereference in
+ video mode selection, which can cause xserver crash when using SDL
+ applications with qemu/kvm.
+ (LP: #300310)
+
+ -- Bryce Harrington <bryce@ubuntu.com> Wed, 04 Feb 2009 21:10:34 -0800
+
xorg-server (2:1.5.99.902-0ubuntu1) jaunty; urgency=low
* New upstream release candidate.
diff --git a/debian/patches/series b/debian/patches/series
index a5a0646..2802e1a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@
143_default_to_vesa.patch
153_make_dmx_compile.patch
156_exevents_copykeyclass_nullptrcheck.patch
+157_check_null_modes.patch
Reply to: