--- a/src/video/SDL_egl.c	Tue May 06 00:20:34 2014 -0400
+++ b/src/video/SDL_egl.c	Tue May 06 15:08:43 2014 -0700
@@ -77,7 +77,7 @@
     void *retval;
     
     /* eglGetProcAddress is busted on Android http://code.google.com/p/android/issues/detail?id=7681 */
-#if !defined(SDL_VIDEO_DRIVER_ANDROID) 
+#if !defined(SDL_VIDEO_DRIVER_ANDROID) && !defined(SDL_VIDEO_DRIVER_MIR) 
     if (_this->egl_data->eglGetProcAddress) {
         retval = _this->egl_data->eglGetProcAddress(proc);
         if (retval) {

--- a/src/video/mir/SDL_mirwindow.c	Tue May 06 00:20:34 2014 -0400
+++ b/src/video/mir/SDL_mirwindow.c	Tue May 06 15:08:43 2014 -0700
@@ -84,7 +84,8 @@
         .width = window->w,
         .height = window->h,
         .pixel_format = mir_pixel_format_invalid,
-        .buffer_usage = mir_buffer_usage_hardware
+        .buffer_usage = mir_buffer_usage_hardware,
+        .output_id = mir_display_output_id_invalid
     };
 
     MirEventDelegate delegate = {