mesa: Changes to 'ubuntu'
debian/changelog | 6 ++++++
debian/patches/egl-platform-mir.patch | 9 +++++++++
2 files changed, 15 insertions(+)
New commits:
commit 9067ac1520b5f74a86bef12e031e3f8c411df2ba
Author: Christopher James Halse Rogers <raof@ubuntu.com>
Date: Thu Jul 3 11:52:41 2014 +1000
Fix segfault in Mir EGL platform on i965 (LP: #1336854)
diff --git a/debian/changelog b/debian/changelog
index 460c725..467ce81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.2.1-2ubuntu3) utopic; urgency=low
+
+ * Fix segfault in Mir EGL platform on i965 (LP: #1336854)
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Thu, 03 Jul 2014 11:52:41 +1000
+
mesa (10.2.1-2ubuntu2) utopic; urgency=medium
* Fix FTBFS by fixing 117-static-gallium.patch
diff --git a/debian/patches/egl-platform-mir.patch b/debian/patches/egl-platform-mir.patch
index 991c766..a5ee791 100644
--- a/debian/patches/egl-platform-mir.patch
+++ b/debian/patches/egl-platform-mir.patch
@@ -1045,6 +1045,15 @@
intel_update_dri2_buffers(brw, drawable);
driUpdateFramebufferSize(&brw->ctx, drawable);
+@@ -1271,7 +1269,7 @@
+ drm_intel_bo_flink(last_mt->bo, &old_name);
+ }
+
+- if (old_name == buffer->name)
++ if ((old_name != 0) && (old_name == buffer->name))
+ return;
+
+ if (unlikely(INTEL_DEBUG & DEBUG_DRI)) {
@@ -1282,8 +1280,13 @@
}
Reply to: