xorg-server: Changes to 'ubuntu'
debian/changelog | 9 +++++++++
debian/patches/178_glx_flush_cache.patch | 26 ++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 36 insertions(+)
New commits:
commit f1f5839ee28ca07366446eb3188ce8a491362e38
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Tue Aug 4 01:50:03 2009 -0700
Add 178_glx_flush_cache.patch to fix crash during compiz startup
diff --git a/debian/changelog b/debian/changelog
index 4ee6ef5..ff7c9e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.6.2.901-1ubuntu2) karmic; urgency=low
+
+ * Add 178_glx_flush_cache.patch and 179_glx_cleanup_drawables.patch:
+ - Cleanup destroyed windows and drawables, to prevent crash during
+ compiz startup.
+ (LP: #408293)
+
+ -- Bryce Harrington <bryce@ubuntu.com> Mon, 03 Aug 2009 07:55:12 -0700
+
xorg-server (2:1.6.2.901-1ubuntu1) karmic; urgency=low
[ Timo Aaltonen ]
diff --git a/debian/patches/178_glx_flush_cache.patch b/debian/patches/178_glx_flush_cache.patch
new file mode 100644
index 0000000..89b18a9
--- /dev/null
+++ b/debian/patches/178_glx_flush_cache.patch
@@ -0,0 +1,26 @@
+commit 2075d4bf9e53b8baef0b919da6c44771220cd4a5
+Author: Michel Dänzer <daenzer@vmware.com>
+Date: Thu May 14 11:46:41 2009 +0200
+
+ glx: If a destroyed window is bound to the current context, make it not current.
+
+ Avoids subsequent crashes due to stale pointers to the DrawableRec, see
+ https://bugs.freedesktop.org/show_bug.cgi?id=21132#c15 and previous comments.
+
+ Signed-off-by: Michel Dänzer <daenzer@vmware.com>
+
+diff --git a/glx/glxext.c b/glx/glxext.c
+index 93391e9..6bc7bef 100644
+--- a/glx/glxext.c
++++ b/glx/glxext.c
+@@ -126,6 +126,10 @@ static Bool DrawableGone(__GLXdrawable *glxPriv, XID xid)
+ __GLXcontext *c;
+
+ for (c = glxAllContexts; c; c = c->next) {
++ if (c->isCurrent && (c->drawPriv == glxPriv || c->readPriv == glxPriv)) {
++ (*c->loseCurrent)(c);
++ __glXFlushContextCache();
++ }
+ if (c->drawPriv == glxPriv)
+ c->drawPriv = NULL;
+ if (c->readPriv == glxPriv)
diff --git a/debian/patches/series b/debian/patches/series
index 759feee..43496f5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -32,3 +32,4 @@ fedora-pci-primary.diff
172_cwgetbackingpicture_nullptr_check.patch
174_set_bg_pixmap_of_cow_to_none.patch
177_animated_cursor_change_master.patch
+178_glx_flush_cache.patch
Reply to: