[packages/mir] - updated to 0.11.0 - removed obsolete c++ patch - added gflags patch (update gflags namespace from

qboosh qboosh at pld-linux.org
Sun Mar 1 08:19:24 CET 2015 

commit d13b11fcebf4368a214fc5c4a42467bc61001e61
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Mar 1 08:22:38 2015 +0100

    - updated to 0.11.0
    - removed obsolete c++ patch
    - added gflags patch (update gflags namespace from google:: to gflags::)
    - added tests patch (tests build fix)
    - added dirs patch (fix client-platform and server-platform paths with absolute LIBDIR)

 mir-c++.patch    | 10 ---------
 mir-dirs.patch   | 22 +++++++++++++++++++
 mir-gflags.patch | 11 ++++++++++
 mir-tests.patch  | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 mir.spec         | 60 ++++++++++++++++++++++++++++++++++------------------
 5 files changed, 137 insertions(+), 30 deletions(-)
---
diff --git a/mir.spec b/mir.spec
index 6f31324..8707d7a 100644
--- a/mir.spec
+++ b/mir.spec
@@ -1,15 +1,21 @@
+#
+# Conditional build:
+%bcond_with	android		# Android platform support (TODO)
+#
 Summary:	Mir display server and libraries
 Summary(pl.UTF-8):	Serwer wyświetlania Mir oraz biblioteki
 Name:		mir
-Version:	0.1.8
+Version:	0.11.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/trusty/%{version}/+download/%{name}-%{version}.tar.bz2
-# Source0-md5:	bed92c675df5e670188a44307255bfa9
-Patch0:		%{name}-c++.patch
-Patch1:		%{name}-werror.patch
+Source0:	https://launchpad.net/mir/0.11/%{version}/+download/%{name}-%{version}.tar.bz2
+# Source0-md5:	7c689c1e1682d2424567e77161cff471
+Patch0:		%{name}-werror.patch
+Patch1:		%{name}-gflags.patch
+Patch2:		%{name}-tests.patch
+Patch3:		%{name}-dirs.patch
 URL:		https://launchpad.net/mir
 BuildRequires:	EGL-devel
 BuildRequires:	GLM
@@ -19,6 +25,7 @@ BuildRequires:	boost-devel >= 1.48.0
 BuildRequires:	cmake >= 2.8
 BuildRequires:	doxygen >= 1.8.0
 BuildRequires:	gflags-devel
+BuildRequires:	glib2-devel >= 2.0
 BuildRequires:	glog-devel
 BuildRequires:	gmock-devel >= 1.7.0-2
 BuildRequires:	gtest-devel >= 1.7.0-2
@@ -28,6 +35,7 @@ BuildRequires:	lttng-ust-devel
 BuildRequires:	pkgconfig
 BuildRequires:	protobuf-devel
 BuildRequires:	python >= 2
+BuildRequires:	sed >= 4.0
 BuildRequires:	udev-devel
 BuildRequires:	umockdev-devel >= 0.6
 BuildRequires:	xorg-lib-libxkbcommon-devel
@@ -36,7 +44,7 @@ Requires:	Mesa-libgbm >= 9.0.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # __once_call, __once_called non-function symbols from libstdc++
-%define		skip_post_check_so	libmirprotobuf.* libmirserver.*
+%define		skip_post_check_so	libmirclient.so.* libmirclient-debug-extension.so.* libmirprotobuf.* libmirserver.*
 
 %description
 Mir is a next generation display server targeted as a replacement for
@@ -81,12 +89,18 @@ Dokumentacja API Mira.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
+%{__sed} -i -e 's/-Werror //' CMakeLists.txt
 
 %build
 install -d build
 cd build
 %cmake .. \
-	-DBUILD_DOXYGEN=ON
+	-DBUILD_DOXYGEN=ON \
+	-DMIR_PLATFORM="mesa%{?with_android:;android}" \
+	-DMIR_USE_PRECOMPILED_HEADERS=OFF
 %{__make}
 
 %install
@@ -96,7 +110,7 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT
 
 # tests
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/mir_{acceptance,integration,unit}_tests
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/mir_{acceptance,integration,performance,unit}_tests
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/mir_stress
 
 %clean
@@ -109,20 +123,23 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc README.md
 %attr(755,root,root) %{_bindir}/mir_demo_*
+%attr(755,root,root) %{_bindir}/mir_proving_server
 %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.7
-%attr(755,root,root) %{_libdir}/libmirplatform.so
+%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}/libmirprotobuf.so.0
-%attr(755,root,root) %{_libdir}/libmirserver.so.18
+%attr(755,root,root) %{_libdir}/libmirserver.so.29
 %dir %{_libdir}/mir
-%dir %{_libdir}/mir/clientplatform
-%dir %{_libdir}/mir/clientplatform/mesa
-%attr(755,root,root) %{_libdir}/mir/clientplatform/mesa/libmirclientplatform.so
-%dir %{_libdir}/mir/platformgraphics
-%dir %{_libdir}/mir/platformgraphics/mesa
-%attr(755,root,root) %{_libdir}/mir/platformgraphics/mesa/libmirplatformgraphics.so
+%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
+%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
 %dir %{_libdir}/mir/tools
 %attr(755,root,root) %{_libdir}/mir/tools/libmirclientlttng.so
 %attr(755,root,root) %{_libdir}/mir/tools/libmirserverlttng.so
@@ -130,17 +147,20 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %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}/libmirplatform.so
 %attr(755,root,root) %{_libdir}/libmirprotobuf.so
 %attr(755,root,root) %{_libdir}/libmirserver.so
 %{_includedir}/mirclient
 %{_includedir}/mircommon
 %{_includedir}/mirplatform
 %{_includedir}/mirserver
+%{_pkgconfigdir}/mir-client-platform-mesa-dev.pc
 %{_pkgconfigdir}/mirclient.pc
-%{_pkgconfigdir}/mircommon.pc
+%{_pkgconfigdir}/mirclient-debug-extension.pc
+%{_pkgconfigdir}/mirplatform.pc
 %{_pkgconfigdir}/mirserver.pc
-%dir %{_datadir}/mir
-%{_datadir}/mir/protocol
 
 %files apidocs
 %defattr(644,root,root,755)
diff --git a/mir-c++.patch b/mir-c++.patch
deleted file mode 100644
index 88ec32a..0000000
--- a/mir-c++.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mir-0.1.8/src/platform/graphics/mesa/real_kms_output.cpp.orig	2014-04-02 10:54:08.000000000 +0200
-+++ mir-0.1.8/src/platform/graphics/mesa/real_kms_output.cpp	2014-04-21 22:18:03.668345776 +0200
-@@ -22,6 +22,7 @@
- #include <boost/throw_exception.hpp>
- #include <boost/exception/info.hpp>
- 
-+#include <cstring>
- #include <stdexcept>
- #include <vector>
- 
diff --git a/mir-dirs.patch b/mir-dirs.patch
new file mode 100644
index 0000000..62beb03
--- /dev/null
+++ b/mir-dirs.patch
@@ -0,0 +1,22 @@
+--- mir-0.11.0/src/CMakeLists.txt.orig	2015-02-11 04:58:37.000000000 +0100
++++ mir-0.11.0/src/CMakeLists.txt	2015-02-28 10:41:32.306168415 +0100
+@@ -5,7 +5,7 @@
+ # We need MIR_CLIENT_PLATFORM_PATH in both libmirclient and the platform
+ # implementations
+ set(MIR_CLIENT_PLATFORM_PATH
+-  ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/mir/client-platform
++  ${CMAKE_INSTALL_LIBDIR}/mir/client-platform
+ )
+ 
+ # Add the platform implementations before exposing any private APIs
+--- mir-0.11.0/src/platforms/CMakeLists.txt.orig	2015-02-11 04:58:37.000000000 +0100
++++ mir-0.11.0/src/platforms/CMakeLists.txt	2015-02-28 10:59:36.682789576 +0100
+@@ -7,7 +7,7 @@
+ set(MIR_SERVER_GRAPHICS_PLATFORM_VERSION ${MIR_SERVER_GRAPHICS_PLATFORM_VERSION} PARENT_SCOPE)
+ 
+ set(MIR_SERVER_PLATFORM_PATH
+-  ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/mir/server-platform
++  ${CMAKE_INSTALL_LIBDIR}/mir/server-platform
+ )
+ set(MIR_SERVER_PLATFORM_PATH
+   ${MIR_SERVER_PLATFORM_PATH}
diff --git a/mir-gflags.patch b/mir-gflags.patch
new file mode 100644
index 0000000..b161f76
--- /dev/null
+++ b/mir-gflags.patch
@@ -0,0 +1,11 @@
+--- mir-0.11.0/examples/glog_logger.cpp.orig	2015-02-11 04:58:37.000000000 +0100
++++ mir-0.11.0/examples/glog_logger.cpp	2015-02-26 19:44:18.608720129 +0100
+@@ -49,7 +49,7 @@
+ {
+     ~google_gflag_guard_t()
+     {
+-        std::call_once(shutdown_flag_gflags, google::ShutDownCommandLineFlags);
++        std::call_once(shutdown_flag_gflags, gflags::ShutDownCommandLineFlags);
+     }
+ } google_gflag_guard;
+ }
diff --git a/mir-tests.patch b/mir-tests.patch
new file mode 100644
index 0000000..3caae70
--- /dev/null
+++ b/mir-tests.patch
@@ -0,0 +1,64 @@
+--- 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
+@@ -16,6 +16,9 @@
+  * Authored by: Robert Carr <robert.carr at canonical.com>
+  */
+ 
++#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 at 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>
+ 
+ namespace msh = mir::shell;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mir.git/commitdiff/d13b11fcebf4368a214fc5c4a42467bc61001e61

More information about the pld-cvs-commit mailing list