[Buildroot] [PATCH 1/2] package/weston: fix the configuration of simple-clients

[Yann E. MORIN]

Julien, All,

On 2023-08-03 22:15 +0200, Julien Olivain spake thusly:
> commit 7329a0db442026c6b856e76ea964107fa3c730f3
> "weston: disable v4l simple dmabuf for headers < 3.8"
> disabled dmabuf-v4l-client when kernel headers are older than v3.8.
> This commit was made at the time the weston package was at version
> 1.10.0, using the autotools package infra.
> 
> commit e672eb5c39fa626f8e924269cec2056be9e14ded
> "package/weston: bump to version 8.0.0"
> replaced the package infra to meson (since upstream deprecated
> autotools). This commit changed a disable of dmabuf-v4l-client in
> autotools, by enabling it only if supported. The end result is that
> the current meson package recipe disable ALL simple clients, or just
> enable dmabuf-v4l-client when supported. In all cases, all other
> weston simple clients are disabled. This behavior is not convenient
> since some of those simple clients are useful to test the correct
> operation of Weston and the rest of the graphic stack.
> 
> This commit fixes this issue by enabling all supported simple clients.
> 
> Signed-off-by: Julien Olivain <ju.o at free.fr>

Applied to next, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/weston/weston.mk | 17 +++++++++++++----
>  1 file changed, 13 insertions(+), 4 deletions(-)
> 
> diff --git a/package/weston/weston.mk b/package/weston/weston.mk
> index 437c6f2e38..5f8d915d5a 100644
> --- a/package/weston/weston.mk
> +++ b/package/weston/weston.mk
> @@ -22,13 +22,22 @@ WESTON_CONF_OPTS = \
>  	-Dlauncher-libseat=true \
>  	-Dtools=calibrator,debug,info,terminal,touch-calibrator
>  
> -# Uses VIDIOC_EXPBUF, only available from 3.8+
> +WESTON_SIMPLE_CLIENTS = \
> +	damage \
> +	dmabuf-egl \
> +	dmabuf-feedback \
> +	egl \
> +	im \
> +	shm \
> +	touch
> +
>  ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8),y)
> -WESTON_CONF_OPTS += -Dsimple-clients=dmabuf-v4l
> -else
> -WESTON_CONF_OPTS += -Dsimple-clients=
> +# dmabuf-v4l uses VIDIOC_EXPBUF, only available from 3.8+
> +WESTON_SIMPLE_CLIENTS += dmabuf-v4l
>  endif
>  
> +WESTON_CONF_OPTS += -Dsimple-clients=$(subst $(space),$(comma),$(strip $(WESTON_SIMPLE_CLIENTS)))
> +
>  ifeq ($(BR2_PACKAGE_JPEG),y)
>  WESTON_CONF_OPTS += -Dimage-jpeg=true
>  WESTON_DEPENDENCIES += jpeg
> -- 
> 2.41.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot at buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

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