blob: 24b2de5d9c2dfa71a4edec8da0a6aead6ae596cc [file] [log] [blame]
Andrew Geisslereff27472021-10-29 15:35:00 -05001From 7610ec4b572d3a54d30fca6798f0c406f3fd8a46 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Tue, 26 Oct 2021 08:52:17 +0200
4Subject: [PATCH] waffle: do not make core protocol into the library
5
6None of the consumers (which is just piglit) use it, and
7this avoids host contamination from pkg-config suggesting
8wayland.xml from the host.
9
10Upstream-Status: Inappropriate [oe-core specific]
11Signed-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
17diff --git a/meson.build b/meson.build
18index 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 )
32diff --git a/src/waffle/meson.build b/src/waffle/meson.build
33index 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 ]