Mir

Merge lp:~alan-griffiths/mir/fix-1722147 into lp:mir

Proposed by Alan Griffiths on 2017-10-10
Status: Merged
Approved by: Alan Griffiths on 2017-10-13
Approved revision: no longer in the source branch.
Merged at revision: 4287
Proposed branch: lp:~alan-griffiths/mir/fix-1722147
Merge into: lp:mir
Diff against target: 94 lines (+7/-10)
4 files modified
src/platforms/eglstream-kms/server/display.cpp (+0/-1)
src/platforms/eglstream-kms/server/egl_output.cpp (+1/-1)
src/platforms/mesa/server/kms/cursor.cpp (+0/-1)
tests/unit-tests/platforms/mesa/kms/test_cursor.cpp (+6/-7)
To merge this branch: bzr merge lp:~alan-griffiths/mir/fix-1722147
Reviewer Review Type Date Requested Status
Alberto Aguirre (community) 2017-10-10 Approve on 2017-10-12
Mir CI Bot continuous-integration Approve on 2017-10-10
Review via email: mp+332063@code.launchpad.net

Commit message

Pick up drm.h using package config (LP: #1722147)

To post a comment you must log in.
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:4282
https://mir-jenkins.ubuntu.com/job/mir-ci/3720/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/5105
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5343
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5330
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5330
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5330
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5149
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5149/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5149
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5149/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5149
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5149/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5149
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5149/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5149
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5149/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5149
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5149/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5149
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5149/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5149
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5149/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3720/rebuild

review: Approve (continuous-integration)
lp:~alan-griffiths/mir/fix-1722147 updated on 2017-10-12
4282. By Alan Griffiths on 2017-10-11

Update version to 0.28.

Approved by mir-ci-bot.

4283. By Alberto Aguirre on 2017-10-12

Remove duplicate pkg-config declaration.

Approved by Alan Griffiths, mir-ci-bot.

4284. By Chris Halse Rogers on 2017-10-12

Wayland: Handle keymaps vaguely appropriately.

This will work for the common case of one system-wide keymap and no per-surface keymaps.

It does not handle having multiple keyboards with different keymaps, or per-surface keymaps. This is left as an exercise for the reader.

Approved by Alan Griffiths, mir-ci-bot.

4285. By Alberto Aguirre on 2017-10-12

Remove abi-compliance-checker

Remove unused abi-compliance-checker related code.

Approved by Alan Griffiths, mir-ci-bot.

Alberto Aguirre (albaguirre) wrote :

Yep we want the libdrm header not the kernel drm header

review: Approve
lp:~alan-griffiths/mir/fix-1722147 updated on 2017-10-13
4286. By Alan Griffiths on 2017-10-13

Don't use Mir EGL if it isn't available.

Approved by mir-ci-bot, Alberto Aguirre.

4287. By Alan Griffiths on 2017-10-13

Pick up drm.h using package config (LP: #1722147). Fixes: https://bugs.launchpad.net/bugs/1722147.

Approved by Alberto Aguirre, mir-ci-bot.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/platforms/eglstream-kms/server/display.cpp'
2--- src/platforms/eglstream-kms/server/display.cpp 2017-07-28 17:00:43 +0000
3+++ src/platforms/eglstream-kms/server/display.cpp 2017-10-10 16:10:12 +0000
4@@ -34,7 +34,6 @@
5 #include "mir/renderer/gl/render_target.h"
6 #include "mir/renderer/gl/context.h"
7
8-#include <drm/drm.h>
9 #include <xf86drmMode.h>
10 #include <sys/ioctl.h>
11 #include <system_error>
12
13=== modified file 'src/platforms/eglstream-kms/server/egl_output.cpp'
14--- src/platforms/eglstream-kms/server/egl_output.cpp 2017-07-28 17:00:43 +0000
15+++ src/platforms/eglstream-kms/server/egl_output.cpp 2017-10-10 16:10:12 +0000
16@@ -23,7 +23,7 @@
17 #include "kms-utils/kms_connector.h"
18
19 #include <cstring>
20-#include <drm/drm.h>
21+#include <drm.h>
22 #include <sys/ioctl.h>
23 #include <vector>
24 #include <boost/throw_exception.hpp>
25
26=== modified file 'src/platforms/mesa/server/kms/cursor.cpp'
27--- src/platforms/mesa/server/kms/cursor.cpp 2017-07-31 08:58:34 +0000
28+++ src/platforms/mesa/server/kms/cursor.cpp 2017-10-10 16:10:12 +0000
29@@ -25,7 +25,6 @@
30 #include "mir/graphics/cursor_image.h"
31
32 #include <xf86drm.h>
33-#include <drm/drm.h>
34
35 #include <boost/exception/errinfo_errno.hpp>
36
37
38=== modified file 'tests/unit-tests/platforms/mesa/kms/test_cursor.cpp'
39--- tests/unit-tests/platforms/mesa/kms/test_cursor.cpp 2017-07-31 08:58:34 +0000
40+++ tests/unit-tests/platforms/mesa/kms/test_cursor.cpp 2017-10-10 16:10:12 +0000
41@@ -24,7 +24,6 @@
42 #include "mir/graphics/cursor_image.h"
43
44 #include <xf86drm.h>
45-#include <drm/drm.h>
46
47 #include "mir/test/doubles/mock_gbm.h"
48 #include "mir/test/doubles/mock_drm.h"
49@@ -265,7 +264,7 @@
50 {
51 return geom::Size{geom::Width{64}, geom::Height{64}};
52 }
53- geom::Displacement hotspot() const
54+ geom::Displacement hotspot() const
55 {
56 return geom::Displacement{0, 0};
57 }
58@@ -425,7 +424,7 @@
59 if (pixels[i] != 0x0)
60 return false;
61 }
62- return true;
63+ return true;
64 }
65
66 TEST_F(MesaCursorTest, show_cursor_pads_missing_data)
67@@ -680,7 +679,7 @@
68
69 cursor.hide();
70 cursor.move_to({17, 29});
71-
72+
73 output_container.verify_and_clear_expectations();
74 }
75
76@@ -772,7 +771,7 @@
77 cursor.show(stub_image); // ensures initial_cursor_location
78
79 static geom::Displacement hotspot_displacement{10, 10};
80-
81+
82 static geom::Point const
83 initial_cursor_location = {0, 0},
84 cursor_location_1 = {20, 20},
85@@ -788,8 +787,8 @@
86 return hotspot_displacement;
87 }
88 };
89-
90-
91+
92+
93 EXPECT_CALL(mock_gbm, gbm_bo_write(_, _, _)).Times(AnyNumber());
94 EXPECT_CALL(*output_container.outputs[0], set_cursor(_)).Times(AnyNumber());
95

Subscribers

People subscribed via source and target branches