commit 43cf87ad78437f0e2764f5bf3efbe0f37a0f90f0
Author: Jakub Bogusz <[email protected]>
Date: Mon May 29 17:10:20 2017 +0200
- updated to 0.26.2
- updated libdrm patch
- removed obsolete werror patch
- added protobuf patch (adjusts exported symbols to cover protobuf up to
3.3.0)
mir-libdrm.patch | 26 ++++++++++++++++++++++++--
mir-protobuf.patch | 27 +++++++++++++++++++++++++++
mir-werror.patch | 10 ----------
mir.spec | 39 +++++++++++++++++++++++++--------------
4 files changed, 76 insertions(+), 26 deletions(-)
---
diff --git a/mir.spec b/mir.spec
index ae51c12..015354d 100644
--- a/mir.spec
+++ b/mir.spec
@@ -5,14 +5,14 @@
Summary: Mir display server and libraries
Summary(pl.UTF-8): Serwer wyświetlania Mir oraz biblioteki
Name: mir
-Version: 0.21.0
+Version: 0.26.2
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.21/%{version}/+download/%{name}-%{version}.tar.xz
-# Source0-md5: 65e3e05420d59505f486b545b7c77ffc
-Patch0: %{name}-werror.patch
+Source0:
https://launchpad.net/mir/0.26/%{version}/+download/%{name}-%{version}.tar.xz
+# Source0-md5: 3c85ee4798ba6929f568c758fad18192
+Patch0: %{name}-protobuf.patch
Patch1: %{name}-gflags.patch
Patch2: %{name}-dirs.patch
Patch3: %{name}-libdrm.patch
@@ -23,6 +23,7 @@ BuildRequires: GLM
BuildRequires: Mesa-libgbm-devel >= 9.0.0
BuildRequires: OpenGLESv2-devel
BuildRequires: boost-devel >= 1.48.0
+BuildRequires: capnproto-c++-devel
BuildRequires: cmake >= 2.8
BuildRequires: doxygen >= 1.8.0
BuildRequires: gflags-devel
@@ -31,7 +32,7 @@ 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: libepoxy-devel
BuildRequires: libinput-devel >= 1.2
# -std=c++14
BuildRequires: libstdc++-devel >= 6:4.9
@@ -119,7 +120,7 @@ install -d build
cd build
%cmake .. \
-DBUILD_DOXYGEN=ON \
- -DMIR_PLATFORM="mesa-kms;mesa-x11;%{?with_android:;android}" \
+
-DMIR_PLATFORM="mesa-kms;mesa-x11;eglstream-kms%{?with_android:;android}" \
-DMIR_USE_PRECOMPILED_HEADERS=OFF
%{__make}
@@ -131,9 +132,11 @@ rm -rf $RPM_BUILD_ROOT
# tests
%{__rm}
$RPM_BUILD_ROOT%{_bindir}/mir_{acceptance,integration,performance,privileged,unit,umock_acceptance,umock_unit}_tests
+%{__rm}
$RPM_BUILD_ROOT%{_bindir}/mir_{client_startup,compositor,glmark2}_performance_test
%{__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}
$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
@@ -150,27 +153,31 @@ rm -rf $RPM_BUILD_ROOT
%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}/mirrun
%attr(756,root,root) %{_bindir}/mirscreencast
+%attr(755,root,root) %{_bindir}/mirvanity
%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}/libmircommon.so.7
%attr(755,root,root) %{_libdir}/libmircookie.so.2
-%attr(755,root,root) %{_libdir}/libmirplatform.so.11
+%attr(755,root,root) %{_libdir}/libmircore.so.1
+%attr(755,root,root) %{_libdir}/libmirplatform.so.15
%attr(755,root,root) %{_libdir}/libmirprotobuf.so.3
-%attr(755,root,root) %{_libdir}/libmirserver.so.38
+%attr(755,root,root) %{_libdir}/libmirserver.so.43
%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-mesa-kms.so.8
+%attr(755,root,root)
%{_libdir}/mir/server-platform/graphics-eglstream-kms.so.12
+%attr(755,root,root) %{_libdir}/mir/server-platform/graphics-mesa-kms.so.12
%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-evdev.so.6
%attr(755,root,root) %{_libdir}/mir/server-platform/input-stub.so
-%attr(755,root,root) %{_libdir}/mir/server-platform/server-mesa-x11.so.8
+%attr(755,root,root) %{_libdir}/mir/server-platform/server-mesa-x11.so.12
%dir %{_libdir}/mir/tools
%attr(755,root,root) %{_libdir}/mir/tools/libmirclientlttng.so
%attr(755,root,root) %{_libdir}/mir/tools/libmirserverlttng.so
@@ -181,12 +188,14 @@ rm -rf $RPM_BUILD_ROOT
%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}/libmircore.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}/mircore
%{_includedir}/mirplatform
%{_includedir}/mirrenderer
%{_includedir}/mirserver
@@ -195,7 +204,9 @@ rm -rf $RPM_BUILD_ROOT
%{_pkgconfigdir}/mirclient.pc
%{_pkgconfigdir}/mirclient-debug-extension.pc
%{_pkgconfigdir}/mircookie.pc
+%{_pkgconfigdir}/mircore.pc
%{_pkgconfigdir}/mirplatform.pc
+%{_pkgconfigdir}/mirrenderer.pc
%{_pkgconfigdir}/mirserver.pc
%files test-devel
diff --git a/mir-libdrm.patch b/mir-libdrm.patch
index eb7e563..1205bc6 100644
--- a/mir-libdrm.patch
+++ b/mir-libdrm.patch
@@ -9,8 +9,8 @@
#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
+--- mir-0.26.2/tests/unit-tests/platforms/mesa/kms/test_cursor.cpp.orig
2017-03-27 04:18:32.000000000 +0200
++++ mir-0.26.2/tests/unit-tests/platforms/mesa/kms/test_cursor.cpp
2017-05-28 19:15:40.087281140 +0200
@@ -24,7 +24,7 @@
#include "mir/graphics/cursor_image.h"
@@ -20,3 +20,25 @@
#include "mir/test/doubles/mock_gbm.h"
#include "mir/test/doubles/mock_drm.h"
+--- mir-0.26.2/src/platforms/eglstream-kms/server/display.cpp.orig
2017-03-27 04:18:32.000000000 +0200
++++ mir-0.26.2/src/platforms/eglstream-kms/server/display.cpp 2017-05-28
21:15:48.043865508 +0200
+@@ -33,7 +33,7 @@
+ #include "mir/renderer/gl/render_target.h"
+ #include "mir/renderer/gl/context.h"
+
+-#include <drm/drm.h>
++#include <libdrm/drm.h>
+ #include <xf86drmMode.h>
+ #include <sys/ioctl.h>
+ #include <system_error>
+--- mir-0.26.2/src/platforms/eglstream-kms/server/egl_output.cpp.orig
2017-03-27 04:18:32.000000000 +0200
++++ mir-0.26.2/src/platforms/eglstream-kms/server/egl_output.cpp
2017-05-28 21:26:01.860524941 +0200
+@@ -23,7 +23,7 @@
+ #include "kms-utils/kms_connector.h"
+
+ #include <cstring>
+-#include <drm/drm.h>
++#include <libdrm/drm.h>
+ #include <sys/ioctl.h>
+ #include <vector>
+ #include <boost/throw_exception.hpp>
diff --git a/mir-protobuf.patch b/mir-protobuf.patch
new file mode 100644
index 0000000..818d1d0
--- /dev/null
+++ b/mir-protobuf.patch
@@ -0,0 +1,27 @@
+Compatibility with protobuf 3.3.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 @@
+ mir::protobuf::wire::Result::SerializeWithCachedSizes*;
+ mir::protobuf::wire::Result::Swap*;
+
mir::protobuf::wire::static_descriptor_initializer_mir_5fprotobuf_5fwire_2eproto_*;
++ mir::protobuf::_Buffer_default_instance_;
++ mir::protobuf::_BufferRequest_default_instance_;
++ mir::protobuf::_BufferStream_default_instance_;
++ mir::protobuf::_BufferStreamId_default_instance_;
++ mir::protobuf::_Cookie_default_instance_;
++ mir::protobuf::_DisplayConfiguration_default_instance_;
++ mir::protobuf::_LifecycleEvent_default_instance_;
++ mir::protobuf::_ModuleProperties_default_instance_;
++ mir::protobuf::_PersistentSurfaceId_default_instance_;
++ mir::protobuf::_PingEvent_default_instance_;
++ mir::protobuf::_Platform_default_instance_;
++ mir::protobuf::_Rectangle_default_instance_;
++ mir::protobuf::_ScreencastId_default_instance_;
++ mir::protobuf::_StructuredError_default_instance_;
++ mir::protobuf::_SurfaceAspectRatio_default_instance_;
++ mir::protobuf::_SurfaceId_default_instance_;
++ mir::protobuf::_SurfaceSpecification_default_instance_;
+ 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-werror.patch b/mir-werror.patch
deleted file mode 100644
index 5dbd513..0000000
--- a/mir-werror.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mir-0.1.8/examples/scroll.cpp.orig 2014-04-02 10:54:08.000000000 +0200
-+++ mir-0.1.8/examples/scroll.cpp 2014-04-22 16:00:11.983684149 +0200
-@@ -104,6 +104,7 @@
-
- mir_surface_release_sync(surface);
- puts("Surface released");
-+ (void)rc;
- }
-
- int main(int argc, char* argv[])
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mir.git/commitdiff/43cf87ad78437f0e2764f5bf3efbe0f37a0f90f0
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
