- up to 0.13.3

- updated tests patch

diff --git a/mir-tests.patch b/mir-tests.patch
index 3caae705aad9b245bad00957a0779b75e0757d62..2506da06e0d5ae2e95d17e8074b58d1dbd3f2138 100644 (file)
--- a/mir-tests.patch
+++ b/mir-tests.patch
@@ -1,64 +1,12 @@
---- mir-0.11.0/tests/unit-tests/client/test_client_buffer_stream.cpp.orig      2015-02-11 04:58:37.000000000 +0100
-+++ mir-0.11.0/tests/unit-tests/client/test_client_buffer_stream.cpp   2015-02-27 21:44:14.108125632 +0100
+--- mir-0.13.3/tests/acceptance-tests/test_surface_placement.cpp.orig  2015-06-22 07:30:08.000000000 +0200
++++ mir-0.13.3/tests/acceptance-tests/test_surface_placement.cpp       2015-06-27 16:22:34.473352934 +0200
 @@ -16,6 +16,9 @@
-  * Authored by: Robert Carr <robert.carr@canonical.com>
+  * Authored By: Alan Griffiths <alan@octopull.co.uk>
   */
  
-+#include <gtest/gtest.h>
 +#include <gmock/gmock.h>
-+
- #include "src/client/buffer_stream.h"
- 
- #include "mir/egl_native_window_factory.h"
-@@ -28,9 +31,6 @@
- 
- #include <mir_toolkit/mir_client_library.h>
- 
--#include <gtest/gtest.h>
--#include <gmock/gmock.h>
--
- #include <atomic>
- 
- namespace mp = mir::protobuf;
---- mir-0.11.0/tests/unit-tests/client/test_mir_screencast.cpp.orig    2015-02-11 04:58:37.000000000 +0100
-+++ mir-0.11.0/tests/unit-tests/client/test_mir_screencast.cpp 2015-02-27 21:32:31.644821778 +0100
-@@ -16,6 +16,9 @@
-  * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>
-  */
- 
 +#include <gtest/gtest.h>
-+#include <gmock/gmock.h>
 +
- #include "src/client/mir_screencast.h"
- 
- #include "mir/client_buffer_factory.h"
-@@ -27,9 +30,6 @@
- #include "mir_test_doubles/null_client_buffer.h"
- #include "mir_test/fake_shared.h"
- 
--#include <gtest/gtest.h>
--#include <gmock/gmock.h>
--
- #include <thread>
- 
- namespace mcl = mir::client;
---- mir-0.11.0/tests/unit-tests/frontend/test_protobuf_message_processor.cpp.orig      2015-02-11 04:58:37.000000000 +0100
-+++ mir-0.11.0/tests/unit-tests/frontend/test_protobuf_message_processor.cpp   2015-02-27 23:00:52.531265987 +0100
-@@ -22,6 +22,7 @@
- #include "src/server/frontend/protobuf_message_processor.h"
- #include "mir_test/fake_shared.h"
- #include "mir_protobuf_wire.pb.h"
-+#include <gmock/gmock.h>
- #include <gtest/gtest.h>
- 
- namespace mf = mir::frontend;
---- mir-0.11.0/tests/unit-tests/shell/test_graphics_display_layout.cpp.orig    2015-02-11 04:58:37.000000000 +0100
-+++ mir-0.11.0/tests/unit-tests/shell/test_graphics_display_layout.cpp 2015-02-27 23:02:39.227928178 +0100
-@@ -23,6 +23,7 @@
- #include <vector>
- #include <tuple>
- 
-+#include <gmock/gmock.h>
- #include <gtest/gtest.h>
+ #include "mir_test_framework/connected_client_headless_server.h"
  
- namespace msh = mir::shell;
+ #include "mir/events/event_builders.h"

diff --git a/mir.spec b/mir.spec
index 3d79df74be7eed4a4534c34f40261ca39cd6fcc8..a8e8e971f2f7f5a4ae8bd3318a77aa6ecc22e5a8 100644 (file)
--- a/mir.spec
+++ b/mir.spec
@@ -5,13 +5,13 @@
 Summary:       Mir display server and libraries
 Summary(pl.UTF-8):     Serwer wyświetlania Mir oraz biblioteki
 Name:          mir
-Version:       0.12.1
+Version:       0.13.3
 Release:       0.1
 License:       LGPL v3 (libraries), GPL v3 (server and examples)
 Group:         Libraries
 #Source0Download: https://launchpad.net/mir/+download
-Source0:       https://launchpad.net/mir/0.12/%{version}/+download/%{name}-%{version}.tar.bz2
-# Source0-md5: 72d1f6013ecf1981c7eb023a5facbf44
+Source0:       https://launchpad.net/mir/0.13/%{version}/+download/%{name}-%{version}.tar.xz
+# Source0-md5: 2b3c11ccfe3bdb454fa8496c6425b8e5
 Patch0:                %{name}-werror.patch
 Patch1:                %{name}-gflags.patch
 Patch2:                %{name}-tests.patch
@@ -31,15 +31,18 @@ BuildRequires:      glog-devel
 BuildRequires: gmock-devel >= 1.7.0-2
 BuildRequires: gtest-devel >= 1.7.0-2
 BuildRequires: libdrm-devel
-BuildRequires: libstdc++-devel
+# -std=c++14
+BuildRequires: libstdc++-devel >= 6:4.9
 BuildRequires: lttng-ust-devel
 BuildRequires: pkgconfig
 BuildRequires: protobuf-devel
 BuildRequires: python >= 2
 BuildRequires: sed >= 4.0
+BuildRequires: tar >= 1:1.22
 BuildRequires: udev-devel
 BuildRequires: umockdev-devel >= 0.6
 BuildRequires: xorg-lib-libxkbcommon-devel
+BuildRequires: xz
 # TODO? astyle pdebuild android-ndk android-sdk vera++
 Requires:      Mesa-libgbm >= 9.0.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -131,17 +134,18 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/mirscreencast
 %attr(755,root,root) %{_libdir}/libmirclient.so.8
 %attr(755,root,root) %{_libdir}/libmirclient-debug-extension.so.1
-%attr(755,root,root) %{_libdir}/libmircommon.so.3
-%attr(755,root,root) %{_libdir}/libmirplatform.so.6
+%attr(755,root,root) %{_libdir}/libmircommon.so.4
+%attr(755,root,root) %{_libdir}/libmirplatform.so.7
 %attr(755,root,root) %{_libdir}/libmirprotobuf.so.0
-%attr(755,root,root) %{_libdir}/libmirserver.so.30
+%attr(755,root,root) %{_libdir}/libmirserver.so.31
 %dir %{_libdir}/mir
 %dir %{_libdir}/mir/client-platform
 %attr(755,root,root) %{_libdir}/mir/client-platform/dummy.so
 %attr(755,root,root) %{_libdir}/mir/client-platform/mesa.so.2
 %dir %{_libdir}/mir/server-platform
 %attr(755,root,root) %{_libdir}/mir/server-platform/graphics-dummy.so
-%attr(755,root,root) %{_libdir}/mir/server-platform/graphics-mesa.so.1
+%attr(755,root,root) %{_libdir}/mir/server-platform/graphics-mesa.so.2
+%attr(755,root,root) %{_libdir}/mir/server-platform/input-stub.so
 %dir %{_libdir}/mir/tools
 %attr(755,root,root) %{_libdir}/mir/tools/libmirclientlttng.so
 %attr(755,root,root) %{_libdir}/mir/tools/libmirserverlttng.so