Mir

Merge lp:~mir-team/mir/fix-1662455 into lp:mir

  1. fix-1662455
  2. Merge into development-branch
Proposed by Daniel van Vugt
Status: Merged
Approved by: Daniel van Vugt
Approved revision: no longer in the source branch.
Merged at revision: 4017
Proposed branch: lp:~mir-team/mir/fix-1662455
Merge into: lp:mir
Diff against target: 134 lines (+18/-16)
8 files modified
debian/control (+10/-8)
debian/libmirplatform15.install (+1/-1)
debian/mir-platform-graphics-android12.install (+1/-1)
debian/mir-platform-graphics-mesa-kms12.install (+1/-1)
debian/mir-platform-graphics-mesa-x12.install (+1/-1)
src/CMakeLists.txt (+1/-1)
src/platform/symbols.map (+1/-1)
src/platforms/CMakeLists.txt (+2/-2)
To merge this branch: bzr merge lp:~mir-team/mir/fix-1662455
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
Mir CI Bot continuous-integration Approve
Review via email: mp+316534@code.launchpad.net

Commit message

Bump some ABIs we broke in series 0.26 but forgot to bump.
(LP: #1662455)

To post a comment you must log in.
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Possibly still needs fixing:
 set(MIR_SERVER_GRAPHICS_PLATFORM_STANZA_VERSION 0.25)

Whether that changes to 0.26 or 1.0 depends on whether the same fix ever lands in lp:mir/0.26

Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:4017
https://mir-jenkins.ubuntu.com/job/mir-ci/2948/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/3906
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3992
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3982
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3982
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/3982
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/3933
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/3933/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/3933
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3933/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3933
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3933/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3933
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3933/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/3933
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3933/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/3933
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3933/artifact/output/*zip*/output.zip

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

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

OK, given we're in a hurry and want this in Mir 0.26.1 (which also affects the correctness of this change), I'll just land it.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2017-02-01 14:56:28 +0000
3+++ debian/control 2017-02-08 03:26:31 +0000
4@@ -83,7 +83,7 @@
5 .
6 Contains the shared library needed by server applications for Mir.
7
8-Package: libmirplatform14
9+Package: libmirplatform15
10 Section: libs
11 Architecture: linux-any
12 Multi-Arch: same
13@@ -132,7 +132,7 @@
14 Architecture: linux-any
15 Multi-Arch: same
16 Pre-Depends: ${misc:Pre-Depends}
17-Depends: libmirplatform14 (= ${binary:Version}),
18+Depends: libmirplatform15 (= ${binary:Version}),
19 libmircommon-dev,
20 libboost-program-options-dev,
21 ${misc:Depends},
22@@ -334,7 +334,9 @@
23 Contains the shared libraries required for the Mir server and client.
24
25 # Longer-term these drivers should move out-of-tree
26-Package: mir-platform-graphics-mesa-x11
27+# Yes, this really should be x12. An unfortunate side-effect of our package
28+# naming scheme...
29+Package: mir-platform-graphics-mesa-x12
30 Section: libs
31 Architecture: linux-any
32 Multi-Arch: same
33@@ -348,7 +350,7 @@
34 Contains the shared libraries required for the Mir server to interact with
35 the X11 platform using the Mesa drivers.
36
37-Package: mir-platform-graphics-mesa-kms11
38+Package: mir-platform-graphics-mesa-kms12
39 Section: libs
40 Architecture: linux-any
41 Multi-Arch: same
42@@ -362,7 +364,7 @@
43 Contains the shared libraries required for the Mir server to interact with
44 the hardware platform using the Mesa drivers.
45
46-Package: mir-platform-graphics-android11
47+Package: mir-platform-graphics-android12
48 Section: libs
49 Architecture: i386 amd64 armhf arm64
50 Multi-Arch: same
51@@ -438,8 +440,8 @@
52 Multi-Arch: same
53 Pre-Depends: ${misc:Pre-Depends}
54 Depends: ${misc:Depends},
55- mir-platform-graphics-mesa-kms11,
56- mir-platform-graphics-mesa-x11,
57+ mir-platform-graphics-mesa-kms12,
58+ mir-platform-graphics-mesa-x12,
59 mir-client-platform-mesa5,
60 mir-platform-input-evdev7,
61 Description: Display server for Ubuntu - desktop driver metapackage
62@@ -455,7 +457,7 @@
63 Multi-Arch: same
64 Pre-Depends: ${misc:Pre-Depends}
65 Depends: ${misc:Depends},
66- mir-platform-graphics-android11,
67+ mir-platform-graphics-android12,
68 mir-client-platform-android5,
69 mir-platform-input-evdev7,
70 Description: Display server for Ubuntu - android driver metapackage
71
72=== renamed file 'debian/libmirplatform14.install' => 'debian/libmirplatform15.install'
73--- debian/libmirplatform14.install 2017-01-18 02:29:37 +0000
74+++ debian/libmirplatform15.install 2017-02-08 03:26:31 +0000
75@@ -1,1 +1,1 @@
76-usr/lib/*/libmirplatform.so.14
77+usr/lib/*/libmirplatform.so.15
78
79=== renamed file 'debian/mir-platform-graphics-android11.install' => 'debian/mir-platform-graphics-android12.install'
80--- debian/mir-platform-graphics-android11.install 2017-01-18 02:29:37 +0000
81+++ debian/mir-platform-graphics-android12.install 2017-02-08 03:26:31 +0000
82@@ -1,1 +1,1 @@
83-usr/lib/*/mir/server-platform/graphics-android.so.11
84+usr/lib/*/mir/server-platform/graphics-android.so.12
85
86=== renamed file 'debian/mir-platform-graphics-mesa-kms11.install' => 'debian/mir-platform-graphics-mesa-kms12.install'
87--- debian/mir-platform-graphics-mesa-kms11.install 2017-01-18 02:29:37 +0000
88+++ debian/mir-platform-graphics-mesa-kms12.install 2017-02-08 03:26:31 +0000
89@@ -1,1 +1,1 @@
90-usr/lib/*/mir/server-platform/graphics-mesa-kms.so.11
91+usr/lib/*/mir/server-platform/graphics-mesa-kms.so.12
92
93=== renamed file 'debian/mir-platform-graphics-mesa-x11.install' => 'debian/mir-platform-graphics-mesa-x12.install'
94--- debian/mir-platform-graphics-mesa-x11.install 2017-01-18 02:29:37 +0000
95+++ debian/mir-platform-graphics-mesa-x12.install 2017-02-08 03:26:31 +0000
96@@ -1,1 +1,1 @@
97-usr/lib/*/mir/server-platform/server-mesa-x11.so.11
98+usr/lib/*/mir/server-platform/server-mesa-x11.so.12
99
100=== modified file 'src/CMakeLists.txt'
101--- src/CMakeLists.txt 2017-01-18 02:29:37 +0000
102+++ src/CMakeLists.txt 2017-02-08 03:26:31 +0000
103@@ -1,5 +1,5 @@
104 # We need MIRPLATFORM_ABI in both libmirplatform and the platform implementations.
105-set(MIRPLATFORM_ABI 14)
106+set(MIRPLATFORM_ABI 15)
107
108 # Add the cookie implementation before exposing any APIs
109 add_subdirectory(cookie/)
110
111=== modified file 'src/platform/symbols.map'
112--- src/platform/symbols.map 2017-01-18 02:29:37 +0000
113+++ src/platform/symbols.map 2017-02-08 03:26:31 +0000
114@@ -1,4 +1,4 @@
115-MIRPLATFORM_0.25 {
116+MIRPLATFORM_0.26 {
117 global:
118 extern "C++" {
119 # The following symbols come from running a script over the generated docs. Vis:
120
121=== modified file 'src/platforms/CMakeLists.txt'
122--- src/platforms/CMakeLists.txt 2017-01-20 17:45:08 +0000
123+++ src/platforms/CMakeLists.txt 2017-02-08 03:26:31 +0000
124@@ -8,8 +8,8 @@
125 set(MIR_SERVER_INPUT_PLATFORM_ABI ${MIR_SERVER_INPUT_PLATFORM_ABI} PARENT_SCOPE)
126 set(MIR_SERVER_INPUT_PLATFORM_VERSION "MIR_INPUT_PLATFORM_${MIR_SERVER_INPUT_PLATFORM_STANZA_VERSION}")
127 set(MIR_SERVER_INPUT_PLATFORM_VERSION ${MIR_SERVER_INPUT_PLATFORM_VERSION} PARENT_SCOPE)
128-set(MIR_SERVER_GRAPHICS_PLATFORM_ABI 11)
129-set(MIR_SERVER_GRAPHICS_PLATFORM_STANZA_VERSION 0.25)
130+set(MIR_SERVER_GRAPHICS_PLATFORM_ABI 12)
131+set(MIR_SERVER_GRAPHICS_PLATFORM_STANZA_VERSION 0.26)
132 set(MIR_SERVER_GRAPHICS_PLATFORM_ABI ${MIR_SERVER_GRAPHICS_PLATFORM_ABI} PARENT_SCOPE)
133 set(MIR_SERVER_GRAPHICS_PLATFORM_VERSION "MIR_GRAPHICS_PLATFORM_${MIR_SERVER_GRAPHICS_PLATFORM_STANZA_VERSION}")
134 set(MIR_SERVER_GRAPHICS_PLATFORM_VERSION ${MIR_SERVER_GRAPHICS_PLATFORM_VERSION} PARENT_SCOPE)

Subscribers

People subscribed via source and target branches