From 0f3b4f9402b7f5da8f0e0840523d43ef40c3f73f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 4 Mar 2022 20:06:00 +0100 Subject: [PATCH] package/weston: fix build without shell-desktop Fix the following build failure without shell-desktop raised since bump to version 10.0.0 in commit f67a6e9b7a7be9adbc405b3126000056120a01af and https://gitlab.freedesktop.org/wayland/weston/-/commit/9e90760ab054db2234f73374600489fa5584ad7c: In file included from ../tests/weston-test-client-helper.c:43: ../tests/weston-test-client-helper.h:40:10: fatal error: weston-screenshooter-client-protocol.h: No such file or directory 40 | #include "weston-screenshooter-client-protocol.h" | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/8ece588f52fc1b4e422f8bce9b106d9d3822f1a1 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...ncy-on-screenshooter-client-protocol.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/weston/0001-tests-Add-dependency-on-screenshooter-client-protocol.patch diff --git a/package/weston/0001-tests-Add-dependency-on-screenshooter-client-protocol.patch b/package/weston/0001-tests-Add-dependency-on-screenshooter-client-protocol.patch new file mode 100644 index 0000000000..927215380e --- /dev/null +++ b/package/weston/0001-tests-Add-dependency-on-screenshooter-client-protocol.patch @@ -0,0 +1,38 @@ +From 2ac6b6b084a877adde64db7faff2ed22eb3ea97a Mon Sep 17 00:00:00 2001 +From: Daniel Stone +Date: Tue, 8 Feb 2022 22:39:42 +0000 +Subject: [PATCH] tests: Add dependency on screenshooter client protocol + +Given that the test-helper code relies on the screenshooter protocol, +make sure it's available for us to build, and the dependency ensures we +build in order. + +Fixes: #588 + +Signed-off-by: Daniel Stone + +[Retrieved from: +https://gitlab.freedesktop.org/wayland/weston/-/commit/2ac6b6b084a877adde64db7faff2ed22eb3ea97a] +Signed-off-by: Fabrice Fontaine +--- + tests/meson.build | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/meson.build b/tests/meson.build +index 2d464ddcc..222091cd1 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -29,8 +29,9 @@ lib_test_client = static_library( + 'weston-test-client-helper.c', + 'weston-test-fixture-compositor.c', + weston_test_client_protocol_h, +- weston_screenshooter_protocol_c, + weston_test_protocol_c, ++ weston_screenshooter_client_protocol_h, ++ weston_screenshooter_protocol_c, + viewporter_client_protocol_h, + viewporter_protocol_c, + 'color_util.h', +-- +GitLab +