diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-10-27 11:07:28 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-28 14:16:31 +0100 |
commit | aae23182ef16274d55ecc2044e477df90e6bb339 (patch) | |
tree | 38a84fc93e734982f8ea22fb8f3888108d4ee926 /meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch | |
parent | 145a9c36713b3d59ecf32f2109adf6a257ca5936 (diff) | |
download | poky-aae23182ef16274d55ecc2044e477df90e6bb339.tar.gz |
waffle: update 1.6.1 -> 1.7.0
(From OE-Core rev: 95acd86a4aeb8d2122285dd1745c77622462d33f)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch')
-rw-r--r-- | meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch b/meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch new file mode 100644 index 0000000000..24b2de5d9c --- /dev/null +++ b/meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch | |||
@@ -0,0 +1,56 @@ | |||
1 | From 7610ec4b572d3a54d30fca6798f0c406f3fd8a46 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Tue, 26 Oct 2021 08:52:17 +0200 | ||
4 | Subject: [PATCH] waffle: do not make core protocol into the library | ||
5 | |||
6 | None of the consumers (which is just piglit) use it, and | ||
7 | this avoids host contamination from pkg-config suggesting | ||
8 | wayland.xml from the host. | ||
9 | |||
10 | Upstream-Status: Inappropriate [oe-core specific] | ||
11 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
12 | --- | ||
13 | meson.build | 4 ---- | ||
14 | src/waffle/meson.build | 7 ------- | ||
15 | 2 files changed, 11 deletions(-) | ||
16 | |||
17 | diff --git a/meson.build b/meson.build | ||
18 | index ffc02ff..0bb6128 100644 | ||
19 | --- a/meson.build | ||
20 | +++ b/meson.build | ||
21 | @@ -104,10 +104,6 @@ else | ||
22 | dep_wayland_client = dependency( | ||
23 | 'wayland-client', version : '>= 1.10', required : get_option('wayland'), | ||
24 | ) | ||
25 | - if dep_wayland_client.found() | ||
26 | - wayland_core_xml = join_paths(dep_wayland_client.get_pkgconfig_variable('pkgdatadir'), | ||
27 | - 'wayland.xml') | ||
28 | - endif | ||
29 | dep_wayland_egl = dependency( | ||
30 | 'wayland-egl', version : '>= 9.1', required : get_option('wayland'), | ||
31 | ) | ||
32 | diff --git a/src/waffle/meson.build b/src/waffle/meson.build | ||
33 | index 01898c8..6245868 100644 | ||
34 | --- a/src/waffle/meson.build | ||
35 | +++ b/src/waffle/meson.build | ||
36 | @@ -88,12 +88,6 @@ if build_surfaceless | ||
37 | endif | ||
38 | |||
39 | if build_wayland | ||
40 | - wl_core_proto_c = custom_target( | ||
41 | - 'wl-core-proto.c', | ||
42 | - input: wayland_core_xml, | ||
43 | - output: 'wl-core-proto.c', | ||
44 | - command: [prog_wayland_scanner, 'private-code', '@INPUT@', '@OUTPUT@'], | ||
45 | - ) | ||
46 | wl_xdg_shell_proto_c = custom_target( | ||
47 | 'wl-xdg-shell-proto.c', | ||
48 | input: wayland_xdg_shell_xml, | ||
49 | @@ -114,7 +108,6 @@ if build_wayland | ||
50 | 'wayland/wayland_wrapper.c', | ||
51 | ) | ||
52 | files_libwaffle += [ | ||
53 | - wl_core_proto_c, | ||
54 | wl_xdg_shell_proto_c, | ||
55 | wl_xdg_shell_proto_h, | ||
56 | ] | ||