summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/xorg-proto/xorgproto/0001-Remove-libdir-specification.patch468
-rw-r--r--meta/recipes-graphics/xorg-proto/xorgproto_2019.1.bb (renamed from meta/recipes-graphics/xorg-proto/xorgproto_2018.4.bb)6
2 files changed, 2 insertions, 472 deletions
diff --git a/meta/recipes-graphics/xorg-proto/xorgproto/0001-Remove-libdir-specification.patch b/meta/recipes-graphics/xorg-proto/xorgproto/0001-Remove-libdir-specification.patch
deleted file mode 100644
index 48296f7844..0000000000
--- a/meta/recipes-graphics/xorg-proto/xorgproto/0001-Remove-libdir-specification.patch
+++ /dev/null
@@ -1,468 +0,0 @@
1Upstream-Status: Submitted
2
3https://cgit.freedesktop.org/xorg/proto/xorgproto/commit/?id=91c1c8e1490c970379efb16784003426faec806e
4
5From 6feb974e0deb3355908c30e07293d82a3f6996ed Mon Sep 17 00:00:00 2001
6From: Jeremy Puhlman <jpuhlman@mvista.com>
7Date: Mon, 11 Jun 2018 16:42:43 +0000
8Subject: [PATCH] Remove libdir specification.
9
10Currently the pc files define libdir, however they are installed into
11/usr/share, which means they should be architecture agnostic. In a
12multilib system, xorg-proto built for each multilib abi, the value of
13libdir is going to be different. These should either be installed in
14<libdir>/pkgconfig or they shouldn't define libdir, espeically since
15they don't actually use the definition. This specifically causes an
16issue when trying to install both abis at the same time, since they are
17not binary identical, something like rpm will complain that they
18
19---
20 applewmproto.pc.in | 1 -
21 bigreqsproto.pc.in | 1 -
22 compositeproto.pc.in | 1 -
23 damageproto.pc.in | 1 -
24 dmxproto.pc.in | 1 -
25 dri2proto.pc.in | 1 -
26 dri3proto.pc.in | 1 -
27 evieproto.pc.in | 1 -
28 fixesproto.pc.in | 1 -
29 fontcacheproto.pc.in | 1 -
30 fontsproto.pc.in | 1 -
31 glproto.pc.in | 1 -
32 inputproto.pc.in | 1 -
33 kbproto.pc.in | 1 -
34 lg3dproto.pc.in | 1 -
35 presentproto.pc.in | 1 -
36 printproto.pc.in | 1 -
37 randrproto.pc.in | 1 -
38 recordproto.pc.in | 1 -
39 renderproto.pc.in | 1 -
40 resourceproto.pc.in | 1 -
41 scrnsaverproto.pc.in | 1 -
42 trapproto.pc.in | 1 -
43 videoproto.pc.in | 1 -
44 windowswmproto.pc.in | 1 -
45 xcalibrateproto.pc.in | 1 -
46 xcmiscproto.pc.in | 1 -
47 xextproto.pc.in | 1 -
48 xf86bigfontproto.pc.in | 1 -
49 xf86dgaproto.pc.in | 1 -
50 xf86driproto.pc.in | 1 -
51 xf86miscproto.pc.in | 1 -
52 xf86rushproto.pc.in | 1 -
53 xf86vidmodeproto.pc.in | 1 -
54 xineramaproto.pc.in | 1 -
55 xproto.pc.in | 1 -
56 xproxymngproto.pc.in | 1 -
57 37 files changed, 37 deletions(-)
58
59diff --git a/applewmproto.pc.in b/applewmproto.pc.in
60index 17841ac..3227b21 100644
61--- a/applewmproto.pc.in
62+++ b/applewmproto.pc.in
63@@ -1,6 +1,5 @@
64 prefix=@prefix@
65 exec_prefix=@exec_prefix@
66-libdir=@libdir@
67 includedir=@includedir@
68
69 Name: AppleWMProto
70diff --git a/bigreqsproto.pc.in b/bigreqsproto.pc.in
71index 94577ed..e21bb59 100644
72--- a/bigreqsproto.pc.in
73+++ b/bigreqsproto.pc.in
74@@ -1,6 +1,5 @@
75 prefix=@prefix@
76 exec_prefix=@exec_prefix@
77-libdir=@libdir@
78 includedir=@includedir@
79
80 Name: BigReqsProto
81diff --git a/compositeproto.pc.in b/compositeproto.pc.in
82index da429c7..b0dada1 100644
83--- a/compositeproto.pc.in
84+++ b/compositeproto.pc.in
85@@ -1,6 +1,5 @@
86 prefix=@prefix@
87 exec_prefix=@exec_prefix@
88-libdir=@libdir@
89 includedir=@includedir@
90
91 Name: CompositeExt
92diff --git a/damageproto.pc.in b/damageproto.pc.in
93index 6fd9ef1..bfd5244 100644
94--- a/damageproto.pc.in
95+++ b/damageproto.pc.in
96@@ -1,6 +1,5 @@
97 prefix=@prefix@
98 exec_prefix=@exec_prefix@
99-libdir=@libdir@
100 includedir=@includedir@
101
102 Name: DamageProto
103diff --git a/dmxproto.pc.in b/dmxproto.pc.in
104index e82ee7d..d140e1c 100644
105--- a/dmxproto.pc.in
106+++ b/dmxproto.pc.in
107@@ -1,6 +1,5 @@
108 prefix=@prefix@
109 exec_prefix=@exec_prefix@
110-libdir=@libdir@
111 includedir=@includedir@
112
113 Name: DMXProto
114diff --git a/dri2proto.pc.in b/dri2proto.pc.in
115index cb5b171..fa9d24d 100644
116--- a/dri2proto.pc.in
117+++ b/dri2proto.pc.in
118@@ -1,6 +1,5 @@
119 prefix=@prefix@
120 exec_prefix=@exec_prefix@
121-libdir=@libdir@
122 includedir=@includedir@
123
124 Name: DRI2Proto
125diff --git a/dri3proto.pc.in b/dri3proto.pc.in
126index e42d60e..20da358 100644
127--- a/dri3proto.pc.in
128+++ b/dri3proto.pc.in
129@@ -1,6 +1,5 @@
130 prefix=@prefix@
131 exec_prefix=@exec_prefix@
132-libdir=@libdir@
133 includedir=@includedir@
134
135 Name: DRI3Proto
136diff --git a/evieproto.pc.in b/evieproto.pc.in
137index 64e0ec4..fd5442b 100644
138--- a/evieproto.pc.in
139+++ b/evieproto.pc.in
140@@ -1,6 +1,5 @@
141 prefix=@prefix@
142 exec_prefix=@exec_prefix@
143-libdir=@libdir@
144 includedir=@includedir@
145
146 Name: EvIEExt
147diff --git a/fixesproto.pc.in b/fixesproto.pc.in
148index f8258e2..c7fcb81 100644
149--- a/fixesproto.pc.in
150+++ b/fixesproto.pc.in
151@@ -1,6 +1,5 @@
152 prefix=@prefix@
153 exec_prefix=@exec_prefix@
154-libdir=@libdir@
155 includedir=@includedir@
156
157 Name: FixesProto
158diff --git a/fontcacheproto.pc.in b/fontcacheproto.pc.in
159index eb4238b..8ffffe9 100644
160--- a/fontcacheproto.pc.in
161+++ b/fontcacheproto.pc.in
162@@ -1,6 +1,5 @@
163 prefix=@prefix@
164 exec_prefix=@exec_prefix@
165-libdir=@libdir@
166 includedir=@includedir@
167
168 Name: FontcacheProto
169diff --git a/fontsproto.pc.in b/fontsproto.pc.in
170index 9d22354..ebb61a4 100644
171--- a/fontsproto.pc.in
172+++ b/fontsproto.pc.in
173@@ -1,6 +1,5 @@
174 prefix=@prefix@
175 exec_prefix=@exec_prefix@
176-libdir=@libdir@
177 includedir=@includedir@
178
179 Name: FontsProto
180diff --git a/glproto.pc.in b/glproto.pc.in
181index b951db5..e97bfc9 100644
182--- a/glproto.pc.in
183+++ b/glproto.pc.in
184@@ -1,6 +1,5 @@
185 prefix=@prefix@
186 exec_prefix=@exec_prefix@
187-libdir=@libdir@
188 includedir=@includedir@
189
190 Name: GLProto
191diff --git a/inputproto.pc.in b/inputproto.pc.in
192index 1eb6619..270b95c 100644
193--- a/inputproto.pc.in
194+++ b/inputproto.pc.in
195@@ -1,6 +1,5 @@
196 prefix=@prefix@
197 exec_prefix=@exec_prefix@
198-libdir=@libdir@
199 includedir=@includedir@
200
201 Name: InputProto
202diff --git a/kbproto.pc.in b/kbproto.pc.in
203index bdd39f1..32a172d 100644
204--- a/kbproto.pc.in
205+++ b/kbproto.pc.in
206@@ -1,6 +1,5 @@
207 prefix=@prefix@
208 exec_prefix=@exec_prefix@
209-libdir=@libdir@
210 includedir=@includedir@
211
212 Name: KBProto
213diff --git a/lg3dproto.pc.in b/lg3dproto.pc.in
214index 3930ad7..43fba29 100644
215--- a/lg3dproto.pc.in
216+++ b/lg3dproto.pc.in
217@@ -1,6 +1,5 @@
218 prefix=@prefix@
219 exec_prefix=@exec_prefix@
220-libdir=@libdir@
221 includedir=@includedir@
222
223 Name: Lg3dProto
224diff --git a/presentproto.pc.in b/presentproto.pc.in
225index 6ec4b7d..55b84dc 100644
226--- a/presentproto.pc.in
227+++ b/presentproto.pc.in
228@@ -1,6 +1,5 @@
229 prefix=@prefix@
230 exec_prefix=@exec_prefix@
231-libdir=@libdir@
232 includedir=@includedir@
233
234 Name: PresentProto
235diff --git a/printproto.pc.in b/printproto.pc.in
236index 8a2e2d6..a2da66d 100644
237--- a/printproto.pc.in
238+++ b/printproto.pc.in
239@@ -1,6 +1,5 @@
240 prefix=@prefix@
241 exec_prefix=@exec_prefix@
242-libdir=@libdir@
243 includedir=@includedir@
244
245 Name: PrintProto
246diff --git a/randrproto.pc.in b/randrproto.pc.in
247index 5a5edb2..6d60cbb 100644
248--- a/randrproto.pc.in
249+++ b/randrproto.pc.in
250@@ -1,6 +1,5 @@
251 prefix=@prefix@
252 exec_prefix=@exec_prefix@
253-libdir=@libdir@
254 includedir=@includedir@
255
256 Name: RandrProto
257diff --git a/recordproto.pc.in b/recordproto.pc.in
258index 0ff4c0b..a87aa82 100644
259--- a/recordproto.pc.in
260+++ b/recordproto.pc.in
261@@ -1,6 +1,5 @@
262 prefix=@prefix@
263 exec_prefix=@exec_prefix@
264-libdir=@libdir@
265 includedir=@includedir@
266
267 Name: RecordProto
268diff --git a/renderproto.pc.in b/renderproto.pc.in
269index e6028ac..34b15e0 100644
270--- a/renderproto.pc.in
271+++ b/renderproto.pc.in
272@@ -1,6 +1,5 @@
273 prefix=@prefix@
274 exec_prefix=@exec_prefix@
275-libdir=@libdir@
276 includedir=@includedir@
277
278 Name: RenderProto
279diff --git a/resourceproto.pc.in b/resourceproto.pc.in
280index a409db9..f927cbb 100644
281--- a/resourceproto.pc.in
282+++ b/resourceproto.pc.in
283@@ -1,6 +1,5 @@
284 prefix=@prefix@
285 exec_prefix=@exec_prefix@
286-libdir=@libdir@
287 includedir=@includedir@
288
289 Name: ResourceProto
290diff --git a/scrnsaverproto.pc.in b/scrnsaverproto.pc.in
291index 6556a2c..fd9d368 100644
292--- a/scrnsaverproto.pc.in
293+++ b/scrnsaverproto.pc.in
294@@ -1,6 +1,5 @@
295 prefix=@prefix@
296 exec_prefix=@exec_prefix@
297-libdir=@libdir@
298 includedir=@includedir@
299
300 Name: ScrnSaverProto
301diff --git a/trapproto.pc.in b/trapproto.pc.in
302index 8cb0aa8..8a220b9 100644
303--- a/trapproto.pc.in
304+++ b/trapproto.pc.in
305@@ -1,6 +1,5 @@
306 prefix=@prefix@
307 exec_prefix=@exec_prefix@
308-libdir=@libdir@
309 includedir=@includedir@
310
311 Name: TrapProto
312diff --git a/videoproto.pc.in b/videoproto.pc.in
313index 14b907a..5c22f7a 100644
314--- a/videoproto.pc.in
315+++ b/videoproto.pc.in
316@@ -1,6 +1,5 @@
317 prefix=@prefix@
318 exec_prefix=@exec_prefix@
319-libdir=@libdir@
320 includedir=@includedir@
321
322 Name: VideoProto
323diff --git a/windowswmproto.pc.in b/windowswmproto.pc.in
324index 0a2ec0b..ec56e82 100644
325--- a/windowswmproto.pc.in
326+++ b/windowswmproto.pc.in
327@@ -1,6 +1,5 @@
328 prefix=@prefix@
329 exec_prefix=@exec_prefix@
330-libdir=@libdir@
331 includedir=@includedir@
332
333 Name: WindowsWMProto
334diff --git a/xcalibrateproto.pc.in b/xcalibrateproto.pc.in
335index 40b6fd0..f1ea5de 100644
336--- a/xcalibrateproto.pc.in
337+++ b/xcalibrateproto.pc.in
338@@ -1,6 +1,5 @@
339 prefix=@prefix@
340 exec_prefix=@exec_prefix@
341-libdir=@libdir@
342 includedir=@includedir@
343
344 Name: XCalibrate
345diff --git a/xcmiscproto.pc.in b/xcmiscproto.pc.in
346index 0dfbf21..b72bbc6 100644
347--- a/xcmiscproto.pc.in
348+++ b/xcmiscproto.pc.in
349@@ -1,6 +1,5 @@
350 prefix=@prefix@
351 exec_prefix=@exec_prefix@
352-libdir=@libdir@
353 includedir=@includedir@
354
355 Name: XCMiscProto
356diff --git a/xextproto.pc.in b/xextproto.pc.in
357index f66eeae..9419c91 100644
358--- a/xextproto.pc.in
359+++ b/xextproto.pc.in
360@@ -1,6 +1,5 @@
361 prefix=@prefix@
362 exec_prefix=@exec_prefix@
363-libdir=@libdir@
364 includedir=@includedir@
365
366 Name: XExtProto
367diff --git a/xf86bigfontproto.pc.in b/xf86bigfontproto.pc.in
368index 18c5647..4a67be6 100644
369--- a/xf86bigfontproto.pc.in
370+++ b/xf86bigfontproto.pc.in
371@@ -1,6 +1,5 @@
372 prefix=@prefix@
373 exec_prefix=@exec_prefix@
374-libdir=@libdir@
375 includedir=@includedir@
376
377 Name: XF86BigFontProto
378diff --git a/xf86dgaproto.pc.in b/xf86dgaproto.pc.in
379index 5c5f8b1..e029cd4 100644
380--- a/xf86dgaproto.pc.in
381+++ b/xf86dgaproto.pc.in
382@@ -1,6 +1,5 @@
383 prefix=@prefix@
384 exec_prefix=@exec_prefix@
385-libdir=@libdir@
386 includedir=@includedir@
387
388 Name: XF86DGAProto
389diff --git a/xf86driproto.pc.in b/xf86driproto.pc.in
390index 93df292..c8faf14 100644
391--- a/xf86driproto.pc.in
392+++ b/xf86driproto.pc.in
393@@ -1,6 +1,5 @@
394 prefix=@prefix@
395 exec_prefix=@exec_prefix@
396-libdir=@libdir@
397 includedir=@includedir@
398
399 Name: XF86DRIProto
400diff --git a/xf86miscproto.pc.in b/xf86miscproto.pc.in
401index af73fa3..05d5d9e 100644
402--- a/xf86miscproto.pc.in
403+++ b/xf86miscproto.pc.in
404@@ -1,6 +1,5 @@
405 prefix=@prefix@
406 exec_prefix=@exec_prefix@
407-libdir=@libdir@
408 includedir=@includedir@
409
410 Name: XF86MiscProto
411diff --git a/xf86rushproto.pc.in b/xf86rushproto.pc.in
412index fc5f63b..1c7ff1b 100644
413--- a/xf86rushproto.pc.in
414+++ b/xf86rushproto.pc.in
415@@ -1,6 +1,5 @@
416 prefix=@prefix@
417 exec_prefix=@exec_prefix@
418-libdir=@libdir@
419 includedir=@includedir@
420
421 Name: XF86RushProto
422diff --git a/xf86vidmodeproto.pc.in b/xf86vidmodeproto.pc.in
423index fcb74f2..ef062b3 100644
424--- a/xf86vidmodeproto.pc.in
425+++ b/xf86vidmodeproto.pc.in
426@@ -1,6 +1,5 @@
427 prefix=@prefix@
428 exec_prefix=@exec_prefix@
429-libdir=@libdir@
430 includedir=@includedir@
431
432 Name: XF86VidModeProto
433diff --git a/xineramaproto.pc.in b/xineramaproto.pc.in
434index 1ffd37d..9172f1e 100644
435--- a/xineramaproto.pc.in
436+++ b/xineramaproto.pc.in
437@@ -1,6 +1,5 @@
438 prefix=@prefix@
439 exec_prefix=@exec_prefix@
440-libdir=@libdir@
441 includedir=@includedir@
442
443 Name: XineramaProto
444diff --git a/xproto.pc.in b/xproto.pc.in
445index 8ff2d3d..899316a 100644
446--- a/xproto.pc.in
447+++ b/xproto.pc.in
448@@ -1,6 +1,5 @@
449 prefix=@prefix@
450 exec_prefix=@exec_prefix@
451-libdir=@libdir@
452 includedir=@includedir@
453 includex11dir=@includedir@/X11
454
455diff --git a/xproxymngproto.pc.in b/xproxymngproto.pc.in
456index 5c6fad6..1a81e28 100644
457--- a/xproxymngproto.pc.in
458+++ b/xproxymngproto.pc.in
459@@ -1,6 +1,5 @@
460 prefix=@prefix@
461 exec_prefix=@exec_prefix@
462-libdir=@libdir@
463 includedir=@includedir@
464
465 Name: XProxyManagementProtocol
466--
4672.11.1
468
diff --git a/meta/recipes-graphics/xorg-proto/xorgproto_2018.4.bb b/meta/recipes-graphics/xorg-proto/xorgproto_2019.1.bb
index cec6e87559..2c7ce2a56c 100644
--- a/meta/recipes-graphics/xorg-proto/xorgproto_2018.4.bb
+++ b/meta/recipes-graphics/xorg-proto/xorgproto_2019.1.bb
@@ -8,9 +8,7 @@ the core protocol and (many) extensions for the X Window System"
8LICENSE = "MIT-style" 8LICENSE = "MIT-style"
9LIC_FILES_CHKSUM = "file://COPYING-x11proto;md5=b9e051107d5628966739a0b2e9b32676" 9LIC_FILES_CHKSUM = "file://COPYING-x11proto;md5=b9e051107d5628966739a0b2e9b32676"
10 10
11SRC_URI += "file://0001-Remove-libdir-specification.patch" 11SRC_URI[md5sum] = "802ccb9e977ba3cf94ba798ddb2898a4"
12 12SRC_URI[sha256sum] = "a6daaa7a6cbc8e374032d83ff7f47d41be98f1e0f4475d66a4da3aa766a0d49b"
13SRC_URI[md5sum] = "81557ca47ee66a4e54590fcdadd28114"
14SRC_URI[sha256sum] = "fee885e0512899ea5280c593fdb2735beb1693ad170c22ebcc844470eec415a0"
15 13
16BBCLASSEXTEND = "native nativesdk" 14BBCLASSEXTEND = "native nativesdk"