Merge #462

462: Mir release 0.32.1 r=AlanGriffiths a=Saviq ### Enhancements: - [libmiral] Launcher for internal Wayland clients. (#410) - [miral-shell] Reinstate the "spinner" when starting miral-shell (re-implementing it in Wayland) ### Bugs fixed: - [mesa-kms] Select EGLConfig matching our GBM format. (#435) - [Wayland] Don't send output events that are not supported in the agreed protocol version. (#389) - [Wayland] Ensure resize configuration events are not superseded. (#449) Co-authored-by: Alan Griffiths <alan@octopull.co.uk>
canonical · Jul 13, 2018 · ddc6f85 · ddc6f85
2 parents a1536da + e09dbc2
commit ddc6f85
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 48 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -29,7 +29,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 
 set(MIR_VERSION_MAJOR 0)
 set(MIR_VERSION_MINOR 32)
-set(MIR_VERSION_PATCH 0)
+set(MIR_VERSION_PATCH 1)
 
 add_definitions(-DMIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})
 add_definitions(-DMIR_VERSION_MINOR=${MIR_VERSION_MINOR})

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,31 @@
+mir (0.32.1) UNRELEASED; urgency=medium
+
+  * New upstream release 0.32.1(https://github.com/MirServer/mir/projects/5)
+
+    - ABI summary:
+      . mirclient ABI unchanged at 9
+      . miral ABI unchanged at 3
+      . mirserver ABI unchanged at 47
+      . mircommon ABI unchanged at 7
+      . mirplatform ABI unchanged at 16
+      . mirprotobuf ABI unchanged at 3
+      . mirplatformgraphics ABI unchanged at 15
+      . mirclientplatform ABI unchanged at 5
+      . mirinputplatform ABI unchanged at 7
+      . mircore ABI unchanged at 1
+      . mircookie ABI unchanged at 2
+    - Enhancements:
+      . [libmiral] Launcher for internal Wayland clients. (#410)
+      . [miral-shell] Reinstate the "spinner" when starting miral-shell
+        (re-implementing it in Wayland)
+    - Bugs fixed:
+      . [mesa-kms] Select EGLConfig matching our GBM format. (#435)
+      . [Wayland] Don't send output events that are not supported in the agreed
+        protocol version. (#389)
+      . [Wayland] Ensure resize configuration events are not superseded. (#449)
+
+ -- Alan Griffiths <alan.griffiths@canonical.com>  Tue, 10 Jul 2018 14:39:00 +0100
+
 mir (0.32.0) UNRELEASED; urgency=medium
 
   * New upstream release 0.32.0(https://github.com/MirServer/mir/projects/2)

diff --git a/src/include/server/mir/default_server_configuration.h b/src/include/server/mir/default_server_configuration.h
@@ -448,7 +448,7 @@ class DefaultServerConfiguration : public virtual ServerConfiguration
     CachedPtr<scene::ApplicationNotRespondingDetector> application_not_responding_detector;
     CachedPtr<cookie::Authority> cookie_authority;
     CachedPtr<input::KeyMapper> key_mapper;
-    std::shared_ptr<ConsoleServices> console_services{nullptr};
+    CachedPtr<ConsoleServices> console_services;
 
 private:
     std::shared_ptr<options::Configuration> const configuration_options;

diff --git a/src/server/console/default_configuration.cpp b/src/server/console/default_configuration.cpp
@@ -96,30 +96,13 @@ struct RealPosixProcessOperations : public mir::PosixProcessOperations
 
 std::shared_ptr<mir::ConsoleServices> mir::DefaultServerConfiguration::the_console_services()
 {
-    if (!console_services)
-    {
-        console_services =
-            [this]() -> std::shared_ptr<ConsoleServices>
-            {
-                auto const vt = the_options()->get<int>(options::vt_option_name);
-
-                if (!vt)
-                {
-                    try
-                    {
-                        auto const vt_services = std::make_shared<mir::LogindConsoleServices>(
-                            std::dynamic_pointer_cast<mir::GLibMainLoop>(the_main_loop()));
-                        mir::log_debug("Using logind for session management");
-                        return vt_services;
-                    }
-                    catch (std::exception const& e)
-                    {
-                        mir::log_debug(
-                            "Not using logind for session management: %s",
-                            e.what());
-                    }
-                }
+    return console_services(
+        [this]() -> std::shared_ptr<ConsoleServices>
+        {
+            auto const vt = the_options()->get<int>(options::vt_option_name);
 
+            if (!vt)
+            {
                 try
                 {
                     auto const vt_services = std::make_shared<mir::LogindConsoleServices>(
@@ -131,30 +114,29 @@ std::shared_ptr<mir::ConsoleServices> mir::DefaultServerConfiguration::the_conso
                 {
                     mir::log_debug(
                         "Not using logind for session management: %s",
-                        e.what());
+                        boost::diagnostic_information(e).c_str());
                 }
+            }
 
-                try
-                {
-                    auto const vt_services = std::make_shared<mir::LinuxVirtualTerminal>(
-                        std::make_unique<RealVTFileOperations>(),
-                        std::make_unique<RealPosixProcessOperations>(),
-                        vt,
-                        *the_emergency_cleanup(),
-                        the_display_report());
-                    mir::log_debug("Using Linux VT subsystem for session management");
-                    return vt_services;
-                }
-                catch (std::exception const& e)
-                {
-                    mir::log_debug(
-                        "Not using Linux VT subsystem for session management: %s",
-                        e.what());
-                }
+            try
+            {
+                auto const vt_services = std::make_shared<mir::LinuxVirtualTerminal>(
+                    std::make_unique<RealVTFileOperations>(),
+                    std::make_unique<RealPosixProcessOperations>(),
+                    vt,
+                    *the_emergency_cleanup(),
+                    the_display_report());
+                mir::log_debug("Using Linux VT subsystem for session management");
+                return vt_services;
+            }
+            catch (std::exception const& e)
+            {
+                mir::log_debug(
+                    "Not using Linux VT subsystem for session management: %s",
+                    boost::diagnostic_information(e).c_str());
+            }
 
-                mir::log_debug("No session management supported");
-                return std::make_shared<mir::NullConsoleServices>();
-            }();
-    }
-    return console_services;
+            mir::log_debug("No session management supported");
+            return std::make_shared<mir::NullConsoleServices>();
+        });
 }