summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/wayland
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-02-22 16:30:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-22 23:57:27 +0000
commita7d8e290b35ac39d685d909fbb58539eb1b34e08 (patch)
tree847c9b96ebd585a67bc67648fc14b006c6213c2c /meta/recipes-graphics/wayland
parent26e23b8262d09c5d91fb94a42bc7377b418027e3 (diff)
downloadpoky-a7d8e290b35ac39d685d909fbb58539eb1b34e08.tar.gz
wayland: add a patch to address build errors due to incorrect deps
(From OE-Core rev: fb1f1a1e6461b5d3c51fbae0b893debb88bfa8d5) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/wayland')
-rw-r--r--meta/recipes-graphics/wayland/wayland/0001-meson-tests-add-missing-dependencies-on-protocol-hea.patch115
-rw-r--r--meta/recipes-graphics/wayland/wayland_1.18.0.bb1
2 files changed, 116 insertions, 0 deletions
diff --git a/meta/recipes-graphics/wayland/wayland/0001-meson-tests-add-missing-dependencies-on-protocol-hea.patch b/meta/recipes-graphics/wayland/wayland/0001-meson-tests-add-missing-dependencies-on-protocol-hea.patch
new file mode 100644
index 0000000000..61de0e04e8
--- /dev/null
+++ b/meta/recipes-graphics/wayland/wayland/0001-meson-tests-add-missing-dependencies-on-protocol-hea.patch
@@ -0,0 +1,115 @@
1From b2c74f6a3dbe0aee2413800837314136947a4985 Mon Sep 17 00:00:00 2001
2From: Jan Beich <jbeich@FreeBSD.org>
3Date: Sat, 15 Feb 2020 02:03:45 +0000
4Subject: [PATCH] meson/tests: add missing dependencies on protocol headers
5
6In file included from ../tests/connection-test.c:43:
7In file included from ../tests/test-compositor.h:30:
8../src/wayland-client.h:40:10: fatal error: 'wayland-client-protocol.h' file not found
9 #include "wayland-client-protocol.h"
10 ^~~~~~~~~~~~~~~~~~~~~~~~~~~
11In file included from ../tests/display-test.c:45:
12In file included from ../src/wayland-server.h:104:
13src/wayland-server-protocol.h:4454:2: error: unterminated /* comment
14 /**
15 ^
16In file included from ../tests/cpp-compile-test.cpp:2:
17In file included from src/wayland-server-protocol.h:8:
18In file included from ../src/wayland-server.h:104:
19src/wayland-server-protocol.h:3:2: error: unterminated conditional directive
20 #ifndef WAYLAND_SERVER_PROTOCOL_H
21 ^
22../tests/headers-protocol-test.c:33:2: error: including wayland-server-protocol.h did not include wayland-server.h!
23 #error including wayland-server-protocol.h did not include wayland-server.h!
24 ^
25In file included from ../tests/headers-protocol-test.c:26:
26In file included from src/wayland-client-protocol.h:8:
27In file included from ../src/wayland-client.h:40:
28src/wayland-client-protocol.h:1358:2: error: unterminated conditional directive
29 #ifndef WL_SHM_FORMAT_ENUM
30 ^
31In file included from ../tests/protocol-logger-test.c:34:
32In file included from ../src/wayland-client.h:40:
33src/wayland-client-protocol.h:2613:1: error: unterminated /* comment
34/**
35^
36../tests/resources-test.c:49:36: error: use of undeclared identifier 'wl_seat_interface'
37 res = wl_resource_create(client, &wl_seat_interface, 4, 0);
38 ^
39Upstream-Status: Backport
40Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
41---
42 tests/meson.build | 26 ++++++++++++++++++--------
43 1 file changed, 18 insertions(+), 8 deletions(-)
44
45diff --git a/tests/meson.build b/tests/meson.build
46index c28a2a3..f1af7b4 100644
47--- a/tests/meson.build
48+++ b/tests/meson.build
49@@ -69,7 +69,7 @@ test(
50 executable(
51 'cpp-compile-test',
52 'cpp-compile-test.cpp',
53- wayland_server_protocol_core_h,
54+ wayland_server_protocol_h,
55 include_directories: src_inc
56 )
57 )
58@@ -91,17 +91,25 @@ tests = {
59 'array-test': [],
60 'client-test': [ wayland_server_protocol_h ],
61 'display-test': [
62+ wayland_client_protocol_h,
63+ wayland_server_protocol_h,
64 tests_server_protocol_h,
65 tests_client_protocol_c,
66 tests_protocol_c,
67 ],
68- 'connection-test': [ wayland_server_protocol_h ],
69+ 'connection-test': [
70+ wayland_client_protocol_h,
71+ wayland_server_protocol_h,
72+ ],
73 'event-loop-test': [ wayland_server_protocol_h ],
74 'fixed-test': [],
75 'interface-test': [ wayland_client_protocol_h ],
76 'list-test': [],
77 'map-test': [],
78- 'sanity-test' : [ wayland_server_protocol_h ],
79+ 'sanity-test' : [
80+ wayland_client_protocol_h,
81+ wayland_server_protocol_h,
82+ ],
83 'socket-test': [
84 wayland_client_protocol_h,
85 wayland_server_protocol_h,
86@@ -116,7 +124,7 @@ tests = {
87 files('../src/wayland-server.c'),
88 wayland_server_protocol_h,
89 ],
90- 'resources-test': [ wayland_server_protocol_core_h ],
91+ 'resources-test': [ wayland_server_protocol_h ],
92 'message-test': [
93 wayland_client_protocol_h,
94 wayland_server_protocol_h,
95@@ -126,14 +134,16 @@ tests = {
96 wayland_server_protocol_h,
97 ],
98 'protocol-logger-test': [
99- wayland_server_protocol_core_h,
100- wayland_client_protocol_core_h,
101+ wayland_client_protocol_h,
102+ wayland_server_protocol_h,
103 ],
104 'headers-test': [
105+ wayland_client_protocol_h,
106+ wayland_server_protocol_h,
107 'headers-protocol-test.c',
108- 'headers-protocol-core-test.c',
109- wayland_server_protocol_core_h,
110 wayland_client_protocol_core_h,
111+ wayland_server_protocol_core_h,
112+ 'headers-protocol-core-test.c',
113 ],
114 'os-wrappers-test': [],
115 }
diff --git a/meta/recipes-graphics/wayland/wayland_1.18.0.bb b/meta/recipes-graphics/wayland/wayland_1.18.0.bb
index 6a6e7495b5..5dc31163da 100644
--- a/meta/recipes-graphics/wayland/wayland_1.18.0.bb
+++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb
@@ -16,6 +16,7 @@ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
16 file://0002-meson.build-find-the-native-wayland-scanner-directly.patch \ 16 file://0002-meson.build-find-the-native-wayland-scanner-directly.patch \
17 file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \ 17 file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \
18 file://0001-build-Fix-strndup-detection-on-MinGW.patch \ 18 file://0001-build-Fix-strndup-detection-on-MinGW.patch \
19 file://0001-meson-tests-add-missing-dependencies-on-protocol-hea.patch \
19 " 20 "
20SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65" 21SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65"
21SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d" 22SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d"