Re: [Buildroot] [PATCH] package/sunxi-mali-utgard: support the wayland driver

[Adrian Perez de Castro <aperez@igalia.com>]

[-- Attachment #1.1: Type: text/plain, Size: 4353 bytes --]

Hi,

On Mon, 24 Apr 2023 00:40:14 +0300 Adrian Perez de Castro <aperez@igalia.com> wrote:
> Add a choice to allow using the Wayland variant of the Mali driver. When
> selected, the package is marked as provider for libgbm as libMali.so
> includes the symbols and a libgbm.so symlink is installed; and both
> BR2_PACKAGE_HAS_{LIBGBM,LIBEGL_WAYLAND} are selected accordingly.
> 
> Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>

With this I have been able to build WebKitGTK, WPEWebKit, and the Cage
compositor without trouble, but unfortunately I do not have the hardware
to test it... so I cannot really tell whether things work as expected.

> ---
>  package/sunxi-mali-utgard/Config.in           | 23 +++++++++++++++++++
>  .../sunxi-mali-utgard/sunxi-mali-utgard.mk    | 18 ++++++++++++---
>  2 files changed, 38 insertions(+), 3 deletions(-)
> 
> diff --git a/package/sunxi-mali-utgard/Config.in b/package/sunxi-mali-utgard/Config.in
> index 59ac21f5ab..0856f220fd 100644
> --- a/package/sunxi-mali-utgard/Config.in
> +++ b/package/sunxi-mali-utgard/Config.in
> @@ -18,6 +18,9 @@ config BR2_PACKAGE_PROVIDES_LIBEGL
>  config BR2_PACKAGE_PROVIDES_LIBGLES
>  	default "sunxi-mali-utgard"
>  
> +config BR2_PACKAGE_PROVIDES_LIBGBM
> +	default "sunxi-mali-utgard" if BR2_PACKAGE_SUNXI_MALI_UTGARD_WAYLAND
> +
>  choice
>  	prompt "Version"
>  	default BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 # legacy
> @@ -38,6 +41,26 @@ config BR2_PACKAGE_SUNXI_MALI_UTGARD_REVISION
>  	default "r6p2"	if BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2
>  	default "r8p1"	if BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1
>  
> +choice
> +	prompt "Platform"
> +	default BR2_PACKAGE_SUNXI_MALI_UTGARD_FBDEV
> +	help
> +	  Select the target EGL platform.
> +
> +config BR2_PACKAGE_SUNXI_MALI_UTGARD_FBDEV
> +	bool "fbdev"
> +config BR2_PACKAGE_SUNXI_MALI_UTGARD_WAYLAND
> +	bool "wayland"
> +	select BR2_PACKAGE_HAS_LIBEGL_WAYLAND
> +	select BR2_PACKAGE_HAS_LIBGBM
> +
> +endchoice
> +
> +config BR2_PACKAGE_SUNXI_MALI_UTGARD_PLATFORM
> +	string
> +	default "fbdev" if BR2_PACKAGE_SUNXI_MALI_UTGARD_FBDEV
> +	default "wayland" if BR2_PACKAGE_SUNXI_MALI_UTGARD_WAYLAND
> +
>  endif
>  
>  comment "sunxi-mali-utgard needs an EABIhf glibc toolchain"
> diff --git a/package/sunxi-mali-utgard/sunxi-mali-utgard.mk b/package/sunxi-mali-utgard/sunxi-mali-utgard.mk
> index f693667955..23c6e8ec6e 100644
> --- a/package/sunxi-mali-utgard/sunxi-mali-utgard.mk
> +++ b/package/sunxi-mali-utgard/sunxi-mali-utgard.mk
> @@ -24,9 +24,9 @@ endif
>  define SUNXI_MALI_UTGARD_INSTALL_STAGING_CMDS
>  	mkdir -p $(STAGING_DIR)/usr/lib $(STAGING_DIR)/usr/include
>  
> -	cp -rf $(@D)/$(SUNXI_MALI_UTGARD_REV)/$(SUNXI_MALI_UTGARD_ARCH)/fbdev/*.so* \
> +	cp -rf $(@D)/$(SUNXI_MALI_UTGARD_REV)/$(SUNXI_MALI_UTGARD_ARCH)/$(BR2_PACKAGE_SUNXI_MALI_UTGARD_PLATFORM)/*.so* \
>  		$(STAGING_DIR)/usr/lib/
> -	cp -rf $(@D)/include/fbdev/* $(STAGING_DIR)/usr/include/
> +	cp -rf $(@D)/include/$(BR2_PACKAGE_SUNXI_MALI_UTGARD_PLATFORM)/* $(STAGING_DIR)/usr/include/
>  
>  	$(INSTALL) -D -m 0644 package/sunxi-mali-utgard/egl.pc \
>  		$(STAGING_DIR)/usr/lib/pkgconfig/egl.pc
> @@ -34,9 +34,21 @@ define SUNXI_MALI_UTGARD_INSTALL_STAGING_CMDS
>  		$(STAGING_DIR)/usr/lib/pkgconfig/glesv2.pc
>  endef
>  
> +ifeq ($(BR2_PACKAGE_SUNXI_MALI_UTGARD_WAYLAND),y)
> +define SUNXI_MALI_UTGARD_INSTALL_FIXUP_STAGING_PC_FILES
> +	sed -e '/^Cflags:/s/$$/ -DWL_EGL_PLATFORM/' \
> +		-e '/^Requires:/s/$$/ wayland-client wayland-server/' \
> +		-i $(STAGING_DIR)/usr/lib/pkgconfig/egl.pc
> +	sed -e '/^Requires:/s/$$/ wayland-client wayland-server/' \
> +		-i $(STAGING_DIR)/usr/lib/pkgconfig/glesv2.pc
> +endef
> +SUNXI_MALI_UTGARD_POST_INSTALL_TARGET_HOOKS += SUNXI_MALI_UTGARD_INSTALL_FIXUP_STAGING_PC_FILES
> +SUNXI_MALI_UTGARD_DEPENDENCIES += wayland
> +endif
> +
>  define SUNXI_MALI_UTGARD_INSTALL_TARGET_CMDS
>  	mkdir -p $(TARGET_DIR)/usr/lib
> -	cp -rf $(@D)/$(SUNXI_MALI_UTGARD_REV)/$(SUNXI_MALI_UTGARD_ARCH)/fbdev/*.so* \
> +	cp -rf $(@D)/$(SUNXI_MALI_UTGARD_REV)/$(SUNXI_MALI_UTGARD_ARCH)/$(BR2_PACKAGE_SUNXI_MALI_UTGARD_PLATFORM)/*.so* \
>  		$(TARGET_DIR)/usr/lib/
>  endef
>  
> -- 
> 2.40.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
> 

Cheers,
—Adrián

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 150 bytes --]

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