[packages/mir] - up to 0.29.0 - removed obsolete libdrm,libinput patches - added atomic patch (libatomic is unneces
qboosh
qboosh at pld-linux.org
Sun Dec 24 08:37:30 CET 2017
commit e29477668ccca92b44daaebba0a796e2e39333ac
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Dec 24 08:38:56 2017 +0100
- up to 0.29.0
- removed obsolete libdrm,libinput patches
- added atomic patch (libatomic is unnecessary for PLD supported archs)
mir-atomic.patch | 10 ++++++++++
mir-libdrm.patch | 44 -----------------------------------------
mir-libinput.patch | 18 -----------------
mir.spec | 57 ++++++++++++++++++++++++++++++++++--------------------
4 files changed, 46 insertions(+), 83 deletions(-)
---
diff --git a/mir.spec b/mir.spec
index 015354d..7038280 100644
--- a/mir.spec
+++ b/mir.spec
@@ -5,33 +5,32 @@
Summary: Mir display server and libraries
Summary(pl.UTF-8): Serwer wyświetlania Mir oraz biblioteki
Name: mir
-Version: 0.26.2
+Version: 0.29.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.26/%{version}/+download/%{name}-%{version}.tar.xz
-# Source0-md5: 3c85ee4798ba6929f568c758fad18192
+Source0: https://launchpad.net/mir/0.29/%{version}/+download/%{name}-%{version}.tar.xz
+# Source0-md5: 65607ccfa6505e3c44c069fb2dda7325
Patch0: %{name}-protobuf.patch
Patch1: %{name}-gflags.patch
Patch2: %{name}-dirs.patch
-Patch3: %{name}-libdrm.patch
-Patch4: %{name}-libinput.patch
+Patch3: %{name}-atomic.patch
URL: https://launchpad.net/mir
BuildRequires: EGL-devel
BuildRequires: GLM
-BuildRequires: Mesa-libgbm-devel >= 9.0.0
+BuildRequires: Mesa-libgbm-devel >= 11.0
BuildRequires: OpenGLESv2-devel
BuildRequires: boost-devel >= 1.48.0
BuildRequires: capnproto-c++-devel
-BuildRequires: cmake >= 2.8
+BuildRequires: cmake >= 3.5
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
-BuildRequires: libdrm-devel
+BuildRequires: libdrm-devel >= 2.4.84
BuildRequires: libepoxy-devel
BuildRequires: libinput-devel >= 1.2
# -std=c++14
@@ -40,7 +39,7 @@ BuildRequires: libuuid-devel
BuildRequires: lttng-ust-devel
BuildRequires: pkgconfig
BuildRequires: protobuf-devel >= 2.4.1
-BuildRequires: python >= 2
+BuildRequires: python >= 3
BuildRequires: sed >= 4.0
BuildRequires: tar >= 1:1.22
BuildRequires: udev-devel
@@ -48,7 +47,7 @@ BuildRequires: umockdev-devel >= 0.6
BuildRequires: xorg-lib-libxkbcommon-devel
BuildRequires: xz
# TODO? astyle pdebuild android-ndk android-sdk vera++
-Requires: Mesa-libgbm >= 9.0.0
+Requires: Mesa-libgbm >= 11.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
# __once_call, __once_called non-function symbols from libstdc++
@@ -111,7 +110,8 @@ Dokumentacja API Mira.
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
+#patch3 -p1
+#patch4 -p1
%{__sed} -i -e 's/-Werror //' CMakeLists.txt
@@ -131,8 +131,8 @@ rm -rf $RPM_BUILD_ROOT
DESTDIR=$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-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_stress
%{__rm} $RPM_BUILD_ROOT%{_bindir}/mir_test_{client_impolite_shutdown,reload_protobuf}
@@ -149,21 +149,27 @@ 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}/miral-app
+%attr(755,root,root) %{_bindir}/miral-desktop
+%attr(755,root,root) %{_bindir}/miral-kiosk
+%attr(755,root,root) %{_bindir}/miral-run
+%attr(755,root,root) %{_bindir}/miral-screencast
+%attr(755,root,root) %{_bindir}/miral-shell
+%attr(755,root,root) %{_bindir}/miral-xrun
%attr(755,root,root) %{_bindir}/mirbacklight
%attr(755,root,root) %{_bindir}/mirin
%attr(755,root,root) %{_bindir}/mirout
%attr(755,root,root) %{_bindir}/mirrun
%attr(756,root,root) %{_bindir}/mirscreencast
-%attr(755,root,root) %{_bindir}/mirvanity
+%attr(755,root,root) %{_libdir}/libmiral.so.2
%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
%attr(755,root,root) %{_libdir}/libmircookie.so.2
%attr(755,root,root) %{_libdir}/libmircore.so.1
-%attr(755,root,root) %{_libdir}/libmirplatform.so.15
+%attr(755,root,root) %{_libdir}/libmirplatform.so.16
%attr(755,root,root) %{_libdir}/libmirprotobuf.so.3
-%attr(755,root,root) %{_libdir}/libmirserver.so.43
+%attr(755,root,root) %{_libdir}/libmirserver.so.46
%attr(755,root,root) %{_libdir}/libmir_demo_server_loadable.so
%dir %{_libdir}/mir
%dir %{_libdir}/mir/client-platform
@@ -172,18 +178,21 @@ rm -rf $RPM_BUILD_ROOT
%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.12
-%attr(755,root,root) %{_libdir}/mir/server-platform/graphics-mesa-kms.so.12
+%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/input-evdev.so.6
+%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.12
+%attr(755,root,root) %{_libdir}/mir/server-platform/server-mesa-x11.so.13
%dir %{_libdir}/mir/tools
%attr(755,root,root) %{_libdir}/mir/tools/libmirclientlttng.so
%attr(755,root,root) %{_libdir}/mir/tools/libmirserverlttng.so
+%{_desktopdir}/miral-shell.desktop
+%{_iconsdir}/hicolor/scalable/apps/ubuntu-logo.svg
%files devel
%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libmiral.so
%attr(755,root,root) %{_libdir}/libmirclient.so
%attr(755,root,root) %{_libdir}/libmirclient-debug-extension.so
%attr(755,root,root) %{_libdir}/libmircommon.so
@@ -192,17 +201,21 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libmirplatform.so
%attr(755,root,root) %{_libdir}/libmirprotobuf.so
%attr(755,root,root) %{_libdir}/libmirserver.so
+%{_includedir}/miral
%{_includedir}/mirclient
%{_includedir}/mircommon
%{_includedir}/mircookie
%{_includedir}/mircore
%{_includedir}/mirplatform
+%{_includedir}/mirplatforms
%{_includedir}/mirrenderer
%{_includedir}/mirserver
%{_pkgconfigdir}/mir-client-platform-mesa.pc
%{_pkgconfigdir}/mir-renderer-gl-dev.pc
+%{_pkgconfigdir}/miral.pc
%{_pkgconfigdir}/mirclient.pc
%{_pkgconfigdir}/mirclient-debug-extension.pc
+%{_pkgconfigdir}/mirclientcpp.pc
%{_pkgconfigdir}/mircookie.pc
%{_pkgconfigdir}/mircore.pc
%{_pkgconfigdir}/mirplatform.pc
@@ -213,6 +226,8 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%{_libdir}/libmir-test-assist.a
%{_includedir}/mirtest
+%{py3_sitedir}/mir_perf_framework
+%{py3_sitedir}/mir_perf_framework-0.1-py*.egg-info
%{_pkgconfigdir}/mirtest.pc
%{_datadir}/mir-perf-framework
diff --git a/mir-atomic.patch b/mir-atomic.patch
new file mode 100644
index 0000000..f876c20
--- /dev/null
+++ b/mir-atomic.patch
@@ -0,0 +1,10 @@
+--- 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}
+- atomic
+ )
+
+ target_include_directories(mirshell
diff --git a/mir-libdrm.patch b/mir-libdrm.patch
deleted file mode 100644
index 1205bc6..0000000
--- a/mir-libdrm.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- 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"
-
- #include <xf86drm.h>
--#include <drm/drm.h>
-+#include <libdrm/drm.h>
-
- #include <boost/exception/errinfo_errno.hpp>
-
---- 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"
-
- #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"
---- 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-libinput.patch b/mir-libinput.patch
deleted file mode 100644
index 79c136e..0000000
--- a/mir-libinput.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mir.git/commitdiff/e29477668ccca92b44daaebba0a796e2e39333ac
More information about the pld-cvs-commit
mailing list