[Buildroot] [PATCH v13 07/13] package/mesa3d: add a new option to enable GLX support

[Arnout Vandecappelle]

On 20/09/2019 18:38, Bernd Kuhls wrote:
> From: Romain Naour <romain.naour at smile.fr>
> 
> When switching to meson build system, enabling GLX support
> require at least one DRI or Gallium dirver.
> 
> So add a dependency on BR2_PACKAGE_MESA3D_DRIVER for
> BR2_PACKAGE_MESA3D_OPENGL_GLX option.
> 
> quoting the meson build system:
> "dri based GLX requires at least one DRI driver." [1]
> "Even when building just gallium drivers the user probably wants dri." [2]
> 
> [1] https://cgit.freedesktop.org/mesa/mesa/tree/meson.build?h=19.0#n340
> [2] https://cgit.freedesktop.org/mesa/mesa/tree/meson.build?h=19.0#n266
> 
> Signed-off-by: Romain Naour <romain.naour at smile.fr>
> [Bernd: moved x11 dependencies from glx condition to xorg7 condition to
>  fix build error with enabled egl without glx
>  BR2_PACKAGE_HAS_LIBGL needs to depend on BR2_PACKAGE_MESA3D_OPENGL_GLX]
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>

 Applied to master with two small changes as indicated below.

[snip]
> +config BR2_PACKAGE_MESA3D_OPENGL_GLX
> +	bool "OpenGL GLX"
> +	depends on BR2_PACKAGE_XORG7
> +	select BR2_PACKAGE_HAS_LIBGL
> +	select BR2_PACKAGE_LIBXCB
> +	select BR2_PACKAGE_XLIB_LIBX11
> +	select BR2_PACKAGE_XLIB_LIBXDAMAGE
> +	select BR2_PACKAGE_XLIB_LIBXEXT
> +	select BR2_PACKAGE_XLIB_LIBXFIXES
> +	select BR2_PACKAGE_XLIB_LIBXRANDR
> +	select BR2_PACKAGE_XLIB_LIBXXF86VM
> +	select BR2_PACKAGE_XORGPROTO
> +	help
> +	  Enable GLX graphic acceleration (OpenGL + X11).
> +	  GLX support needs X11 and at least one DRI or Gallium driver.

 This sentence doesn't help much since it's implied by the dependencies - you
can't even (easily) see the help text if the dependencies aren't satisfied...

> +
> +comment "OpenGL GLX support needs X11"
> +	depends on !BR2_PACKAGE_XORG7
> +
>  comment "Additional API Support"

 The APIs below are also OpenGL APIs, so I removed this comment.

 Regards,
 Arnout

>  
>  config BR2_PACKAGE_MESA3D_OPENGL_EGL
> @@ -301,7 +313,7 @@ config BR2_PACKAGE_MESA3D_OPENGL_ES
>  endif # BR2_PACKAGE_MESA3D_DRIVER
>  
>  config BR2_PACKAGE_PROVIDES_LIBGL
> -	default "mesa3d" if BR2_PACKAGE_XORG7
> +	default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_GLX
>  
>  config BR2_PACKAGE_PROVIDES_LIBEGL
>  	default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_EGL
> diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
> index caa38771e6..1987cb358a 100644
> --- a/package/mesa3d/mesa3d.mk
> +++ b/package/mesa3d/mesa3d.mk
> @@ -72,16 +72,7 @@ MESA3D_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mno-compact-eh"
>  MESA3D_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -mno-compact-eh"
>  endif
>  
> -ifeq ($(BR2_PACKAGE_XORG7),y)
> -MESA3D_DEPENDENCIES += \
> -	xlib_libX11 \
> -	xlib_libXext \
> -	xlib_libXdamage \
> -	xlib_libXfixes \
> -	xlib_libXrandr \
> -	xlib_libXxf86vm \
> -	xorgproto \
> -	libxcb
> +ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y)
>  MESA3D_CONF_OPTS += --enable-glx --disable-mangling
>  ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_XA),y)
>  MESA3D_CONF_OPTS += --enable-xa
> @@ -170,7 +161,7 @@ MESA3D_CONF_OPTS += --enable-opengl --enable-dri
>  MESA3D_CONF_OPTS += --disable-va
>  
>  # libGL is only provided for a full xorg stack
> -ifeq ($(BR2_PACKAGE_XORG7),y)
> +ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y)
>  MESA3D_PROVIDES += libgl
>  else
>  define MESA3D_REMOVE_OPENGL_HEADERS
> @@ -195,7 +186,16 @@ ifeq ($(BR2_PACKAGE_WAYLAND),y)
>  MESA3D_DEPENDENCIES += wayland wayland-protocols
>  MESA3D_PLATFORMS += wayland
>  endif
> -ifeq ($(BR2_PACKAGE_XORG7),y)
> +ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y)
> +MESA3D_DEPENDENCIES += \
> +	xlib_libX11 \
> +	xlib_libXext \
> +	xlib_libXdamage \
> +	xlib_libXfixes \
> +	xlib_libXrandr \
> +	xlib_libXxf86vm \
> +	xorgproto \
> +	libxcb
>  MESA3D_PLATFORMS += x11
>  endif
>  
>