Mir

Merge lp:~albaguirre/mir/fix-powerpc-build into lp:mir

  1. fix-powerpc-build
  2. Merge into development-branch
Proposed by Alberto Aguirre
Status: Merged
Approved by: Daniel van Vugt
Approved revision: no longer in the source branch.
Merged at revision: 2802
Proposed branch: lp:~albaguirre/mir/fix-powerpc-build
Merge into: lp:mir
Diff against target: 14 lines (+2/-2)
1 file modified
src/platforms/mesa/server/common/shm_buffer.cpp (+2/-2)
To merge this branch: bzr merge lp:~albaguirre/mir/fix-powerpc-build
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+266651@code.launchpad.net

Commit message

Fix powerpc build

Description of the change

Fix powerpc build

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:2802
http://jenkins.qa.ubuntu.com/job/mir-ci/4456/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3376
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/230
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/902
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3324
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/605
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/605/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3324
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3324/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6115
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22266

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/4456/rebuild

review: Approve (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

I expected something like this to happen at some stage. Although this particular change is not the ideal solution. I've documented what we need in common.h regarding pixel formats.

In the mean time, if this works for you then approved.

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/common/shm_buffer.cpp'
2--- src/platforms/mesa/server/common/shm_buffer.cpp 2015-07-23 02:39:20 +0000
3+++ src/platforms/mesa/server/common/shm_buffer.cpp 2015-08-01 23:21:20 +0000
4@@ -45,8 +45,8 @@
5 // TODO: Big endian support
6 GLenum const argb = GL_INVALID_ENUM;
7 GLenum const abgr = GL_INVALID_ENUM;
8- GLenum const rgba = GL_RGBA;
9- GLenum const bgra = GL_BGRA_EXT;
10+ //GLenum const rgba = GL_RGBA;
11+ //GLenum const bgra = GL_BGRA_EXT;
12 #endif
13
14 static const struct

Subscribers

People subscribed via source and target branches