- new URLs, updated to 1.0.0

- updated gflags,atomic patches
- added c++ patch

diff --git a/mir-atomic.patch b/mir-atomic.patch
index f876c20819570ea9a2e49efdb79dd4abfe693532..f284ebcf76bff452410128e17dfa75fbd035b078 100644 (file)
--- a/mir-atomic.patch
+++ b/mir-atomic.patch
@@ -1,9 +1,9 @@
---- mir-0.29.0/src/server/CMakeLists.txt.orig  2017-12-12 14:02:22.000000000 +0100
-+++ mir-0.29.0/src/server/CMakeLists.txt       2017-12-23 21:24:50.077113522 +0100
-@@ -122,7 +122,6 @@
-   ${GLIB_LDFLAGS} ${GLIB_LIBRARIES}
-   ${UUID_LDFLAGS} ${UUID_LIBRARIES}
-   ${WAYLAND_SERVER_LDFLAGS} ${WAYLAND_SERVER_LIBRARIES}
+--- mir-1.0.0/src/server/CMakeLists.txt.orig   2018-10-15 18:24:02.773523816 +0200
++++ mir-1.0.0/src/server/CMakeLists.txt        2018-10-15 18:39:37.173513149 +0200
+@@ -137,7 +137,6 @@
+   ${XCB_XFIXES_LDFLAGS} ${XCB_XFIXES_LIBRARIES}
+   ${XCB_RENDER_LDFLAGS} ${XCB_RENDER_LIBRARIES}
+   ${X11_XCURSOR_LDFLAGS} ${X11_XCURSOR_LIBRARIES}
 -  atomic
  )
  

diff --git a/mir-c++.patch b/mir-c++.patch
new file mode 100644 (file)
index 0000000..bc51652
--- /dev/null
+++ b/mir-c++.patch
@@ -0,0 +1,22 @@
+--- mir-0.29.0/src/platforms/mesa/server/kms/bypass.h.orig     2017-12-12 14:02:22.000000000 +0100
++++ mir-0.29.0/src/platforms/mesa/server/kms/bypass.h  2018-10-14 08:27:57.821585391 +0200
+@@ -36,7 +36,7 @@
+ private:
+     geometry::Rectangle const view_area;
+     bool bypass_is_feasible;
+-    glm::mat4 const identity;
++    glm::mat4 const identity{};
+ };
+ 
+ } // namespace mesa
+--- mir-0.29.0/src/server/graphics/nested/display_buffer.h.orig        2017-12-12 14:02:22.000000000 +0100
++++ mir-0.29.0/src/server/graphics/nested/display_buffer.h     2018-10-14 09:43:46.708200116 +0200
+@@ -88,7 +88,7 @@
+         stream,
+         chain
+     } content;
+-    glm::mat4 const identity;
++    glm::mat4 const identity{};
+ 
+     std::mutex mutex;
+     typedef std::tuple<MirBuffer*, MirPresentationChain*> SubmissionInfo;

diff --git a/mir-gflags.patch b/mir-gflags.patch
index b161f76172e9574700277c18f801072898ac419d..9fc2c3da0e9d5f9b1057f243150882720476dd44 100644 (file)
--- a/mir-gflags.patch
+++ b/mir-gflags.patch
@@ -1,5 +1,5 @@
---- 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
+--- mir-1.0.0/examples/mir_demo_server/glog_logger.cpp.orig    2015-02-11 04:58:37.000000000 +0100
++++ mir-1.0.0/examples/mir_demo_server/glog_logger.cpp 2015-02-26 19:44:18.608720129 +0100
 @@ -49,7 +49,7 @@
  {
      ~google_gflag_guard_t()

diff --git a/mir-protobuf.patch b/mir-protobuf.patch
index 818d1d0af945243de38244a9139f78b5683d6358..fbcc736accbcd603457fa182c6ce7ad5ee0c5706 100644 (file)
--- a/mir-protobuf.patch
+++ b/mir-protobuf.patch
@@ -1,7 +1,7 @@
-Compatibility with protobuf 3.3.0
+Compatibility with protobuf 3.3.0 .. 3.6.0
 --- mir-0.26.2/src/protobuf/symbols.map.orig   2017-03-27 04:18:32.000000000 +0200
 +++ mir-0.26.2/src/protobuf/symbols.map        2017-05-28 17:50:36.954006085 +0200
-@@ -852,6 +852,23 @@
+@@ -852,6 +852,24 @@
      mir::protobuf::wire::Result::SerializeWithCachedSizes*;
      mir::protobuf::wire::Result::Swap*;
      mir::protobuf::wire::static_descriptor_initializer_mir_5fprotobuf_5fwire_2eproto_*;
@@ -22,6 +22,7 @@ Compatibility with protobuf 3.3.0
 +    mir::protobuf::_SurfaceAspectRatio_default_instance_;
 +    mir::protobuf::_SurfaceId_default_instance_;
 +    mir::protobuf::_SurfaceSpecification_default_instance_;
++    *?google::protobuf::Arena::CreateMaybeMessage*;
      non-virtual?thunk?to?mir::protobuf::BufferAllocation::?BufferAllocation*;
      non-virtual?thunk?to?mir::protobuf::Buffer::?Buffer*;
      non-virtual?thunk?to?mir::protobuf::BufferRelease::?BufferRelease*;

diff --git a/mir.spec b/mir.spec
index 7038280da41d3e7828fc6e798c62b6d387b344d4..a2c70c4147547be9aece5d696bc9edd123c7d646 100644 (file)
--- a/mir.spec
+++ b/mir.spec
@@ -5,18 +5,19 @@
 Summary:       Mir display server and libraries
 Summary(pl.UTF-8):     Serwer wyświetlania Mir oraz biblioteki
 Name:          mir
-Version:       0.29.0
+Version:       1.0.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.29/%{version}/+download/%{name}-%{version}.tar.xz
-# Source0-md5: 65607ccfa6505e3c44c069fb2dda7325
+#Source0Download: https://github.com/MirServer/mir/releases
+Source0:       https://github.com/MirServer/mir/releases/download/v%{version}/%{name}-%{version}.tar.xz
+# Source0-md5: 7199654f2bed5e29da92a65400dea78d
 Patch0:                %{name}-protobuf.patch
 Patch1:                %{name}-gflags.patch
 Patch2:                %{name}-dirs.patch
 Patch3:                %{name}-atomic.patch
-URL:           https://launchpad.net/mir
+Patch4:                %{name}-c++.patch
+URL:           https://mir-server.io/
 BuildRequires: EGL-devel
 BuildRequires: GLM
 BuildRequires: Mesa-libgbm-devel >= 11.0
@@ -110,14 +111,15 @@ Dokumentacja API Mira.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-#patch3 -p1
-#patch4 -p1
+%patch4 -p1
 
 %{__sed} -i -e 's/-Werror //' CMakeLists.txt
 
 %build
 install -d build
 cd build
+# override unsuccessful "detection" by "rpm -q libgtest-dev"
+export GTEST_VERSION="$(gtest-config --version)"
 %cmake .. \
        -DBUILD_DOXYGEN=ON \
        -DMIR_PLATFORM="mesa-kms;mesa-x11;eglstream-kms%{?with_android:;android}" \
@@ -132,12 +134,8 @@ rm -rf $RPM_BUILD_ROOT
 
 # tests
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/mir-smoke-test-runner
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/mir_{acceptance,integration,performance,privileged,unit,umock_acceptance,umock_unit,wlcs}_tests
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/mir_{integration,unit}_tests_mesa*
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/mir_performance_tests
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/mir_stress
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/mir_test_{client_impolite_shutdown,reload_protobuf}
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/mir_unit_tests_{eglstream-kms,nested}
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/mir-test-data
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -161,7 +159,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/mirout
 %attr(755,root,root) %{_bindir}/mirrun
 %attr(756,root,root) %{_bindir}/mirscreencast
-%attr(755,root,root) %{_libdir}/libmiral.so.2
+%attr(755,root,root) %{_libdir}/libmiral.so.3
 %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.7
@@ -169,21 +167,17 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libmircore.so.1
 %attr(755,root,root) %{_libdir}/libmirplatform.so.16
 %attr(755,root,root) %{_libdir}/libmirprotobuf.so.3
-%attr(755,root,root) %{_libdir}/libmirserver.so.46
+%attr(755,root,root) %{_libdir}/libmirserver.so.47
 %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/eglstream.so.5
 %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-eglstream-kms.so.13
-%attr(755,root,root) %{_libdir}/mir/server-platform/graphics-mesa-kms.so.13
-%attr(755,root,root) %{_libdir}/mir/server-platform/graphics-throw.so
+%attr(755,root,root) %{_libdir}/mir/server-platform/graphics-eglstream-kms.so.15
+%attr(755,root,root) %{_libdir}/mir/server-platform/graphics-mesa-kms.so.15
 %attr(755,root,root) %{_libdir}/mir/server-platform/input-evdev.so.7
-%attr(755,root,root) %{_libdir}/mir/server-platform/input-stub.so
-%attr(755,root,root) %{_libdir}/mir/server-platform/server-mesa-x11.so.13
+%attr(755,root,root) %{_libdir}/mir/server-platform/server-mesa-x11.so.15
 %dir %{_libdir}/mir/tools
 %attr(755,root,root) %{_libdir}/mir/tools/libmirclientlttng.so
 %attr(755,root,root) %{_libdir}/mir/tools/libmirserverlttng.so
@@ -227,7 +221,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libmir-test-assist.a
 %{_includedir}/mirtest
 %{py3_sitedir}/mir_perf_framework
-%{py3_sitedir}/mir_perf_framework-0.1-py*.egg-info
+%{py3_sitedir}/mir_perf_framework-%{version}-py*.egg-info
 %{_pkgconfigdir}/mirtest.pc
 %{_datadir}/mir-perf-framework