All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/weston: fix build without shell-desktop
@ 2022-03-04 19:06 Fabrice Fontaine
  2022-03-04 20:58 ` Yann E. MORIN
  0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Fontaine @ 2022-03-04 19:06 UTC (permalink / raw)
  To: buildroot; +Cc: Yann E . MORIN, Thomas Petazzoni, Fabrice Fontaine

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 <fontaine.fabrice@gmail.com>
---
 ...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 <daniels@collabora.com>
+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 <daniels@collabora.com>
+
+[Retrieved from:
+https://gitlab.freedesktop.org/wayland/weston/-/commit/2ac6b6b084a877adde64db7faff2ed22eb3ea97a]
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ 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
+
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/weston: fix build without shell-desktop
  2022-03-04 19:06 [Buildroot] [PATCH 1/1] package/weston: fix build without shell-desktop Fabrice Fontaine
@ 2022-03-04 20:58 ` Yann E. MORIN
  0 siblings, 0 replies; 2+ messages in thread
From: Yann E. MORIN @ 2022-03-04 20:58 UTC (permalink / raw)
  To: Fabrice Fontaine; +Cc: Thomas Petazzoni, buildroot

Fabrice, All,

On 2022-03-04 20:06 +0100, Fabrice Fontaine spake thusly:
> 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 <fontaine.fabrice@gmail.com>

Applied to master, thanks.

Regards,
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 <daniels@collabora.com>
> +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 <daniels@collabora.com>
> +
> +[Retrieved from:
> +https://gitlab.freedesktop.org/wayland/weston/-/commit/2ac6b6b084a877adde64db7faff2ed22eb3ea97a]
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +---
> + 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
> +
> -- 
> 2.34.1
> 

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-03-04 20:59 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-04 19:06 [Buildroot] [PATCH 1/1] package/weston: fix build without shell-desktop Fabrice Fontaine
2022-03-04 20:58 ` Yann E. MORIN

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.