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

[Daniel van Vugt]

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

[Mir CI Bot (mir-ci-bot)]

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)]

lgtm

review: Approve

=== modified file 'src/platforms/mesa/server/kms/kms_page_flipper.cpp'
--- src/platforms/mesa/server/kms/kms_page_flipper.cpp	2017-04-28 03:49:54 +0000
+++ src/platforms/mesa/server/kms/kms_page_flipper.cpp	2017-05-03 08:07:02 +0000
@@ -26,6 +26,7 @@
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 #include <chrono>
+#include <cstring>
 
 namespace mg = mir::graphics;
 namespace mgm = mir::graphics::mesa;
@@ -89,12 +90,11 @@
 
 mg::Frame mgm::KMSPageFlipper::wait_for_flip(uint32_t crtc_id)
 {
-    static drmEventContext evctx =
-    {
-        DRM_EVENT_CONTEXT_VERSION,  /* .version */
-        0,  /* .vblank_handler */
-        page_flip_handler  /* .page_flip_handler */
-    };
+    drmEventContext evctx;
+    memset(&evctx, 0, sizeof evctx);
+    evctx.version = 2;  // We only support the old v2 page_flip_handler
+    evctx.page_flip_handler = &page_flip_handler;
+
     static std::thread::id const invalid_tid;
 
     {