Mir

Merge lp:~andreas-pokorny/mir/fix-1414630 into lp:mir

  1. fix-1414630
  2. Merge into development-branch
Proposed by Andreas Pokorny on 2015-01-26
Status: Merged
Approved by: Alexandros Frantzis on 2015-01-26
Approved revision: 2259
Merged at revision: 2259
Proposed branch: lp:~andreas-pokorny/mir/fix-1414630
Merge into: lp:mir
Diff against target: 25 lines (+2/-2)
2 files modified
src/platform/options/default_configuration.cpp (+1/-1)
src/platforms/mesa/server/platform.cpp (+1/-1)
To merge this branch: bzr merge lp:~andreas-pokorny/mir/fix-1414630
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2015-01-26
Alexandros Frantzis (community) Approve on 2015-01-26
Cemil Azizoglu (community) Approve on 2015-01-26
Alan Griffiths 2015-01-26 Approve on 2015-01-26
Review via email: mp+247594@code.launchpad.net

Commit Message

Fix missing symbol in graphics-mesa.so: add_graphics_platform_options. Additionally make mir server load the symbol for the additional platform options using the ABI version string.

Description of the Change

The add_graphics_platform_options entry point for mesa was somehow either renamed to its initial form or got otherwise lost in the recent merge mir loops.

To post a comment you must log in.
Alan Griffiths (alan-griffiths) wrote :

Looks good and works

review: Approve
Cemil Azizoglu (cemil-azizoglu) wrote :

LGTM.

review: Approve
Alexandros Frantzis (afrantzis) wrote :

Tested, works.

review: Approve
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/platform/options/default_configuration.cpp'
2--- src/platform/options/default_configuration.cpp 2015-01-19 06:55:41 +0000
3+++ src/platform/options/default_configuration.cpp 2015-01-26 14:59:29 +0000
4@@ -194,7 +194,7 @@
5 platform_graphics_library = mir::graphics::module_for_device(plugins);
6 }
7
8- auto add_platform_options = platform_graphics_library->load_function<mir::graphics::AddPlatformOptions>("add_graphics_platform_options");
9+ auto add_platform_options = platform_graphics_library->load_function<mir::graphics::AddPlatformOptions>("add_graphics_platform_options", MIR_SERVER_GRAPHICS_PLATFORM_VERSION);
10 add_platform_options(*this->program_options);
11 }
12 catch(...)
13
14=== modified file 'src/platforms/mesa/server/platform.cpp'
15--- src/platforms/mesa/server/platform.cpp 2015-01-23 16:25:00 +0000
16+++ src/platforms/mesa/server/platform.cpp 2015-01-26 14:59:29 +0000
17@@ -186,7 +186,7 @@
18 report, vt, *emergency_cleanup_registry, bypass_option);
19 }
20
21-extern "C" void add_platform_options(boost::program_options::options_description& config)
22+extern "C" void add_graphics_platform_options(boost::program_options::options_description& config)
23 {
24 config.add_options()
25 (vt_option_name,

Subscribers

People subscribed via source and target branches