1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252 | === modified file 'debian/control'
--- debian/control 2015-06-04 00:40:23 +0000
+++ debian/control 2015-06-04 02:07:25 +0000
@@ -47,7 +47,7 @@
Package: libmirprotobuf0
Section: libs
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
@@ -63,7 +63,7 @@
# ala pkg-xorg's xviddriver:Provides and ABI detection.
Package: libmirserver32
Section: libs
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
@@ -76,7 +76,7 @@
Package: libmirplatform7
Section: libs
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
@@ -90,7 +90,7 @@
Package: libmircommon-dev
Section: libdevel
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: libmircommon5 (= ${binary:Version}),
@@ -107,7 +107,7 @@
Package: libmirplatform-dev
Section: libdevel
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: libmirplatform7 (= ${binary:Version}),
@@ -124,7 +124,7 @@
Package: libmirserver-dev
Section: libdevel
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: libmirserver32 (= ${binary:Version}),
@@ -140,7 +140,7 @@
Package: libmirclient9
Section: libs
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
@@ -153,7 +153,7 @@
Package: libmirclient-dev
Section: libdevel
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: libmirclient9 (= ${binary:Version}),
@@ -168,7 +168,7 @@
Package: libmirclient-debug-extension1
Section: libs
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
@@ -189,7 +189,7 @@
Package: libmirclient-debug-extension-dev
Section: libdevel
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: libmirclient-debug-extension1 (= ${binary:Version}),
@@ -213,7 +213,7 @@
the debug extensions.
Package: mir-demos
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
Depends: ${misc:Depends},
${shlibs:Depends},
Recommends: fonts-liberation
@@ -224,7 +224,7 @@
Contains demo applications (with source) that use the Mir display server
Package: mir-utils
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
Depends: ${misc:Depends},
${shlibs:Depends},
Description: Display server for Ubuntu - utility programs
@@ -241,7 +241,7 @@
This package installs the mir API documentation.
Package: mir-test-tools
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
@@ -255,7 +255,7 @@
Package: libmircommon5
Section: libs
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
@@ -269,7 +269,7 @@
# Longer-term these drivers should move out-of-tree
Package: mir-platform-graphics-mesa2
Section: libs
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
@@ -297,7 +297,7 @@
Package: mir-client-platform-mesa2
Section: libs
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
@@ -311,7 +311,7 @@
Package: mir-client-platform-mesa-dev
Section: libdevel
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: libmircommon-dev,
@@ -339,7 +339,7 @@
Package: mir-graphics-drivers-desktop
Section: libs
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
=== modified file 'debian/create_postinst_prerm_scripts.sh'
--- debian/create_postinst_prerm_scripts.sh 2015-06-04 00:40:23 +0000
+++ debian/create_postinst_prerm_scripts.sh 2015-06-04 02:05:13 +0000
@@ -8,12 +8,12 @@
mir_platform_types="${PLATFORM_DRIVER}"
case $deb_host_arch in
- arm64|powerpc|ppc64el)
+ amd64|i386|armhf)
+ mir_platforms="android mesa"
+ ;;
+ *)
mir_platforms="mesa"
;;
- *)
- mir_platforms="android mesa"
- ;;
esac
create_script()
=== modified file 'debian/install_ld_so_conf.sh'
--- debian/install_ld_so_conf.sh 2015-06-04 00:40:23 +0000
+++ debian/install_ld_so_conf.sh 2015-06-04 02:04:41 +0000
@@ -7,12 +7,12 @@
mir_platform_types="${PLATFORM_DRIVER} ${CLIENT_DRIVER}"
case $DEB_HOST_ARCH in
- arm64|powerpc|ppc64el)
+ amd64|i386|armhf)
+ mir_platforms="android mesa"
+ ;;
+ *)
mir_platforms="mesa"
;;
- *)
- mir_platforms="android mesa"
- ;;
esac
for platform_type in $mir_platform_types;
=== modified file 'debian/rules'
--- debian/rules 2015-06-04 00:40:23 +0000
+++ debian/rules 2015-06-04 02:10:44 +0000
@@ -2,6 +2,7 @@
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_HOST_ARCH_ENDIAN ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_ENDIAN)
EXACT_PACKAGE_VERSION = $(shell dpkg-parsechangelog | grep Version | cut -d' ' -f 2)
export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
@@ -12,10 +13,10 @@
# Enable verbose debugging output from the testsuite
export MIR_SERVER_LOGGING = on
override_dh_auto_test:
-ifneq ($(DEB_HOST_ARCH),powerpc)
+ifeq ($(DEB_HOST_ARCH_ENDIAN),little)
GTEST_OUTPUT=xml:./ dh_auto_test --max-parallel=1 -- ARGS="-V"
else
- echo "Testsuite disabled on powerpc due to lack of big-endian support."
+ echo "Testsuite disabled on $(DEB_HOST_ARCH) due to lack of big-endian support."
endif
COMMON_CONFIGURE_OPTIONS = \
@@ -29,14 +30,14 @@
-DMIR_RUN_INTEGRATION_TESTS=OFF \
-DMIR_PLATFORM=android\;mesa
else
-ifneq ($(filter arm64 powerpc ppc64el,$(DEB_HOST_ARCH)),)
+ifneq ($(filter amd64 i386,$(DEB_HOST_ARCH)),)
+ dh_auto_configure -- \
+ $(COMMON_CONFIGURE_OPTIONS) \
+ -DMIR_PLATFORM=mesa\;android
+else
dh_auto_configure -- \
$(COMMON_CONFIGURE_OPTIONS) \
-DMIR_PLATFORM=mesa
-else
- dh_auto_configure -- \
- $(COMMON_CONFIGURE_OPTIONS) \
- -DMIR_PLATFORM=mesa\;android
endif
endif
|