debian/changelog | 6 +++++-
debian/patches/egl-platform-mir.patch | 3 ++-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit e6c789a7d625d7fb1a6f96ef2e8b3073db6e05f6
Author: Christopher James Halse Rogers <r...@ubuntu.com>
Date: Wed Oct 28 11:10:34 2015 +1100
Update changelog
diff --git a/debian/changelog b/debian/changelog
index b2e08f1..cc166ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
mesa (11.0.4-1ubuntu1) UNRELEASED; urgency=medium
+ [ Timo Aaltonen ]
* Merge from Debian.
* patches: Dropped patches included in this release, fix Mir patch
FTBFS. (LP: #1509005)
- -- Timo Aaltonen <tjaal...@debian.org> Mon, 26 Oct 2015 14:06:15 +0200
+ [ Christopher James Halse Rogers ]
+ * patches: Fix Mir patch harder.
+
+ -- Christopher James Halse Rogers <r...@ubuntu.com> Wed, 28 Oct 2015
11:10:12 +1100
mesa (11.0.4-1) unstable; urgency=medium
commit 35c0047030ce23a1bbcbf2f663c75854b684ad97
Author: Christopher James Halse Rogers <r...@ubuntu.com>
Date: Wed Oct 28 11:09:30 2015 +1100
Update Mir EGL platform so that it really, really builds.
diff --git a/debian/patches/egl-platform-mir.patch
b/debian/patches/egl-platform-mir.patch
index 92bb428..e1bad46 100644
--- a/debian/patches/egl-platform-mir.patch
+++ b/debian/patches/egl-platform-mir.patch
@@ -170,7 +170,7 @@ Index: mesa-11.0.2/src/egl/drivers/dri2/platform_mir.c
===================================================================
--- /dev/null
+++ mesa-11.0.2/src/egl/drivers/dri2/platform_mir.c
-@@ -0,0 +1,617 @@
+@@ -0,0 +1,618 @@
+/*
+ * Copyright © 2012 Canonical, Inc
+ *
@@ -200,6 +200,7 @@ Index: mesa-11.0.2/src/egl/drivers/dri2/platform_mir.c
+ */
+
+#include <mir_toolkit/mesa/native_display.h>
++#include <mir_toolkit/mir_native_buffer.h>
+
+#include <stdlib.h>
+#include <string.h>
