Merge lp:~alan-griffiths/mir/do-not-requre-miregl into lp:mir

[Alan Griffiths]

Don't use Mir EGL if it isn't available

Don't use Mir EGL if it isn't available

Useful when building Mir on Debian or Fedora

[Alberto Aguirre (albaguirre)]

OK.

review: Approve

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:4282
https://mir-jenkins.ubuntu.com/job/mir-ci/3724/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/5109
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5347
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5334
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5334
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5334
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5153
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5153/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5153
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5153/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5153
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5153/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5153
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5153/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5153
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5153/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5153
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5153/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5153
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5153/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5153
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5153/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3724/rebuild

review: Approve (continuous-integration)

=== modified file 'examples/miral-shell/spinner/eglspinner.cpp'
--- examples/miral-shell/spinner/eglspinner.cpp	2017-08-21 15:58:34 +0000
+++ examples/miral-shell/spinner/eglspinner.cpp	2017-10-11 17:45:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2015 Canonical Ltd.
+ * Copyright © 2013-2017 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify
  * under the terms of the GNU General Public License version 2 or 3 as as
@@ -19,6 +19,14 @@
  *          Kevin DuBois <[e-mail]>
  */
 
+// Ugly way to detect the Mir EGL patch to mesa
+// NB this has to be before any other includes
+#define MIR_EGL_PLATFORM
+#include <EGL/eglplatform.h>
+#ifndef MIR_CLIENT_API_VERSION
+#define MIR_EGL_UNAVAILABLE
+#endif
+
 #include "splash.h"
 
 #include <chrono>
@@ -143,7 +151,7 @@
     //1.) 0.0   - 0.6:   logo fades in fully
     //2.) 0.0   - 6.0:   logo does one full spin 360°
     //3.) 6.0   - 6.833: glow fades in fully, black-background fades out to 50%
-    //4.) 6.833 - 7.666: glow fades out fully, black-background fades out to 0% 
+    //4.) 6.833 - 7.666: glow fades out fully, black-background fades out to 0%
     //5.) 7.666 - 8.266: logo fades out fully
     //8.266..:       now spinner can be closed as all its elements are faded out
 
@@ -221,11 +229,14 @@
     "}                                                    \n";
 
 std::atomic<bool> dying{false};
+
+#ifndef MIR_EGL_UNAVAILABLE
 void lifecycle_event_callback(MirConnection* /*connection*/, MirLifecycleState state, void* context)
 {
     if (state == mir_lifecycle_connection_lost)
         static_cast<decltype(dying)*>(context)->store(true);
 }
+#endif
 }
 
 struct SpinnerSplash::Self
@@ -254,6 +265,7 @@
 void SpinnerSplash::operator()(MirConnection* const connection)
 try
 {
+#ifndef MIR_EGL_UNAVAILABLE
     GLuint prog[2];
     GLuint texture[2];
     GLint vpos[2];
@@ -365,6 +377,9 @@
 
     glDeleteTextures(2, texture);
     g_timer_destroy (timer);
+#else
+    (void)connection;
+#endif
 }
 catch (std::exception const& x)
 {