mesa: Changes to 'debian-unstable'
debian/changelog | 8 ++++++++
debian/patches/05_kfreebsd-egl-x11.diff | 31 +++++++++++++++++++++++++++++++
debian/patches/series | 1 +
src/glx/dri2.c | 9 +++++++++
4 files changed, 49 insertions(+)
New commits:
commit 3fa4347e070d2c27ef5d85d2705d647d0ff29fe4
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Aug 25 23:13:45 2011 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index ee405b2..b380faa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-mesa (7.11-2) UNRELEASED; urgency=low
+mesa (7.11-2) unstable; urgency=low
* Work around the lack of O_CLOEXEC on kfreebsd, fix FTBFS.
* Don't crash on BadRequest from DRI2Connect, just fall back to sw or
indirect.
- -- Julien Cristau <jcristau@debian.org> Thu, 25 Aug 2011 23:10:16 +0200
+ -- Julien Cristau <jcristau@debian.org> Thu, 25 Aug 2011 23:13:35 +0200
mesa (7.11-1) unstable; urgency=low
commit 07e8a91c03a8792d00a35c030d1b1a5b2a17b914
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Aug 25 23:12:55 2011 +0200
Update changelog
diff --git a/debian/changelog b/debian/changelog
index 178b9f9..ee405b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
mesa (7.11-2) UNRELEASED; urgency=low
* Work around the lack of O_CLOEXEC on kfreebsd, fix FTBFS.
+ * Don't crash on BadRequest from DRI2Connect, just fall back to sw or
+ indirect.
-- Julien Cristau <jcristau@debian.org> Thu, 25 Aug 2011 23:10:16 +0200
commit 9e2b13806570e83c8d7ccf18a288528727bb9707
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Thu Aug 4 12:06:13 2011 +1000
glx/dri2: Paper over errors in DRI2Connect when indirect
DRI2 will throw BadRequest for this when the client is not local, but
DRI2 is an implementation detail and not something callers should have
to know about. Silently swallow errors in this case, and just propagate
the failure through DRI2Connect's return code.
Note: This is a candidate for the stable release branches.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=28125
Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
(cherry picked from commit fbc2fcf685d22ec9bc9465e1f731529979497eaa)
diff --git a/src/glx/dri2.c b/src/glx/dri2.c
index adfd3d1..00adff2 100644
--- a/src/glx/dri2.c
+++ b/src/glx/dri2.c
@@ -180,6 +180,15 @@ DRI2Error(Display *display, xError *err, XExtCodes *codes, int *ret_code)
err->minorCode == X_DRI2DestroyDrawable)
return True;
+ /* If the server is non-local DRI2Connect will raise BadRequest.
+ * Swallow this so that DRI2Connect can signal this in its return code */
+ if (err->majorCode == codes->major_opcode &&
+ err->minorCode == X_DRI2Connect &&
+ err->errorCode == BadRequest) {
+ *ret_code = False;
+ return True;
+ }
+
return False;
}
commit 90125d174acdab34957919d6c5b6835deb717233
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Aug 25 23:10:39 2011 +0200
Work around the lack of O_CLOEXEC on kfreebsd, fix FTBFS.
diff --git a/debian/changelog b/debian/changelog
index b2c9b13..178b9f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (7.11-2) UNRELEASED; urgency=low
+
+ * Work around the lack of O_CLOEXEC on kfreebsd, fix FTBFS.
+
+ -- Julien Cristau <jcristau@debian.org> Thu, 25 Aug 2011 23:10:16 +0200
+
mesa (7.11-1) unstable; urgency=low
[ Christopher James Halse Rogers ]
diff --git a/debian/patches/05_kfreebsd-egl-x11.diff b/debian/patches/05_kfreebsd-egl-x11.diff
new file mode 100644
index 0000000..1bedcd6
--- /dev/null
+++ b/debian/patches/05_kfreebsd-egl-x11.diff
@@ -0,0 +1,31 @@
+From 8aec01a4d5d098430cdb369a69a85cdbf20ebc99 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Thu, 25 Aug 2011 23:08:05 +0200
+Subject: [PATCH] Work around the lack of O_CLOEXEC on kbsd
+
+Not that dri2 is going to work there, but well.
+---
+ src/egl/drivers/dri2/platform_x11.c | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c
+index 4e00c95..f38d6c0 100644
+--- a/src/egl/drivers/dri2/platform_x11.c
++++ b/src/egl/drivers/dri2/platform_x11.c
+@@ -997,7 +997,13 @@ dri2_initialize_x11_dri2(_EGLDriver *drv, _EGLDisplay *disp)
+ if (!dri2_load_driver(disp))
+ goto cleanup_conn;
+
++#ifdef O_CLOEXEC
+ dri2_dpy->fd = open(dri2_dpy->device_name, O_RDWR | O_CLOEXEC);
++#else
++ dri2_dpy->fd = open(dri2_dpy->device_name, O_RDWR);
++ if (dri2_dpy->fd >= 0)
++ fcntl(dri2_dpy->fd, F_SETFD, fcntl(dri2_dpy->fd, F_GETFD) | FD_CLOEXEC);
++#endif
+ if (dri2_dpy->fd == -1) {
+ _eglLog(_EGL_WARNING,
+ "DRI2: could not open %s (%s)", dri2_dpy->device_name,
+--
+1.7.2.5
+
diff --git a/debian/patches/series b/debian/patches/series
index 63e9bf8..a53443c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
02_use-ieee-fp-on-s390-and-m68k.patch
04_osmesa_version.diff
+05_kfreebsd-egl-x11.diff
06_kfreebsd-ftbfs.diff
08-kfreebsd-gallium.diff
10-hurd-configure-tweaks.diff
Reply to: