[Buildroot] [PATCH 2/2] package/weston: drop fbdev

[Arnout Vandecappelle]

On 14/02/2022 20:39, Fabrice Fontaine wrote:
> fbdev raises the following build failure since bump to version 10.0.0 in
> commit f67a6e9b7a7be9adbc405b3126000056120a01af and
> https://gitlab.freedesktop.org/wayland/weston/-/commit/6338dbd5816689b2f08f48b359a972e16ff038d8:
> 
> ../output-1/build/weston-10.0.0/meson.build:133:7: ERROR: Tried to access unknown option 'backend-fbdev'.
> 
> Drop fbdev to avoid this build failure as upstream is reluctant to
> properly fix this issue by renaming the fbdev option in stable release:
> https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/791

  Reading that, it seems that only the option BR2_PACKAGE_WESTON_DEFAULT_FBDEV 
is broken and we could keep BR2_PACKAGE_WESTON_FBDEV.

  However, it makes sense to remove this deprecated option anyway, so applied 
both to master, thanks.

  Regards,
  Arnout

> 
> Fixes:
>   - http://autobuild.buildroot.org/results/e669a6237c19783c627169c819d7372e20daaf54
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
> ---
>   Config.in.legacy         | 12 ++++++++++++
>   package/weston/Config.in |  8 --------
>   package/weston/weston.mk |  6 ------
>   3 files changed, 12 insertions(+), 14 deletions(-)
> 
> diff --git a/Config.in.legacy b/Config.in.legacy
> index aefb0ba6ea..b90b9dbcbc 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -146,6 +146,18 @@ endif
>   
>   comment "Legacy options removed in 2022.02"
>   
> +config BR2_PACKAGE_WESTON_DEFAULT_FBDEV
> +	bool "weston fbdev removed"
> +	select BR2_LEGACY
> +	help
> +	  fbdev was deprecated in weston 10.0.0.
> +
> +config BR2_PACKAGE_WESTON_FBDEV
> +	bool "weston fbdev compositor removed"
> +	select BR2_LEGACY
> +	help
> +	  fbdev compositor was deprecated in weston 10.0.0.
> +
>   config BR2_PACKAGE_LINUX_TOOLS_BPFTOOL
>   	bool "bpftool was moved"
>   	select BR2_LEGACY
> diff --git a/package/weston/Config.in b/package/weston/Config.in
> index 073a3ae567..6ad8241caa 100644
> --- a/package/weston/Config.in
> +++ b/package/weston/Config.in
> @@ -34,10 +34,6 @@ if BR2_PACKAGE_WESTON
>   choice
>   	prompt "default compositor"
>   
> -config BR2_PACKAGE_WESTON_DEFAULT_FBDEV
> -	bool "fbdev (deprecated)"
> -	select BR2_PACKAGE_WESTON_FBDEV
> -
>   config BR2_PACKAGE_WESTON_DEFAULT_DRM
>   	bool "drm"
>   	select BR2_PACKAGE_WESTON_DRM
> @@ -62,7 +58,6 @@ endchoice
>   
>   config BR2_PACKAGE_WESTON_DEFAULT_COMPOSITOR
>   	string
> -	default "fbdev"    if BR2_PACKAGE_WESTON_DEFAULT_FBDEV
>   	default "drm"      if BR2_PACKAGE_WESTON_DEFAULT_DRM
>   	default "headless" if BR2_PACKAGE_WESTON_DEFAULT_HEADLESS
>   	default "wayland"  if BR2_PACKAGE_WESTON_DEFAULT_WAYLAND
> @@ -71,9 +66,6 @@ config BR2_PACKAGE_WESTON_DEFAULT_COMPOSITOR
>   config BR2_PACKAGE_WESTON_DRM
>   	bool "DRM compositor"
>   
> -config BR2_PACKAGE_WESTON_FBDEV
> -	bool "fbdev compositor (deprecated)"
> -
>   # FreeRDP needs threads and !static, already the case for weston
>   config BR2_PACKAGE_WESTON_RDP
>   	bool "RDP compositor"
> diff --git a/package/weston/weston.mk b/package/weston/weston.mk
> index a0a18d9358..90cf160688 100644
> --- a/package/weston/weston.mk
> +++ b/package/weston/weston.mk
> @@ -85,12 +85,6 @@ else
>   WESTON_CONF_OPTS += -Dbackend-rdp=false
>   endif
>   
> -ifeq ($(BR2_PACKAGE_WESTON_FBDEV),y)
> -WESTON_CONF_OPTS += -Ddeprecated-backend-fbdev=true
> -else
> -WESTON_CONF_OPTS += -Ddeprecated-backend-fbdev=false
> -endif
> -
>   ifeq ($(BR2_PACKAGE_WESTON_DRM),y)
>   WESTON_CONF_OPTS += -Dbackend-drm=true
>   else