Bug#628907: pu: package mesa/7.7.1-5
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: pu
I'm pondering a mesa update to fix a silly issue with dri2: when a
client is not local, direct rendering is not possible so the X server
returns a BadRequest error for all dri2 requests (except for
QueryVersion). mesa then crashes instead of falling back to software
rendering. Tested on an ltsp client running squeeze. I assume you'll
want this fixed in sid first, so I won't upload until then anyway.
diff --git a/debian/changelog b/debian/changelog
index 1a34044..ab1f238 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (7.7.1-5) UNRELEASED; urgency=low
+
+ * glx: suppress BadRequest from DRI2Connect (which is expected for non-local
+ clients).
+
+ -- Julien Cristau <jcristau@debian.org> Tue, 31 May 2011 15:08:18 +0200
+
mesa (7.7.1-4) unstable; urgency=low
[ Brice Goglin ]
diff --git a/debian/patches/08_glx-ignore-BadRequest-errors-from-DRI2Connect.diff b/debian/patches/08_glx-ignore-BadRequest-errors-from-DRI2Connect.diff
new file mode 100644
index 0000000..32014bd
--- /dev/null
+++ b/debian/patches/08_glx-ignore-BadRequest-errors-from-DRI2Connect.diff
@@ -0,0 +1,52 @@
+From 46f568ec04eacb500f4057c31453b5e80b4e8aaf Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Tue, 31 May 2011 16:02:21 +0200
+Subject: [PATCH] glx: ignore BadRequest errors from DRI2Connect
+
+They are expected for non-local clients.
+---
+ src/glx/x11/dri2.c | 14 +++++++++++++-
+ 1 files changed, 13 insertions(+), 1 deletions(-)
+
+diff --git a/src/glx/x11/dri2.c b/src/glx/x11/dri2.c
+index dad0447..cbf5e0b 100644
+--- a/src/glx/x11/dri2.c
++++ b/src/glx/x11/dri2.c
+@@ -54,6 +54,8 @@
+ static char dri2ExtensionName[] = DRI2_NAME;
+ static XExtensionInfo *dri2Info;
+ static XEXT_GENERATE_CLOSE_DISPLAY (DRI2CloseDisplay, dri2Info)
++static int
++DRI2Error(Display *dpy, xError *err, XExtCodes *codes, int *ret_code);
+
+ static /* const */ XExtensionHooks dri2ExtensionHooks = {
+ NULL, /* create_gc */
+@@ -65,7 +67,7 @@ static /* const */ XExtensionHooks dri2ExtensionHooks = {
+ DRI2CloseDisplay, /* close_display */
+ NULL, /* wire_to_event */
+ NULL, /* event_to_wire */
+- NULL, /* error */
++ DRI2Error, /* error */
+ NULL, /* error_string */
+ };
+
+@@ -75,6 +77,16 @@ static XEXT_GENERATE_FIND_DISPLAY (DRI2FindDisplay,
+ &dri2ExtensionHooks,
+ 0, NULL)
+
++static int
++DRI2Error(Display *dpy, xError *err, XExtCodes *codes, int *ret_code)
++{
++ if (err->majorCode == codes->major_opcode &&
++ err->errorCode == BadRequest &&
++ err->minorCode == X_DRI2Connect)
++ return True;
++ return False;
++}
++
+ Bool
+ DRI2QueryExtension(Display * dpy, int *eventBase, int *errorBase)
+ {
+--
+1.7.2.5
+
diff --git a/debian/patches/series b/debian/patches/series
index 8cf687d..e27ab86 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
05_hurd-ftbfs.diff
06_kfreebsd-ftbfs.diff
07_fix_i915_dri1.patch
+08_glx-ignore-BadRequest-errors-from-DRI2Connect.diff
Cheers,
Julien
Reply to: