debian/patches/egl-platform-mir.patch | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
New commits:
commit 031125e98fd6eae412042b4666e08ff2685eb414
Author: Christopher James Halse Rogers <r...@ubuntu.com>
Date: Fri Sep 16 15:47:03 2016 +1000
Fix egl-platform-mir mis-merge.
We were failing to initialise dri2_dpy->ref_count to 1 in eglInitialize,
causing
a premature free and madness.
diff --git a/debian/patches/egl-platform-mir.patch
b/debian/patches/egl-platform-mir.patch
index 578dd8d..aa2a293 100644
--- a/debian/patches/egl-platform-mir.patch
+++ b/debian/patches/egl-platform-mir.patch
@@ -51,22 +51,23 @@
struct __DRIdri2LoaderExtensionRec {
__DRIextension base;
---- a/src/egl/drivers/dri2/egl_dri2.c
-+++ b/src/egl/drivers/dri2/egl_dri2.c
-@@ -792,6 +792,12 @@ dri2_initialize(_EGLDriver *drv, _EGLDis
- return EGL_TRUE;
- return dri2_initialize_wayland(drv, disp);
+Index: mesa-12.0.2/src/egl/drivers/dri2/egl_dri2.c
+===================================================================
+--- mesa-12.0.2.orig/src/egl/drivers/dri2/egl_dri2.c 2016-09-16
12:11:30.975350268 +1000
++++ mesa-12.0.2/src/egl/drivers/dri2/egl_dri2.c 2016-09-16
13:57:41.750324740 +1000
+@@ -813,6 +813,11 @@
+ ret = dri2_initialize_wayland(drv, disp);
+ break;
#endif
+#ifdef HAVE_MIR_PLATFORM
+ case _EGL_PLATFORM_MIR:
-+ if (disp->Options.TestOnly)
-+ return EGL_TRUE;
-+ return dri2_initialize_mir(drv, disp);
++ ret = dri2_initialize_mir(drv, disp);
++ break;
+#endif
#ifdef HAVE_ANDROID_PLATFORM
case _EGL_PLATFORM_ANDROID:
- if (disp->Options.TestOnly)
-@@ -841,6 +847,13 @@ dri2_terminate(_EGLDriver *drv, _EGLDisp
+ ret = dri2_initialize_android(drv, disp);
+@@ -876,6 +881,13 @@
}
break;
#endif
