[packages/mir] - up to 0.16.0 (note: new sonames) - updated tests patch
qboosh
qboosh at pld-linux.org
Sat Oct 3 16:13:58 CEST 2015
commit cae1d85bb655e7bf4cda0844cdf48765f3bb577a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Oct 3 16:15:01 2015 +0200
- up to 0.16.0 (note: new sonames)
- updated tests patch
mir-libdrm.patch | 4 +--
mir-tests.patch | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
mir.spec | 56 +++++++++++++++++++++--------
3 files changed, 144 insertions(+), 21 deletions(-)
---
diff --git a/mir.spec b/mir.spec
index a8e8e97..db9935b 100644
--- 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.13.3
+Version: 0.16.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.13/%{version}/+download/%{name}-%{version}.tar.xz
-# Source0-md5: 2b3c11ccfe3bdb454fa8496c6425b8e5
+Source0: https://launchpad.net/mir/0.16/%{version}/+download/%{name}-%{version}.tar.xz
+# Source0-md5: b90f06d1a5058fb122d2e75432daee5b
Patch0: %{name}-werror.patch
Patch1: %{name}-gflags.patch
Patch2: %{name}-tests.patch
@@ -33,9 +33,10 @@ BuildRequires: gtest-devel >= 1.7.0-2
BuildRequires: libdrm-devel
# -std=c++14
BuildRequires: libstdc++-devel >= 6:4.9
+BuildRequires: libuuid-devel
BuildRequires: lttng-ust-devel
BuildRequires: pkgconfig
-BuildRequires: protobuf-devel
+BuildRequires: protobuf-devel >= 2.4.1
BuildRequires: python >= 2
BuildRequires: sed >= 4.0
BuildRequires: tar >= 1:1.22
@@ -70,7 +71,7 @@ Summary: Header files for Mir libraries
Summary(pl.UTF-8): Pliki nagłówkowe bibliotek Mir
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: protobuf-devel
+Requires: protobuf-devel >= 2.4.1
%description devel
Header files for Mir libraries.
@@ -78,6 +79,18 @@ Header files for Mir libraries.
%description devel -l pl.UTF-8
Pliki nagłówkowe bibliotek Mir.
+%package test-devel
+Summary: Development package for Mir tests
+Summary(pl.UTF-8): Pakiet programistyczny dla testów Mira
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+
+%description test-devel
+Development package for Mir tests.
+
+%description test-devel -l pl.UTF-8
+Pakiet programistyczny dla testów Mira.
+
%package apidocs
Summary: Mir API documentation
Summary(pl.UTF-8): Dokumentacja API Mira
@@ -104,19 +117,20 @@ install -d build
cd build
%cmake .. \
-DBUILD_DOXYGEN=ON \
- -DMIR_PLATFORM="mesa%{?with_android:;android}" \
+ -DMIR_PLATFORM="mesa-kms;mesa-x11;%{?with_android:;android}" \
-DMIR_USE_PRECOMPILED_HEADERS=OFF
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} -C build install \
+%{__make} -C build -j1 install \
DESTDIR=$RPM_BUILD_ROOT
# tests
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/mir_{acceptance,integration,performance,unit}_tests
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/mir_{acceptance,integration,performance,privileged,unit}_tests
%{__rm} $RPM_BUILD_ROOT%{_bindir}/mir_stress
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/mir_test_reload_protobuf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -129,23 +143,26 @@ rm -rf $RPM_BUILD_ROOT
%doc README.md
%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}/mirout
%attr(755,root,root) %{_bindir}/mirping
%attr(755,root,root) %{_bindir}/mirscreencast
-%attr(755,root,root) %{_libdir}/libmirclient.so.8
+%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.4
-%attr(755,root,root) %{_libdir}/libmirplatform.so.7
-%attr(755,root,root) %{_libdir}/libmirprotobuf.so.0
-%attr(755,root,root) %{_libdir}/libmirserver.so.31
+%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}/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.2
+%attr(755,root,root) %{_libdir}/mir/client-platform/mesa.so.3
%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.2
+%attr(755,root,root) %{_libdir}/mir/server-platform/graphics-mesa-kms.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
%dir %{_libdir}/mir/tools
%attr(755,root,root) %{_libdir}/mir/tools/libmirclientlttng.so
%attr(755,root,root) %{_libdir}/mir/tools/libmirserverlttng.so
@@ -161,13 +178,22 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/mirclient
%{_includedir}/mircommon
%{_includedir}/mirplatform
+%{_includedir}/mirrenderer
%{_includedir}/mirserver
%{_pkgconfigdir}/mir-client-platform-mesa-dev.pc
+%{_pkgconfigdir}/mir-renderer-gl-dev.pc
%{_pkgconfigdir}/mirclient.pc
%{_pkgconfigdir}/mirclient-debug-extension.pc
%{_pkgconfigdir}/mirplatform.pc
%{_pkgconfigdir}/mirserver.pc
+%files test-devel
+%defattr(644,root,root,755)
+%{_libdir}/libmir-test-assist.a
+%{_includedir}/mirtest
+%{_pkgconfigdir}/mirtest.pc
+%{_datadir}/mir-perf-framework
+
%files apidocs
%defattr(644,root,root,755)
%{_docdir}/mir-doc
diff --git a/mir-libdrm.patch b/mir-libdrm.patch
index 2a3b234..9ae0685 100644
--- a/mir-libdrm.patch
+++ b/mir-libdrm.patch
@@ -1,5 +1,5 @@
---- mir-0.12.1/src/platforms/mesa/server/cursor.cpp.orig 2015-03-27 03:02:23.000000000 +0100
-+++ mir-0.12.1/src/platforms/mesa/server/cursor.cpp 2015-04-22 21:44:29.876555247 +0200
+--- mir-0.16.0/src/platforms/mesa/server/kms/cursor.cpp.orig 2015-03-27 03:02:23.000000000 +0100
++++ mir-0.16.0/src/platforms/mesa/server/kms/cursor.cpp 2015-04-22 21:44:29.876555247 +0200
@@ -25,7 +25,7 @@
#include "mir/graphics/cursor_image.h"
diff --git a/mir-tests.patch b/mir-tests.patch
index 2506da0..326a31c 100644
--- a/mir-tests.patch
+++ b/mir-tests.patch
@@ -1,12 +1,109 @@
---- 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
+--- 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 at octopull.co.uk>
*/
-+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
++#include <gmock/gmock.h>
+
- #include "mir_test_framework/connected_client_headless_server.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 at 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 at 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 at 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 at 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;
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mir.git/commitdiff/cae1d85bb655e7bf4cda0844cdf48765f3bb577a
More information about the pld-cvs-commit
mailing list