mesa: Changes to 'ubuntu-trusty'
debian/changelog | 7 +++++++
debian/patches/fix-kwin.diff | 14 --------------
debian/patches/series | 1 -
3 files changed, 7 insertions(+), 15 deletions(-)
New commits:
commit f5b64f92bf6992c2a06f7b17bb6d412042b3a689
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Tue Jul 8 15:18:15 2014 +0300
Drop fix-kwin.diff hack, as 10.1.3 has 0380ec467d78f40 which fixes the issue properly.
diff --git a/debian/changelog b/debian/changelog
index db1efb9..e0e0b28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (10.1.3-0ubuntu0.2) UNRELEASED; urgency=medium
+
+ * Drop fix-kwin.diff hack, as 10.1.3 has 0380ec467d78f40 which
+ fixes the issue properly.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 08 Jul 2014 15:16:22 +0300
+
mesa (10.1.3-0ubuntu0.1) trusty; urgency=medium
* Copy package back to trusty.
diff --git a/debian/patches/fix-kwin.diff b/debian/patches/fix-kwin.diff
deleted file mode 100644
index c8ea49a..0000000
--- a/debian/patches/fix-kwin.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-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 4a26137..e939400 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,7 +11,6 @@
egl-platform-mir.patch
i915-dont-default-to-2.1.patch
fix-bsymbolic-madness.patch
-fix-kwin.diff
i965-dont-call-abort-on-unknown-dev.diff
enable-bdw.diff
fix-unity-on-bdw.diff
Reply to: