[Buildroot] [PATCH 1/1] package/weston: fix build without gbm

[Buildroot] [PATCH 1/1] package/weston: fix build without gbm

[Fabrice Fontaine]

Fix the following build failure without gbm raised since commit
534c22dd606e200969fce49b8d23b27902dec94e:

Message: dmabuf-feedback requires gbm which was not found. If you rather not build this, drop "dmabuf-feedback" from simple-clients option.

Fixes:
 - http://autobuild.buildroot.org/results/ebbba1d73ceeaacee17fde0c6c853415cd316091

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/weston/weston.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/weston/weston.mk b/package/weston/weston.mk
index 6a5c0e57f5..bf8c7ced85 100644
--- a/package/weston/weston.mk
+++ b/package/weston/weston.mk
@@ -25,9 +25,6 @@ WESTON_CONF_OPTS = \
 ifeq ($(BR2_PACKAGE_WESTON_SIMPLE_CLIENTS),y)
 WESTON_SIMPLE_CLIENTS = \
 	damage \
-	dmabuf-egl \
-	dmabuf-feedback \
-	egl \
 	im \
 	shm \
 	touch
@@ -57,6 +54,9 @@ endif
 ifeq ($(BR2_PACKAGE_HAS_LIBEGL_WAYLAND)$(BR2_PACKAGE_HAS_LIBGBM)$(BR2_PACKAGE_HAS_LIBGLES),yyy)
 WESTON_CONF_OPTS += -Drenderer-gl=true
 WESTON_DEPENDENCIES += libegl libgbm libgles
+ifeq ($(BR2_PACKAGE_WESTON_SIMPLE_CLIENTS),y)
+WESTON_SIMPLE_CLIENTS += dmabuf-egl dmabuf-feedback egl
+endif
 ifeq ($(BR2_PACKAGE_PIPEWIRE)$(BR2_PACKAGE_WESTON_DRM),yy)
 WESTON_CONF_OPTS += -Dpipewire=true -Dbackend-pipewire=true
 WESTON_DEPENDENCIES += pipewire
-- 
2.43.0

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

Re: [Buildroot] [PATCH 1/1] package/weston: fix build without gbm

[Yann E. MORIN]

Fabrice, All,

On 2024-01-22 22:14 +0100, Fabrice Fontaine spake thusly:
> Fix the following build failure without gbm raised since commit
> 534c22dd606e200969fce49b8d23b27902dec94e:
> 
> Message: dmabuf-feedback requires gbm which was not found. If you rather not build this, drop "dmabuf-feedback" from simple-clients option.
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/ebbba1d73ceeaacee17fde0c6c853415cd316091
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/weston/weston.mk | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/package/weston/weston.mk b/package/weston/weston.mk
> index 6a5c0e57f5..bf8c7ced85 100644
> --- a/package/weston/weston.mk
> +++ b/package/weston/weston.mk
> @@ -25,9 +25,6 @@ WESTON_CONF_OPTS = \
>  ifeq ($(BR2_PACKAGE_WESTON_SIMPLE_CLIENTS),y)
>  WESTON_SIMPLE_CLIENTS = \

I've added a little comment to explain why the list is incomplete.

>  	damage \
> -	dmabuf-egl \
> -	dmabuf-feedback \
> -	egl \
>  	im \
>  	shm \
>  	touch
> @@ -57,6 +54,9 @@ endif
>  ifeq ($(BR2_PACKAGE_HAS_LIBEGL_WAYLAND)$(BR2_PACKAGE_HAS_LIBGBM)$(BR2_PACKAGE_HAS_LIBGLES),yyy)
>  WESTON_CONF_OPTS += -Drenderer-gl=true
>  WESTON_DEPENDENCIES += libegl libgbm libgles
> +ifeq ($(BR2_PACKAGE_WESTON_SIMPLE_CLIENTS),y)
> +WESTON_SIMPLE_CLIENTS += dmabuf-egl dmabuf-feedback egl

Now, with this change, WESTON_SIMPLE_CLIENTS is asigned below the place
it is expanded to set the option. It is technically inconsequential in
this context, but for us mere humans, it is always a bit puzzling to
see a variable expansion before it is (fully) assigned. so I moved ita
bit later.

Applied to master, thanks.

Regards,
Yann E. MORIN.

> +endif
>  ifeq ($(BR2_PACKAGE_PIPEWIRE)$(BR2_PACKAGE_WESTON_DRM),yy)
>  WESTON_CONF_OPTS += -Dpipewire=true -Dbackend-pipewire=true
>  WESTON_DEPENDENCIES += pipewire
> -- 
> 2.43.0
> 

-- 
.-----------------.--------------------.------------------.--------------------.
|  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

Re: [Buildroot] [PATCH 1/1] package/weston: fix build without gbm

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Fix the following build failure without gbm raised since commit
 > 534c22dd606e200969fce49b8d23b27902dec94e:

 > Message: dmabuf-feedback requires gbm which was not found. If you
 > rather not build this, drop "dmabuf-feedback" from simple-clients
 > option.

 > Fixes:
 >  - http://autobuild.buildroot.org/results/ebbba1d73ceeaacee17fde0c6c853415cd316091

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2023.11.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot