Mir

Merge lp:~kdub/mir/missing-hwc15-case-statements-0.22 into lp:mir/ubuntu

  1. missing-hwc15-case-statements-0.22
  2. Merge into ubuntu
Proposed by Kevin DuBois
Status: Superseded
Proposed branch: lp:~kdub/mir/missing-hwc15-case-statements-0.22
Merge into: lp:mir/ubuntu
Diff against target: 49 lines (+13/-0) (has conflicts)
2 files modified
debian/changelog (+11/-0)
src/platforms/android/server/hal_component_factory.cpp (+2/-0)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~kdub/mir/missing-hwc15-case-statements-0.22
Reviewer Review Type Date Requested Status
Mir development team Pending
Review via email: mp+295109@code.launchpad.net

Commit message

Support branch to unblock PES bringup. Do not land, fixes will go into 0.23.1.

Description of the change

Support branch to unblock PES bringup. Do not land, fixes will go into 0.23.1.

To post a comment you must log in.
lp:~kdub/mir/missing-hwc15-case-statements-0.22 updated
1277. By Kevin DuBois

fix hwc 1.5 construction

Unmerged revisions

1277. By Kevin DuBois

fix hwc 1.5 construction

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-05-16 15:36:50 +0000
3+++ debian/changelog 2016-05-18 17:25:35 +0000
4@@ -1,4 +1,8 @@
5+<<<<<<< TREE
6 mir (0.22.1+16.04.20160516.2-0ubuntu1) xenial; urgency=medium
7+=======
8+mir (0.22.1-0ubuntu2) UNRELEASED; urgency=medium
9+>>>>>>> MERGE-SOURCE
10
11 [ Andreas Pokorny ]
12 * New upstream release 0.22.1 (https://launchpad.net/mir/+milestone/0.22.1)
13@@ -7,10 +11,17 @@
14 - Bugs fixed:
15 . [regression] Cursor stops at phantom edge on M10 and N7 (LP: 1580774)
16
17+<<<<<<< TREE
18 [ CI Train Bot ]
19 * No-change rebuild.
20
21 -- Michał Sawicz <michal.sawicz@canonical.com> Mon, 16 May 2016 15:36:50 +0000
22+=======
23+ [ Kevin DuBois ]
24+ * fix hwc support for 1.5 (fixes LP: 1583086)
25+
26+ -- Kevin DuBois <kevin.dubois@canonical.com> Wed, 18 May 2016 10:35:03 -0400
27+>>>>>>> MERGE-SOURCE
28
29 mir (0.22.0+16.04.20160422.2-0ubuntu1) xenial; urgency=medium
30
31
32=== modified file 'src/platforms/android/server/hal_component_factory.cpp'
33--- src/platforms/android/server/hal_component_factory.cpp 2016-04-21 17:36:10 +0000
34+++ src/platforms/android/server/hal_component_factory.cpp 2016-05-18 17:25:35 +0000
35@@ -117,6 +117,7 @@
36 new mga::LayerList(std::make_shared<mga::IntegerSourceCrop>(), {}, offset));
37 case mga::HwcVersion::hwc13:
38 case mga::HwcVersion::hwc14:
39+ case mga::HwcVersion::hwc15:
40 return std::unique_ptr<mga::LayerList>(
41 new mga::LayerList(std::make_shared<mga::FloatSourceCrop>(), {}, offset));
42 case mga::HwcVersion::unknown:
43@@ -145,6 +146,7 @@
44 case mga::HwcVersion::hwc12:
45 case mga::HwcVersion::hwc13:
46 case mga::HwcVersion::hwc14:
47+ case mga::HwcVersion::hwc15:
48 return std::unique_ptr<mga::DisplayDevice>(
49 new mga::HwcDevice(hwc_wrapper));
50

Subscribers

People subscribed via source and target branches