mesa: Changes to 'ubuntu'
debian/changelog | 6 ++++++
debian/patches/fix-kwin.diff | 14 ++++++++++++++
debian/patches/series | 1 +
3 files changed, 21 insertions(+)
New commits:
commit bcde4d8c9d61fc48c0226872ea462863c2249b5d
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Tue Apr 8 19:19:01 2014 +0300
release to trusty
diff --git a/debian/changelog b/debian/changelog
index f9dc250..9d46d59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (10.1.0-4ubuntu2) UNRELEASED; urgency=medium
+mesa (10.1.0-4ubuntu2) trusty; urgency=medium
* fix-kwin.diff: i965; Don't check reset status on gen4/5. (LP: #1299499)
commit 3f08841f8e339051615f27330e716e95fe464845
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Thu Apr 3 19:40:26 2014 +0300
fix-kwin.diff: i965; Don't check reset status on gen4/5. (LP: #1299499)
diff --git a/debian/changelog b/debian/changelog
index 49e46dc..f9dc250 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.1.0-4ubuntu2) UNRELEASED; urgency=medium
+
+ * fix-kwin.diff: i965; Don't check reset status on gen4/5. (LP: #1299499)
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 01 Apr 2014 16:58:02 +0300
+
mesa (10.1.0-4ubuntu1) trusty; urgency=medium
* Merge from unreleased debian sid.
diff --git a/debian/patches/fix-kwin.diff b/debian/patches/fix-kwin.diff
new file mode 100644
index 0000000..c8ea49a
--- /dev/null
+++ b/debian/patches/fix-kwin.diff
@@ -0,0 +1,14 @@
+diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
+index e113654..5790680 100644
+--- a/src/mesa/drivers/dri/i965/brw_context.c
++++ b/src/mesa/drivers/dri/i965/brw_context.c
+@@ -645,7 +645,7 @@ brwCreateContext(gl_api api,
+
+ brw_init_driver_functions(brw, &functions);
+
+- if (notify_reset)
++ if (notify_reset && brw->gen >= 6)
+ functions.GetGraphicsResetStatus = brw_get_graphics_reset_status;
+
+ struct gl_context *ctx = &brw->ctx;
+
diff --git a/debian/patches/series b/debian/patches/series
index 3880f5e..f5cf97e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@
egl-platform-mir.patch
i915-dont-default-to-2.1.patch
fix-bsymbolic-madness.patch
+fix-kwin.diff
Reply to: