- up to 0.21.0 (note: some new sonames)

- updated dirs,libdrm patches
- removed obsolete tests patch
- added libinput patch (restore compatibility with upstream libinput 1.2.x)

diff --git a/mir-libdrm.patch b/mir-libdrm.patch
index 9ae068505c93a9d1f1332e17e24ca1473fa155eb..eb7e563ea3bf4f29a523c12025a74e61723871af 100644 (file)
--- a/mir-libdrm.patch
+++ b/mir-libdrm.patch
@@ -9,3 +9,14 @@
  
  #include <boost/exception/errinfo_errno.hpp>
  
+--- mir-0.21.0/tests/unit-tests/graphics/mesa/kms/test_cursor.cpp.orig 2016-04-08 16:03:06.000000000 +0200
++++ mir-0.21.0/tests/unit-tests/graphics/mesa/kms/test_cursor.cpp      2016-04-14 05:45:03.201626883 +0200
+@@ -24,7 +24,7 @@
+ #include "mir/graphics/cursor_image.h"
+ 
+ #include <xf86drm.h>
+-#include <drm/drm.h>
++#include <libdrm/drm.h>
+ 
+ #include "mir/test/doubles/mock_gbm.h"
+ #include "mir/test/doubles/mock_drm.h"

diff --git a/mir-libinput.patch b/mir-libinput.patch
new file mode 100644 (file)
index 0000000..79c136e
--- /dev/null
+++ b/mir-libinput.patch
@@ -0,0 +1,18 @@
+Disable functionality which depends on Ubuntu changes in libinput.
+--- mir-0.21.0/src/platforms/evdev/libinput_device.cpp.orig    2016-04-08 16:03:06.000000000 +0200
++++ mir-0.21.0/src/platforms/evdev/libinput_device.cpp 2016-04-13 21:02:02.006277136 +0200
+@@ -290,11 +290,11 @@
+     uint32_t const height = screen.size.height.as_int();
+ 
+     data.action = action;
+-    data.pressure = libinput_event_touch_get_pressure(touch);
++/*  data.pressure = libinput_event_touch_get_pressure(touch); */
+     data.x = libinput_event_touch_get_x_transformed(touch, width);
+     data.y = libinput_event_touch_get_y_transformed(touch, height);
+-    data.major = libinput_event_touch_get_major_transformed(touch, width, height);
+-    data.minor = libinput_event_touch_get_minor_transformed(touch, width, height);
++/*  data.major = libinput_event_touch_get_major_transformed(touch, width, height);
++    data.minor = libinput_event_touch_get_minor_transformed(touch, width, height); */
+ }
+ 
+ void mie::LibInputDevice::handle_touch_motion(libinput_event_touch* touch)

diff --git a/mir-tests.patch b/mir-tests.patch
deleted file mode 100644 (file)
index 326a31c..0000000
--- a/mir-tests.patch
+++ /dev/null
@@ -1,109 +0,0 @@
---- mir-0.16.0/tests/acceptance-tests/test_surface_morphing.cpp.orig   2015-09-29 07:33:42.000000000 +0200
-+++ mir-0.16.0/tests/acceptance-tests/test_surface_morphing.cpp        2015-09-29 18:49:35.461087424 +0200
-@@ -16,6 +16,9 @@
-  * Authored By: Alan Griffiths <alan@octopull.co.uk>
-  */
- 
-+#include <gtest/gtest.h>
-+#include <gmock/gmock.h>
-+
- #include "mir/scene/null_surface_observer.h"
- #include "mir/scene/surface.h"
- 
---- mir-0.16.0/tests/acceptance-tests/test_surface_specification.cpp.orig      2015-09-29 07:33:42.000000000 +0200
-+++ mir-0.16.0/tests/acceptance-tests/test_surface_specification.cpp   2015-09-29 18:59:49.114395005 +0200
-@@ -16,6 +16,9 @@
-  * Authored By: Alan Griffiths <alan@octopull.co.uk>
-  */
- 
-+#include <gtest/gtest.h>
-+#include <gmock/gmock.h>
-+
- #include "mir/events/event_builders.h"
- #include "mir/scene/null_surface_observer.h"
- #include "mir/scene/surface.h"
---- mir-0.16.0/tests/unit-tests/client/test_connection_resource_map.cpp.orig   2015-09-29 07:33:42.000000000 +0200
-+++ mir-0.16.0/tests/unit-tests/client/test_connection_resource_map.cpp        2015-09-29 20:34:08.974157185 +0200
-@@ -16,10 +16,11 @@
-  * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
-  */
- 
-+#include <gtest/gtest.h>
-+#include <gmock/gmock.h>
- #include "src/client/connection_surface_map.h"
- #include "src/client/mir_surface.h"
- #include "mir/test/doubles/mock_client_buffer_stream.h"
--#include <gtest/gtest.h>
- 
- namespace mf = mir::frontend;
- namespace mcl = mir::client;
---- mir-0.16.0/tests/unit-tests/compositor/test_dropping_schedule.cpp.orig     2015-09-29 07:33:42.000000000 +0200
-+++ mir-0.16.0/tests/unit-tests/compositor/test_dropping_schedule.cpp  2015-09-29 20:59:31.804093576 +0200
-@@ -16,11 +16,12 @@
-  * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
-  */
- 
-+#include <gtest/gtest.h>
-+#include <gmock/gmock.h>
- #include "mir/frontend/client_buffers.h"
- #include "src/server/compositor/dropping_schedule.h"
- #include "mir/test/doubles/stub_buffer.h"
- #include "mir/test/fake_shared.h"
--#include <gtest/gtest.h>
- 
- using namespace testing;
- namespace mtd = mir::test::doubles;
---- mir-0.16.0/tests/unit-tests/compositor/test_queueing_schedule.cpp.orig     2015-09-29 07:33:42.000000000 +0200
-+++ mir-0.16.0/tests/unit-tests/compositor/test_queueing_schedule.cpp  2015-09-29 21:21:12.014039012 +0200
-@@ -16,9 +16,10 @@
-  * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
-  */
- 
-+#include <gtest/gtest.h>
-+#include <gmock/gmock.h>
- #include "src/server/compositor/queueing_schedule.h"
- #include "mir/test/doubles/stub_buffer.h"
--#include <gtest/gtest.h>
- 
- using namespace testing;
- namespace mtd = mir::test::doubles;
---- mir-0.16.0/tests/unit-tests/graphics/test_platform_prober.cpp.orig 2015-09-29 07:33:42.000000000 +0200
-+++ mir-0.16.0/tests/unit-tests/graphics/test_platform_prober.cpp      2015-09-29 21:52:25.397293726 +0200
-@@ -17,6 +17,7 @@
-  */
- 
- #include <gtest/gtest.h>
-+#include <gmock/gmock.h>
- 
- #include "mir/graphics/platform.h"
- #include "mir/graphics/platform_probe.h"
---- mir-0.16.0/tests/unit-tests/input/evdev/test_evdev_device_detection.cpp.orig       2015-09-29 07:33:42.000000000 +0200
-+++ mir-0.16.0/tests/unit-tests/input/evdev/test_evdev_device_detection.cpp    2015-09-30 17:44:16.817626009 +0200
-@@ -22,6 +22,7 @@
- #include "mir_test_framework/udev_environment.h"
- 
- #include <gtest/gtest.h>
-+#include <gmock/gmock.h>
- #include <tuple>
- 
- namespace mtf = mir_test_framework;
---- mir-0.16.0/tests/unit-tests/input/test_input_event.cpp.orig        2015-09-29 07:33:42.000000000 +0200
-+++ mir-0.16.0/tests/unit-tests/input/test_input_event.cpp     2015-09-30 18:04:45.110907797 +0200
-@@ -17,6 +17,7 @@
-  */
- 
- #include <gtest/gtest.h>
-+#include <gmock/gmock.h>
- 
- #include "mir/events/event_private.h"
- #include "mir_toolkit/events/input/input_event.h"
---- mir-0.16.0/tests/unit-tests/dispatch/test_readable_fd.cpp.orig     2015-09-29 07:33:42.000000000 +0200
-+++ mir-0.16.0/tests/unit-tests/dispatch/test_readable_fd.cpp  2015-09-30 19:12:50.107403032 +0200
-@@ -19,6 +19,7 @@
- #include "mir/dispatch/readable_fd.h"
- 
- #include <gtest/gtest.h>
-+#include <gmock/gmock.h>
- 
- namespace md = mir::dispatch;
- 

diff --git a/mir.spec b/mir.spec
index db9935b9067c5192b5bd57c5d7774eeebe3ac057..ae51c12dc309be2fd15abe36a4c9cfed33ac9a02 100644 (file)
--- a/mir.spec
+++ b/mir.spec
@@ -5,18 +5,18 @@
 Summary:       Mir display server and libraries
 Summary(pl.UTF-8):     Serwer wyświetlania Mir oraz biblioteki
 Name:          mir
-Version:       0.16.0
+Version:       0.21.0
 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.16/%{version}/+download/%{name}-%{version}.tar.xz
-# Source0-md5: b90f06d1a5058fb122d2e75432daee5b
+Source0:       https://launchpad.net/mir/0.21/%{version}/+download/%{name}-%{version}.tar.xz
+# Source0-md5: 65e3e05420d59505f486b545b7c77ffc
 Patch0:                %{name}-werror.patch
 Patch1:                %{name}-gflags.patch
-Patch2:                %{name}-tests.patch
-Patch3:                %{name}-dirs.patch
-Patch4:                %{name}-libdrm.patch
+Patch2:                %{name}-dirs.patch
+Patch3:                %{name}-libdrm.patch
+Patch4:                %{name}-libinput.patch
 URL:           https://launchpad.net/mir
 BuildRequires: EGL-devel
 BuildRequires: GLM
@@ -31,6 +31,8 @@ BuildRequires:        glog-devel
 BuildRequires: gmock-devel >= 1.7.0-2
 BuildRequires: gtest-devel >= 1.7.0-2
 BuildRequires: libdrm-devel
+# >1.2.x without libinput patch?
+BuildRequires: libinput-devel >= 1.2
 # -std=c++14
 BuildRequires: libstdc++-devel >= 6:4.9
 BuildRequires: libuuid-devel
@@ -128,9 +130,11 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT
 
 # tests
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/mir_{acceptance,integration,performance,privileged,unit}_tests
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/mir_{acceptance,integration,performance,privileged,unit,umock_acceptance,umock_unit}_tests
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/mir_{integration,unit}_tests_mesa*
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/mir_stress
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/mir_test_reload_protobuf
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/mir-test-data
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -144,25 +148,29 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/mir_demo_*
 %attr(755,root,root) %{_bindir}/mir_proving_server
 %attr(755,root,root) %{_bindir}/mirbacklight
+%attr(755,root,root) %{_bindir}/mirin
 %attr(755,root,root) %{_bindir}/mirout
 %attr(755,root,root) %{_bindir}/mirping
-%attr(755,root,root) %{_bindir}/mirscreencast
+%attr(756,root,root) %{_bindir}/mirscreencast
 %attr(755,root,root) %{_libdir}/libmirclient.so.9
 %attr(755,root,root) %{_libdir}/libmirclient-debug-extension.so.1
 %attr(755,root,root) %{_libdir}/libmircommon.so.5
-%attr(755,root,root) %{_libdir}/libmirplatform.so.10
-%attr(755,root,root) %{_libdir}/libmirprotobuf.so.2
-%attr(755,root,root) %{_libdir}/libmirserver.so.34
+%attr(755,root,root) %{_libdir}/libmircookie.so.2
+%attr(755,root,root) %{_libdir}/libmirplatform.so.11
+%attr(755,root,root) %{_libdir}/libmirprotobuf.so.3
+%attr(755,root,root) %{_libdir}/libmirserver.so.38
 %attr(755,root,root) %{_libdir}/libmir_demo_server_loadable.so
 %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.3
+%attr(755,root,root) %{_libdir}/mir/client-platform/mesa.so.5
 %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-kms.so.5
+%attr(755,root,root) %{_libdir}/mir/server-platform/graphics-mesa-kms.so.8
+%attr(755,root,root) %{_libdir}/mir/server-platform/graphics-throw.so
+%attr(755,root,root) %{_libdir}/mir/server-platform/input-evdev.so.5
 %attr(755,root,root) %{_libdir}/mir/server-platform/input-stub.so
-%attr(755,root,root) %{_libdir}/mir/server-platform/server-mesa-x11.so.5
+%attr(755,root,root) %{_libdir}/mir/server-platform/server-mesa-x11.so.8
 %dir %{_libdir}/mir/tools
 %attr(755,root,root) %{_libdir}/mir/tools/libmirclientlttng.so
 %attr(755,root,root) %{_libdir}/mir/tools/libmirserverlttng.so
@@ -172,18 +180,21 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libmirclient.so
 %attr(755,root,root) %{_libdir}/libmirclient-debug-extension.so
 %attr(755,root,root) %{_libdir}/libmircommon.so
+%attr(755,root,root) %{_libdir}/libmircookie.so
 %attr(755,root,root) %{_libdir}/libmirplatform.so
 %attr(755,root,root) %{_libdir}/libmirprotobuf.so
 %attr(755,root,root) %{_libdir}/libmirserver.so
 %{_includedir}/mirclient
 %{_includedir}/mircommon
+%{_includedir}/mircookie
 %{_includedir}/mirplatform
 %{_includedir}/mirrenderer
 %{_includedir}/mirserver
-%{_pkgconfigdir}/mir-client-platform-mesa-dev.pc
+%{_pkgconfigdir}/mir-client-platform-mesa.pc
 %{_pkgconfigdir}/mir-renderer-gl-dev.pc
 %{_pkgconfigdir}/mirclient.pc
 %{_pkgconfigdir}/mirclient-debug-extension.pc
+%{_pkgconfigdir}/mircookie.pc
 %{_pkgconfigdir}/mirplatform.pc
 %{_pkgconfigdir}/mirserver.pc