Skip to contentSkip to conversation

package/wlroots, package/cage: change mesa3d dependency to virtual libegl/libgles

PATCH New Gilles Talis 2 participants 2 messages Feb 13, 2021 – Feb 16, 2021

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 package/wlroots, package/cage: change mesa3d dependency to virtual libegl/libgles

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, and with specific EGL wayland extensions. (thus the BR2_PACKAGE_HAS_LIBEGL_WAYLAND dependency)

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

---
Changes v1 -> v2:
- Added BR2_PACKAGE_HAS_LIBEGL_WAYLAND dependency
- Squashed wlroots and cage patches in one single patch

 package/cage/Config.in     | 12 +++++++-----
 package/wlroots/Config.in  | 15 +++++++--------
 package/wlroots/wlroots.mk |  3 ++-
 3 files changed, 16 insertions(+), 14 deletions(-)
package/cage/Config.in +7 -5
index 3bef08f037..0844d6ff62 100644
@@ -1,6 +1,7 @@
-comment "cage needs udev, mesa3d w/ EGL and GLES support"
-	depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL || \
-		!BR2_PACKAGE_MESA3D_OPENGL_ES || \
+comment "cage needs udev, EGL w/ Wayland backend and OpenGL ES support"
+	depends on !BR2_PACKAGE_HAS_LIBEGL || \
+		!BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \
+		!BR2_PACKAGE_HAS_LIBGLES || \
 		!BR2_PACKAGE_HAS_UDEV
 
 comment "cage needs a toolchain w/ threads, dynamic library"
@@ -11,9 +12,10 @@ config BR2_PACKAGE_CAGE
 	bool "cage"
 	depends on !BR2_STATIC_LIBS # wlroots
 	depends on BR2_TOOLCHAIN_HAS_THREADS # wlroots
+	depends on BR2_PACKAGE_HAS_LIBEGL # wlroots
+	depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # wlroots
+	depends on BR2_PACKAGE_HAS_LIBGLES # wlroots
 	depends on BR2_PACKAGE_HAS_UDEV # wlroots
-	depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # wlroots
-	depends on BR2_PACKAGE_MESA3D_OPENGL_ES # wlroots
 	select BR2_PACKAGE_WLROOTS
 	help
 	  Kiosk compositor for Wayland, which displays a single
package/wlroots/Config.in +7 -8
index 2f72fd4945..694aa79de4 100644
@@ -1,6 +1,7 @@
-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 w/ Wayland backend and OpenGL ES support"
+	depends on !BR2_PACKAGE_HAS_LIBEGL || \
+		!BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \
+		!BR2_PACKAGE_HAS_LIBGLES || \
 		!BR2_PACKAGE_HAS_UDEV
 
 comment "wlroots needs a toolchain w/ threads, dynamic library"
@@ -12,11 +13,9 @@ 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_LIBEGL_WAYLAND
+	depends on BR2_PACKAGE_HAS_LIBGLES
 	select BR2_PACKAGE_LIBDRM
 	select BR2_PACKAGE_LIBINPUT
 	select BR2_PACKAGE_LIBXKBCOMMON
package/wlroots/wlroots.mk +2 -1
index 5665d5a956..0160b1aedb 100644
@@ -15,7 +15,8 @@ WLROOTS_DEPENDENCIES = \
 	host-wayland \
 	libinput \
 	libxkbcommon \
-	mesa3d \
+	libegl \
+	libgles \
 	pixman \
 	udev \
 	wayland \
Signature · 1 line
2.27.0
#1 lore raw

PATCH v2 1/1 package/wlroots, package/cage: change mesa3d dependency to virtual libegl/libgles

Quoted 8 lines · On Sat, 13 Feb 2021 13:33:53 +0100 Gilles Talis <[email protected]> wrote:

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, and with specific EGL wayland extensions. (thus the BR2_PACKAGE_HAS_LIBEGL_WAYLAND dependency)

Quoted 8 lines

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

---
Changes v1 -> v2:
- Added BR2_PACKAGE_HAS_LIBEGL_WAYLAND dependency
- Squashed wlroots and cage patches in one single patch

Applied to next, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com