Merge lp:~mir-team/qtmir/mir-0.24-compatibility into lp:qtmir

[Nick Dedekind]

Compatibility with mir-0.24

Compatibility with mir-0.24

[lp:~mir-team/qtmir/mir-0.24-compatibility]

506. By Nick Dedekind on 2016-06-14

version bumps

507. By Nick Dedekind on 2016-06-14

gles

508. By Daniel d'Andrada on 2016-06-14

Update mir version requirement in CMakeLists.txt

509. By Daniel d'Andrada on 2016-06-28

Merge trunk

[ Albert Astals Cid ]
* Add support for compiler sanitizers via ECM
* Compile with -fsanitize=undefined
* Fix leak in ScreensModelTest (LP: #1585502)
* Fix leak in SessionManager test (LP: #1585498)
* Remove unused m_sessions member
* Add missing breaks
* Initialize m_lastX and m_lastY
* Initialize m_sessionId
* Give the locker a name
* Fix memory leak in QtEventFeederTest (LP: #1585503)
* Fix leaks in application_manager_test (LP: #1585501)
[ Daniel d'Andrada ]
* Improve Session debug logging
* MirSurfaceListModel: prepending a surface always causes
  firstChanged() emission
[ Gerry Boland ]
* Release temporary GL context ASAP, fixes QtMir on X11. Add some
  hotpath branching hints (LP: #1588921)
[ Michael Zanetti ]
* Adding ApplicationInfo::surfaceCount property

Unmerged revisions

509. By Daniel d'Andrada on 2016-06-28

Merge trunk

[ Albert Astals Cid ]
* Add support for compiler sanitizers via ECM
* Compile with -fsanitize=undefined
* Fix leak in ScreensModelTest (LP: #1585502)
* Fix leak in SessionManager test (LP: #1585498)
* Remove unused m_sessions member
* Add missing breaks
* Initialize m_lastX and m_lastY
* Initialize m_sessionId
* Give the locker a name
* Fix memory leak in QtEventFeederTest (LP: #1585503)
* Fix leaks in application_manager_test (LP: #1585501)
[ Daniel d'Andrada ]
* Improve Session debug logging
* MirSurfaceListModel: prepending a surface always causes
  firstChanged() emission
[ Gerry Boland ]
* Release temporary GL context ASAP, fixes QtMir on X11. Add some
  hotpath branching hints (LP: #1588921)
[ Michael Zanetti ]
* Adding ApplicationInfo::surfaceCount property

508. By Daniel d'Andrada on 2016-06-14

Update mir version requirement in CMakeLists.txt

507. By Nick Dedekind on 2016-06-14

gles

506. By Nick Dedekind on 2016-06-14

version bumps

505. By Nick Dedekind on 2016-06-10

mir 0.24 compatibility

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-06-14 08:33:42 +0000
+++ CMakeLists.txt	2016-06-28 14:28:03 +0000
@@ -67,8 +67,8 @@
 
 find_package(Threads REQUIRED)
 
-pkg_check_modules(MIRSERVER mirserver>=0.22 REQUIRED)
-pkg_check_modules(MIRCLIENT mirclient>=0.22 REQUIRED)
+pkg_check_modules(MIRSERVER mirserver>=0.24 REQUIRED)
+pkg_check_modules(MIRCLIENT mirclient>=0.24 REQUIRED)
 pkg_check_modules(MIRRENDERERGLDEV mir-renderer-gl-dev>=0.22 REQUIRED)
 
 pkg_check_modules(XKBCOMMON xkbcommon REQUIRED)
 
=== modified file 'debian/control'
--- debian/control	2016-06-03 11:16:30 +0000
+++ debian/control	2016-06-28 14:28:03 +0000
@@ -11,9 +11,9 @@
                libglib2.0-dev,
                libgsettings-qt-dev,
                liblttng-ust-dev,
-               libmirclient-dev (>= 0.22.0),
-               libmircommon-dev (>= 0.22.0),
-               libmirserver-dev (>= 0.22.0),
+               libmirclient-dev (>= 0.24.0),
+               libmircommon-dev (>= 0.24.0),
+               libmirserver-dev (>= 0.24.0),
                libmtdev-dev,
                libprocess-cpp-dev,
                libqt5sensors5-dev,
@@ -26,7 +26,7 @@
                liburl-dispatcher1-dev,
                libxkbcommon-dev,
                libxrender-dev,
-               mir-renderer-gl-dev (>= 0.22.0),
+               mir-renderer-gl-dev (>= 0.24.0),
                pkg-config,
 # lttng-gen-ts needs python3, but doesn't depend on it itself: bug 1359147
                python3:any,
 
=== modified file 'debian/gles-patches/convert-to-gles.patch'
--- debian/gles-patches/convert-to-gles.patch	2016-05-18 20:56:14 +0000
+++ debian/gles-patches/convert-to-gles.patch	2016-06-28 14:28:03 +0000
@@ -1,7 +1,7 @@
-Index: inline-gles-quilt/debian/control
+Index: qtmir-0.24/debian/control
 ===================================================================
---- inline-gles-quilt.orig/debian/control
-+++ inline-gles-quilt/debian/control
+--- qtmir-0.24.orig/debian/control
++++ qtmir-0.24/debian/control
 @@ -1,4 +1,4 @@
 -Source: qtmir
 +Source: qtmir-gles
@@ -9,7 +9,7 @@
  Priority: optional
  Maintainer: Ubuntu Developers <[e-mail]>
 @@ -16,7 +16,13 @@ Build-Depends: cmake,
-                libmirserver-dev (>= 0.19.0),
+                libmirserver-dev (>= 0.24.0),
                 libmtdev-dev,
                 libprocess-cpp-dev,
 +               libqt5gui5-gles,
@@ -21,7 +21,7 @@
 +               libqt5test5,
                 libqtdbusmock1-dev (>= 0.2),
                 libqtdbustest1-dev (>= 0.2),
-                libubuntu-app-launch2-dev,
+                libubuntu-app-launch2-dev (>= 0.9),
 @@ -31,8 +37,8 @@ Build-Depends: cmake,
  # lttng-gen-ts needs python3, but doesn't depend on it itself: bug 1359147
                 python3:any,
@@ -111,10 +111,10 @@
 - QtMir QPA.
 + This variant of the package is for Android-based phones and tablets (built
 + against the OpenGLES variant of qtbase).
-Index: inline-gles-quilt/debian/rules
+Index: qtmir-0.24/debian/rules
 ===================================================================
---- inline-gles-quilt.orig/debian/rules
-+++ inline-gles-quilt/debian/rules
+--- qtmir-0.24.orig/debian/rules
++++ qtmir-0.24/debian/rules
 @@ -3,60 +3,28 @@
  
  export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
=== modified file 'src/platforms/mirserver/screen.cpp'
--- src/platforms/mirserver/screen.cpp	2016-05-06 08:41:15 +0000
+++ src/platforms/mirserver/screen.cpp	2016-06-28 14:28:03 +0000
@@ -215,8 +215,8 @@
     m_type = screen.type;
 
     // Physical screen size
-    m_physicalSize.setWidth(screen.physical_size_mm.width.as_float());
-    m_physicalSize.setHeight(screen.physical_size_mm.height.as_float());
+    m_physicalSize.setWidth(screen.physical_size_mm.width.as_int());
+    m_physicalSize.setHeight(screen.physical_size_mm.height.as_int());
 
     // Screen capabilities
     m_modes = screen.modes;
 
=== modified file 'tests/framework/mock_mir_session.h'
--- tests/framework/mock_mir_session.h	2016-04-21 16:21:22 +0000
+++ tests/framework/mock_mir_session.h	2016-06-28 14:28:03 +0000
@@ -65,11 +65,12 @@
     MOCK_CONST_METHOD1(get_buffer_stream, std::shared_ptr<frontend::BufferStream>(frontend::BufferStreamId));
     MOCK_METHOD1(destroy_buffer_stream, void(frontend::BufferStreamId));
     MOCK_METHOD1(create_buffer_stream, frontend::BufferStreamId(graphics::BufferProperties const&));
-    void configure_streams(Surface&, std::vector<shell::StreamSpecification> const&) override;;
-
+    void configure_streams(Surface&, std::vector<shell::StreamSpecification> const&) override;
     MOCK_METHOD1(send_input_device_change, void(std::vector<std::shared_ptr<mir::input::Device>> const&));
-    //void send_input_device_change(std::vector<std::shared_ptr<input::Device>> const& devices) = 0;
 
+    MOCK_METHOD1(create_buffer, graphics::BufferID(graphics::BufferProperties const&));
+    MOCK_METHOD1(destroy_buffer, void(graphics::BufferID));
+    MOCK_METHOD1(get_buffer, std::shared_ptr<graphics::Buffer>(graphics::BufferID));
 
 private:
     std::string m_sessionName;
 
=== modified file 'tests/mirserver/WindowManager/stub_session.cpp'
--- tests/mirserver/WindowManager/stub_session.cpp	2016-04-21 16:21:22 +0000
+++ tests/mirserver/WindowManager/stub_session.cpp	2016-06-28 14:28:03 +0000
@@ -131,3 +131,17 @@
 void StubSession::send_input_device_change(std::vector<std::shared_ptr<mir::input::Device>> const& /*devices*/)
 {
 }
+
+mir::graphics::BufferID StubSession::create_buffer(const mir::graphics::BufferProperties &)
+{
+    return mir::graphics::BufferID(3);
+}
+
+void StubSession::destroy_buffer(mir::graphics::BufferID)
+{
+}
+
+std::shared_ptr<mir::graphics::Buffer> StubSession::get_buffer(mir::graphics::BufferID)
+{
+    return nullptr;
+}
 
=== modified file 'tests/mirserver/WindowManager/stub_session.h'
--- tests/mirserver/WindowManager/stub_session.h	2016-04-21 16:21:22 +0000
+++ tests/mirserver/WindowManager/stub_session.h	2016-06-28 14:28:03 +0000
@@ -56,6 +56,10 @@
     void configure_streams(mir::scene::Surface& surface, std::vector<mir::shell::StreamSpecification> const& config) override;
 
     void send_input_device_change(std::vector<std::shared_ptr<mir::input::Device>> const& devices) override;
+
+    mir::graphics::BufferID create_buffer(mir::graphics::BufferProperties const&) override;
+    void destroy_buffer(mir::graphics::BufferID) override;
+    std::shared_ptr<mir::graphics::Buffer> get_buffer(mir::graphics::BufferID) override;
 };
 
 #endif //QPAMIRSERVER_STUBSESSION_H