diff mbox series

[1/2] package/wlroots: change mesa3d dependency to virtual libegl/libgles

Message ID 20210207105155.516654-1-gilles.talis@gmail.com
State Changes Requested
Headers show
Series [1/2] package/wlroots: change mesa3d dependency to virtual libegl/libgles | expand

Commit Message

Gilles Talis Feb. 7, 2021, 10:51 a.m. UTC
From: Julien Olivain <ju.o@free.fr>

Since commits:
https://github.com/swaywm/wlroots/commit/c2288a7b88240e4377bfc1c67b44efb58f704a42
https://github.com/swaywm/wlroots/commit/e18599b05e0f0cbeba11adbd489e801285470eab

Mesa dependency is no longer required. Wlroots is able to run on drivers
that provide EGL and GLES2.0 support (with specific EGL wayland extensions)

This was verified on NXP's i.MX8MMini using imx-gpu-viv driver.

Signed-off-by: Julien Olivain <ju.o@free.fr>
Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
---
 package/wlroots/Config.in  | 13 +++++--------
 package/wlroots/wlroots.mk |  3 ++-
 2 files changed, 7 insertions(+), 9 deletions(-)

Comments

Yann E. MORIN Feb. 7, 2021, 4:45 p.m. UTC | #1
Gilles, All,

On 2021-02-07 11:51 +0100, Gilles Talis spake thusly:
> From: Julien Olivain <ju.o@free.fr>
> 
> Since commits:
> https://github.com/swaywm/wlroots/commit/c2288a7b88240e4377bfc1c67b44efb58f704a42
> https://github.com/swaywm/wlroots/commit/e18599b05e0f0cbeba11adbd489e801285470eab
> 
> Mesa dependency is no longer required. Wlroots is able to run on drivers
> that provide EGL and GLES2.0 support (with specific EGL wayland extensions)

HEre, you said "with specific EGL wayland extensions", so...

[--SNIP--]
> @@ -12,11 +12,8 @@ config BR2_PACKAGE_WLROOTS
>  	depends on !BR2_STATIC_LIBS # wayland
>  	depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm, wayland
>  	depends on BR2_PACKAGE_HAS_UDEV # libinput
> -	# Technically wlroots should work with any OpenGL implementation
> -	# which provides EGL, GLES2, and libgbm; but in practice only
> -	# Mesa ships an usable libgbm.
> -	depends on BR2_PACKAGE_MESA3D_OPENGL_EGL
> -	depends on BR2_PACKAGE_MESA3D_OPENGL_ES
> +	depends on BR2_PACKAGE_HAS_LIBEGL

... should not that be also depend on BR2_PACKAGE_HAS_LIBEGL_WAYLAND ?

Note that BR2_PACKAGE_HAS_LIBEGL_WAYLAND is a sub-option of
BR2_PACKAGE_HAS_LIBEGL, so both should be added as dependency, but...

[--SNIP--]
> diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk
> index 5665d5a956..0160b1aedb 100644
> --- a/package/wlroots/wlroots.mk
> +++ b/package/wlroots/wlroots.mk
> @@ -15,7 +15,8 @@ WLROOTS_DEPENDENCIES = \
>  	host-wayland \
>  	libinput \
>  	libxkbcommon \
> -	mesa3d \
> +	libegl \

... indeed only libegl needs to be added to _DEPENDENCIES.

Regards,
Yann E. MORIN.

> +	libgles \
>  	pixman \
>  	udev \
>  	wayland \
> -- 
> 2.25.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Gilles Talis Feb. 8, 2021, 9:33 p.m. UTC | #2
Hello Yann,


Le dim. 7 févr. 2021 à 17:46, Yann E. MORIN <yann.morin.1998@free.fr> a écrit :
>
> Gilles, All,
>
> On 2021-02-07 11:51 +0100, Gilles Talis spake thusly:
> > From: Julien Olivain <ju.o@free.fr>
> >
> > Since commits:
> > https://github.com/swaywm/wlroots/commit/c2288a7b88240e4377bfc1c67b44efb58f704a42
> > https://github.com/swaywm/wlroots/commit/e18599b05e0f0cbeba11adbd489e801285470eab
> >
> > Mesa dependency is no longer required. Wlroots is able to run on drivers
> > that provide EGL and GLES2.0 support (with specific EGL wayland extensions)
>
> HEre, you said "with specific EGL wayland extensions", so...
>
> [--SNIP--]
> > @@ -12,11 +12,8 @@ config BR2_PACKAGE_WLROOTS
> >       depends on !BR2_STATIC_LIBS # wayland
> >       depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm, wayland
> >       depends on BR2_PACKAGE_HAS_UDEV # libinput
> > -     # Technically wlroots should work with any OpenGL implementation
> > -     # which provides EGL, GLES2, and libgbm; but in practice only
> > -     # Mesa ships an usable libgbm.
> > -     depends on BR2_PACKAGE_MESA3D_OPENGL_EGL
> > -     depends on BR2_PACKAGE_MESA3D_OPENGL_ES
> > +     depends on BR2_PACKAGE_HAS_LIBEGL
>
> ... should not that be also depend on BR2_PACKAGE_HAS_LIBEGL_WAYLAND ?
>
> Note that BR2_PACKAGE_HAS_LIBEGL_WAYLAND is a sub-option of
> BR2_PACKAGE_HAS_LIBEGL, so both should be added as dependency, but...
You're correct. Thanks for spotting that one.


>
> [--SNIP--]
> > diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk
> > index 5665d5a956..0160b1aedb 100644
> > --- a/package/wlroots/wlroots.mk
> > +++ b/package/wlroots/wlroots.mk
> > @@ -15,7 +15,8 @@ WLROOTS_DEPENDENCIES = \
> >       host-wayland \
> >       libinput \
> >       libxkbcommon \
> > -     mesa3d \
> > +     libegl \
>
> ... indeed only libegl needs to be added to _DEPENDENCIES.
>
> Regards,
> Yann E. MORIN.
>
> > +     libgles \
> >       pixman \
> >       udev \
> >       wayland \
> > --
> > 2.25.1
> >
> > _______________________________________________
> > buildroot mailing list
> > buildroot@busybox.net
> > http://lists.busybox.net/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.  |
> '------------------------------^-------^------------------^--------------------'

thanks for the review. I'll prepare and send a v2.
thanks
Gilles.
diff mbox series

Patch

diff --git a/package/wlroots/Config.in b/package/wlroots/Config.in
index 2f72fd4945..0dbe57eaad 100644
--- a/package/wlroots/Config.in
+++ b/package/wlroots/Config.in
@@ -1,6 +1,6 @@ 
-comment "wlroots needs udev, mesa3d w/ EGL and GLES support"
-	depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL || \
-		!BR2_PACKAGE_MESA3D_OPENGL_ES || \
+comment "wlroots needs udev, EGL and OpenGL ES support"
+	depends on !BR2_PACKAGE_HAS_LIBEGL || \
+		!BR2_PACKAGE_HAS_LIBGLES || \
 		!BR2_PACKAGE_HAS_UDEV
 
 comment "wlroots needs a toolchain w/ threads, dynamic library"
@@ -12,11 +12,8 @@  config BR2_PACKAGE_WLROOTS
 	depends on !BR2_STATIC_LIBS # wayland
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm, wayland
 	depends on BR2_PACKAGE_HAS_UDEV # libinput
-	# Technically wlroots should work with any OpenGL implementation
-	# which provides EGL, GLES2, and libgbm; but in practice only
-	# Mesa ships an usable libgbm.
-	depends on BR2_PACKAGE_MESA3D_OPENGL_EGL
-	depends on BR2_PACKAGE_MESA3D_OPENGL_ES
+	depends on BR2_PACKAGE_HAS_LIBEGL
+	depends on BR2_PACKAGE_HAS_LIBGLES
 	select BR2_PACKAGE_LIBDRM
 	select BR2_PACKAGE_LIBINPUT
 	select BR2_PACKAGE_LIBXKBCOMMON
diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk
index 5665d5a956..0160b1aedb 100644
--- a/package/wlroots/wlroots.mk
+++ b/package/wlroots/wlroots.mk
@@ -15,7 +15,8 @@  WLROOTS_DEPENDENCIES = \
 	host-wayland \
 	libinput \
 	libxkbcommon \
-	mesa3d \
+	libegl \
+	libgles \
 	pixman \
 	udev \
 	wayland \