Merge lp:~cemil-azizoglu/mir/merge-ubuntu into lp:mir

[Cemil Azizoglu]

Merge the distro branch.

Merge the distro branch.

Coincidentally, this will fix the version string in staging.

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

PASSED: Continuous integration, rev:4081
https://mir-jenkins.ubuntu.com/job/mir-ci/3133/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4205
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4292
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4282
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4282
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4282
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4232
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4232/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4232
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4232/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4232
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4232/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4232
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4232/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4232
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4232/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4232
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4232/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Functional changes (or anything that's not the changelog) should not be coming from downstreams:

=== modified file 'src/client/mir_surface_api.cpp'
124 --- src/client/mir_surface_api.cpp 2017-02-22 14:53:04 +0000
125 +++ src/client/mir_surface_api.cpp 2017-03-10 20:04:17 +0000
126 @@ -453,6 +453,7 @@
127 MIR_LOG_UNCAUGHT_EXCEPTION(ex);
128 }
129
130 +extern "C" __attribute__((alias("mir_window_spec_set_cursor_name"))) void mir_surface_spec_set_cursor_name();
131 void mir_window_spec_set_cursor_name(MirWindowSpec* spec, char const* name)
132 try
133 {

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

I suggest you just do what I do after most releases: copy debian/changelog in, and check the diff is small and sane. That avoids inheriting unwanted changes from downstreams and similarly avoids conflicts with branches.

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

PASSED: Continuous integration, rev:4082
https://mir-jenkins.ubuntu.com/job/mir-ci/3138/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4212
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4299
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4289
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4289
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4289
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4239
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4239/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4239
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4239/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4239
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4239/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4239
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4239/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4239
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4239/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4239
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4239/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2017-02-15 07:38:33 +0000
+++ debian/changelog	2017-03-13 15:26:54 +0000
@@ -1,4 +1,57 @@
-mir (0.26.0-0ubuntu1) UNRELEASED; urgency=medium
+mir (0.26.1+17.04.20170209.1-0ubuntu1) zesty; urgency=medium
+
+  * New upstream release 0.26.1 (https://launchpad.net/mir/+milestone/0.26.1)
+    - ABI summary:
+      . mirclient ABI unchanged at 9
+      . mirserver ABI unchanged at 43
+      . mircommon ABI unchanged at 7
+      . mirplatform ABI bumped to 15
+      . mirprotobuf ABI unchanged at 3
+      . mirplatformgraphics ABI bumped to 12
+      . mirclientplatform ABI unchanged at 5
+      . mirinputplatform ABI unchanged at 6
+      . mircore ABI unchanged at 1
+    - Enhancements:
+      . Support for MirBuffer API that allows for better management of
+        hardware/software buffers.
+      . Support for MirPresentationChain API that allows better control
+        over {de}queueing of individual buffers {from}to the server.
+      . Interim support for MirRenderSurface API that provides a unit of
+        renderable for lower level content such as MirBufferStreams and
+        MirPresentationChains, etc.. MirRenderSurface API is marked
+        deprecated as it (and the relevant entry points) will be renamed to
+        MirSurface before general availability. It will initially be used for
+        revamping support for EGL drivers.
+      . Synchronous version of mir_prompt_session_new_fds_for_prompt_providers()
+        API (mir_prompt_session_new_fds_for_prompt_providers_sync()) added for
+        convenience.
+      . Better name for MirPersistentId-->MirWindowId. MirPersistentId has now
+        been deprecated.
+    - Bugs fixed:
+      . [regression] Unity8 stutters constantly (like half frame rate).
+        (LP: #1661128)
+      . mir 0.26 - spinner loading animation, minimize, maximize too fast.
+        (LP: #1661072)
+      . [regression] Nested server segfaults or rapidly logs exceptions when a
+        fullscreen client starts [in mir_presentation_chain_set_dropping_mode
+        ... std::exception::what: Operation not permitted] (LP: #1661508)
+      . mir_window_request_persistent_id_sync seg faults when called twice.
+        (LP: #1661704)
+      . [regression] Windowed clients of nested servers are all black.
+        (LP: #1661521)
+      . Mir graphics platform ABI broke in series 0.26 but sonames never
+        changed (LP: #1662455)
+      . Fixes for 0.26 changelog.
+      . [regression] mirscreencast hangs during screencast creation. (LP: #1662997)
+      . libmirclient-dev missing build dependency on libmircore-dev. (LP: #1662942)
+      . mir_window_spec_set_cursor_name() doesn't trigger
+        mir::scene::SurfaceObserver::cursor_image_set_to. (LP: #1663197)
+      . [regression] Software clients of nested servers are all black in Mir 0.25.0
+        and later. (LP: #1663062)
+
+ -- Cemil Azizoglu <[e-mail]>  Thu, 09 Feb 2017 21:46:32 +0000
+
+mir (0.26.0+17.04.20170126.3-0ubuntu1) zesty; urgency=medium
 
   * New upstream release 0.26.0 (https://launchpad.net/mir/+milestone/0.26.0)
     - ABI summary:
@@ -12,27 +65,26 @@
       . mirinputplatform ABI unchanged at 6
       . mircore ABI unchanged at 1
     - Enhancements:
-      . New/improved toolkit APIs: MirInputConfig and related functions,
-        MirWindow and related functions, DisplayConfig and related functions,
-        MirScreencastSpec and related functions,
-      . Support for configuring input configuration
-      . Introduce toolkit extension mechanism for platform specific APIs.
-      . Toolkit extensions for: mesa_drm_auth, set_gbm_device and
-        window_coordinate_translation
-      . Screencasting to a specific MirBuffer.
-      . Add DisplayConfigurationController::base_configuration() so downstreams
-        can get the base configuration. (Weirdly they can already set it.).
-      . x11 platform: allow adjustable scale parameter.
-      . Added EDID support: client API, server logging and in mirout.
-      . mirout: Add newer attributes only available in the new display
-        config API: scaling factor, subpixel arrangement and form factor.
-      . mirout: Log the orientation and logical size of each output too.
+      . New and improved client APIs: MirInputConfig, MirWindow, DisplayConfig,
+        MirScreencastSpec.
+      . Support for setting the input configuration.
+      . Introduced an extension mechanism for platform-specific APIs.
+      . Support for screencasting to a specific MirBuffer.
+      . Added DisplayConfigurationController::base_configuration() so
+        downstreams can get the base configuration (weirdly they can already
+        set it).
+      . X11 platform: Allow adjustable scale parameter.
+      . Added monitor EDID support to both the client API and server-side.
+      . mirout: Now shows scaling factor, subpixel arrangement, form factor and
+        EDID.
+      . mirout: Can now change the monitor configuration as well as report it.
       . Replace the mir::Server-overridable Reports with Observers.
-      . Add xkbcommon to mirclient.pc Requires.private.
       . Deprecate legacy toolkit APIs that will be removed in Mir 1.0
-      . Introduced 'client-side vsync', which dramatically reduces latency
-        from the client to the screen (particularly for nested servers like
-        Unity8).
+      . Introduced client-side vsync which dramatically reduces latency
+        from the client to the screen, by up to 44ms.
+      . Removed all input resampling logic. We now expect toolkits to do their
+        own, if at all. This reduces input lag by up to 16.9ms, or 8.4ms on
+        average.
     - Bugs fixed:
       . [performance] Restore support for better-than-triple buffering by
         default. (LP: #1240909)
@@ -121,8 +173,11 @@
       . [regression] Mir cross-compile to vivid/armhf FTBFS with:
         mock_input_device_hub.h:33:18: error: ‘add_observer’ is not a type
         (LP: #1658605)
+      . Caught exception at Mir/EGL driver boundary (in setSwapInterval) in
+        clients and tests (LP: #1659298)
+      . Support display scaling slider in unity8 (LP: #1645372)
 
- -- Daniel van Vugt <[e-mail]>  Mon, 19 Dec 2016 18:46:28 +0800
+ -- Cemil Azizoglu <[e-mail]>  Thu, 26 Jan 2017 23:29:33 +0000
 
 mir (0.25.0+17.04.20161203-0ubuntu1) zesty; urgency=medium