Mir

Merge lp://qastaging/~afrantzis/mir/update-mirplatform-abi into lp://qastaging/mir

  1. update-mirplatform-abi
  2. Merge into development-branch
Proposed by Alexandros Frantzis
Status: Rejected
Rejected by: Alexandros Frantzis
Proposed branch: lp://qastaging/~afrantzis/mir/update-mirplatform-abi
Merge into: lp://qastaging/mir
Prerequisite: lp://qastaging/~afrantzis/mir/buffer-bind-to-render-image
Diff against target: 230 lines (+43/-47)
12 files modified
debian/control (+8/-8)
debian/libmirplatform10.install (+1/-1)
debian/mir-platform-graphics-android5.install (+1/-1)
debian/mir-platform-graphics-mesa-kms5.install (+1/-1)
debian/mir-platform-graphics-mesa-x5.install (+1/-1)
src/CMakeLists.txt (+1/-1)
src/platform/symbols.map (+25/-29)
src/platforms/CMakeLists.txt (+1/-1)
src/platforms/android/server/symbols.map (+1/-1)
src/platforms/mesa/server/kms/symbols.map (+1/-1)
src/platforms/mesa/server/x11/symbols.map (+1/-1)
tests/mir_test_framework/symbols-server.map (+1/-1)
To merge this branch: bzr merge lp://qastaging/~afrantzis/mir/update-mirplatform-abi
Reviewer Review Type Date Requested Status
Alan Griffiths Abstain
Chris Halse Rogers Approve
Daniel van Vugt Needs Information
Kevin DuBois (community) Approve
Cemil Azizoglu (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+268346@code.qastaging.launchpad.net

Commit message

platform: Update mirplatform and platform ABIs

Description of the change

platform: Update mirplatform and platform ABIs

The ABIs were broken by lp:~afrantzis/mir/buffer-bind-to-render-image

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

FAILED: Continuous integration, rev:2853
http://jenkins.qa.ubuntu.com/job/mir-ci/4604/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3568
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/430/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/1102/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3516/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/753
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/753/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3516
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3516/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6291/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22656

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

ok

review: Approve
Revision history for this message
Kevin DuBois (kdub) wrote :

lgtm

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

The prereq branch is slightly contentions. So maybe this proposal should go to Work in Progress...

review: Needs Information
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Upside-down Miss Jane.

-contentions
+contentious

Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Shouldn't the prerequisite be a dependant?

I can certainly imagine wanting to land this but not the prereq. (E.g. a different ABI break comes along.)

review: Needs Information
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

> Shouldn't the prerequisite be a dependant?
>
> I can certainly imagine wanting to land this but not the prereq. (E.g. a different ABI break comes along.)

Correct, although it was not my intention to create a general ABI break MP.

My thinking was that I wanted to land this MP only if we actually broke ABI (i.e. the prereq. landed). I guess whoever needs to break ABI can create a new standalone branch using the last revision of this branch.

Revision history for this message
Chris Halse Rogers (raof) wrote :

Looks good to me.

review: Approve
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

I just figured all ABI breaking MPs should have this as a prereq. That way, if any of them lands, this does too.

review: Abstain
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

> I just figured all ABI breaking MPs should have this as a prereq.
> That way, if any of them lands, this does too.

Since the parent branch was rejected, I have created an independent ABI break branch:

https://code.launchpad.net/~afrantzis/mir/update-mirplatform-abi-standalone/

Unmerged revisions

2853. By Alexandros Frantzis

platform: Update mirplatform and platform ABIs

2852. By Alexandros Frantzis

platform: Change Buffer::gl_bind_to_texture() to the more general Buffer::bind_to_render_image()

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches