Mir

Merge lp:~vanvugt/mir/fix-1626866 into lp:mir

Proposed by Daniel van Vugt on 2016-09-23
Status: Merged
Approved by: Brandon Schaefer on 2016-09-23
Approved revision: 3714
Merged at revision: 3713
Proposed branch: lp:~vanvugt/mir/fix-1626866
Merge into: lp:mir
Diff against target: 41 lines (+5/-2)
3 files modified
include/platform/mir/graphics/gamma_curves.h (+5/-0)
src/platforms/android/server/CMakeLists.txt (+0/-1)
src/platforms/mesa/CMakeLists.txt (+0/-1)
To merge this branch: bzr merge lp:~vanvugt/mir/fix-1626866
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) 2016-09-23 Approve on 2016-09-23
Mir CI Bot continuous-integration Approve on 2016-09-23
Review via email: mp+306585@code.launchpad.net

Commit message

Fix a couple of recent mistakes that are making 'make abi-check' fail
to build:
  * Missing header guard (LP: #1626866)
  * Include paths no longer exist (they moved but seemingly also unused)

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

PASSED: Continuous integration, rev:3714
https://mir-jenkins.ubuntu.com/job/mir-ci/1800/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/2250
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2313
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2304
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2304
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2304
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2278
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2278/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/2278
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2278/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2278
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2278/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2278
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2278/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/2278
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2278/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Brandon Schaefer (brandontschaefer) wrote :

Opps lgtm, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/platform/mir/graphics/gamma_curves.h'
2--- include/platform/mir/graphics/gamma_curves.h 2016-09-19 04:16:15 +0000
3+++ include/platform/mir/graphics/gamma_curves.h 2016-09-23 07:45:46 +0000
4@@ -16,6 +16,9 @@
5 * Authored by: Brandon Schaefer <brandon.schaefer@canonical.com>
6 */
7
8+#ifndef MIR_GRAPHICS_GAMMA_CURVES_H_
9+#define MIR_GRAPHICS_GAMMA_CURVES_H_
10+
11 #include <cstdint>
12 #include <vector>
13
14@@ -40,3 +43,5 @@
15
16 }
17 }
18+
19+#endif
20
21=== modified file 'src/platforms/android/server/CMakeLists.txt'
22--- src/platforms/android/server/CMakeLists.txt 2016-08-16 19:34:28 +0000
23+++ src/platforms/android/server/CMakeLists.txt 2016-09-23 07:45:46 +0000
24@@ -1,6 +1,5 @@
25 include_directories(
26 ${PROJECT_SOURCE_DIR}/src/include/gl
27- ${PROJECT_SOURCE_DIR}/src/include/sw
28 )
29
30 include_directories(
31
32=== modified file 'src/platforms/mesa/CMakeLists.txt'
33--- src/platforms/mesa/CMakeLists.txt 2016-08-02 18:30:00 +0000
34+++ src/platforms/mesa/CMakeLists.txt 2016-09-23 07:45:46 +0000
35@@ -8,7 +8,6 @@
36
37 include_directories(
38 ${CMAKE_SOURCE_DIR}/include/platforms/mesa
39- ${PROJECT_SOURCE_DIR}/src/platforms/common/kms-utils/
40 ${PROJECT_SOURCE_DIR}/src/platforms/mesa/include/
41 )
42

Subscribers

People subscribed via source and target branches