Mir

Merge lp:~vanvugt/mir/build-on-artful into lp:mir

Proposed by Daniel van Vugt on 2017-05-03
Status: Merged
Approved by: Gerry Boland on 2017-05-03
Approved revision: 4165
Merged at revision: 4164
Proposed branch: lp:~vanvugt/mir/build-on-artful
Merge into: lp:mir
Diff against target: 29 lines (+6/-6)
1 file modified
src/platforms/mesa/server/kms/kms_page_flipper.cpp (+6/-6)
To merge this branch: bzr merge lp:~vanvugt/mir/build-on-artful
Reviewer Review Type Date Requested Status
Gerry Boland 2017-05-03 Approve on 2017-05-03
Mir CI Bot continuous-integration Approve on 2017-05-03
Review via email: mp+323540@code.launchpad.net

Commit message

Fix build failure on artful (structure changed in libdrm 2.4.80)

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

PASSED: Continuous integration, rev:4165
https://mir-jenkins.ubuntu.com/job/mir-ci/3391/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4596
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4724
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4713
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4713
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4628
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4628/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4628
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4628/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4628
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4628/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/4628
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4628/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4628
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4628/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Gerry Boland (gerboland) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/platforms/mesa/server/kms/kms_page_flipper.cpp'
2--- src/platforms/mesa/server/kms/kms_page_flipper.cpp 2017-04-28 03:49:54 +0000
3+++ src/platforms/mesa/server/kms/kms_page_flipper.cpp 2017-05-03 08:07:02 +0000
4@@ -26,6 +26,7 @@
5 #include <xf86drm.h>
6 #include <xf86drmMode.h>
7 #include <chrono>
8+#include <cstring>
9
10 namespace mg = mir::graphics;
11 namespace mgm = mir::graphics::mesa;
12@@ -89,12 +90,11 @@
13
14 mg::Frame mgm::KMSPageFlipper::wait_for_flip(uint32_t crtc_id)
15 {
16- static drmEventContext evctx =
17- {
18- DRM_EVENT_CONTEXT_VERSION, /* .version */
19- 0, /* .vblank_handler */
20- page_flip_handler /* .page_flip_handler */
21- };
22+ drmEventContext evctx;
23+ memset(&evctx, 0, sizeof evctx);
24+ evctx.version = 2; // We only support the old v2 page_flip_handler
25+ evctx.page_flip_handler = &page_flip_handler;
26+
27 static std::thread::id const invalid_tid;
28
29 {

Subscribers

People subscribed via source and target branches