Skip to contentSkip to conversation

package/weston: replace autotools with meson

PATCH New James Hilliard 2 participants 3 messages Jun 24, 2019 – Aug 5, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 package/weston: replace autotools with meson

The autotools build system is in the process of being deprecated and replaced with meson for weston.

We need to enable pango when building demo clients since it is required by meson.

The dbus option in autotools is replaced with launcher-logind in meson.

We need to explicitly set the image-webp option to avoid failures when building without webp.

Replaced WESTON_NATIVE_BACKEND with backend-default in meson.

---
Changes v1 -> v2:
- Require both systemd and dbus for launcher-logind
- Move dmabuf-v4l out of egl/gl block
- Update imx-gpu-g2d requirement block

---
 package/weston/Config.in |  13 +++++
 package/weston/weston.mk | 107 +++++++++++++++++++--------------------
 2 files changed, 65 insertions(+), 55 deletions(-)
package/weston/Config.in +13 -0
index f874b0cc6a..243da7b6f3 100644
@@ -100,7 +100,20 @@ comment "XWayland support needs libepoxy and X.org enabled"
 
 config BR2_PACKAGE_WESTON_DEMO_CLIENTS
 	bool "demo clients"
+	depends on BR2_PACKAGE_MESA3D_OPENGL_EGL
+	depends on BR2_USE_WCHAR # pango
+	depends on BR2_TOOLCHAIN_HAS_THREADS # pango
+	depends on BR2_USE_MMU # pango
+	depends on BR2_INSTALL_LIBSTDCPP # pango
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango
+	select BR2_PACKAGE_PANGO
 	help
 	  This enables the installation of Weston's demo clients.
 
+comment "demo clients needs OpenGL EGL and a toolchain w/ wchar, threads, C++"
+	depends on BR2_USE_MMU
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
+		!BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_MESA3D_OPENGL_EGL
+
 endif
package/weston/weston.mk +52 -55

191 lines not on this page · raw message

Signature · 1 line
2.20.1
#1 lore raw

PATCH v2 1/1 package/weston: replace autotools with meson

Hello James,

package/weston/Config.in comment "XWayland support needs libepoxy and X.org enabled" · line 103

Quoted 3 lines · On Mon, 24 Jun 2019 12:11:45 -0600 James Hilliard <[email protected]>…

config BR2_PACKAGE_WESTON_DEMO_CLIENTS

package/weston/Config.in +1 -0
 	bool "demo clients"
+	depends on BR2_PACKAGE_MESA3D_OPENGL_EGL

Why is this option added as a dependency. I understand about the other depends on and the select on pango, but I don't understand this BR2_PACKAGE_MESA3D_OPENGL_EGL dependency.

package/weston/Config.in comment "XWayland support needs libepoxy and X.org enabled"

Quoted 10 lines
package/weston/Config.in +8 -0
+	depends on BR2_USE_WCHAR # pango
+	depends on BR2_TOOLCHAIN_HAS_THREADS # pango
+	depends on BR2_USE_MMU # pango
+	depends on BR2_INSTALL_LIBSTDCPP # pango
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango
+	select BR2_PACKAGE_PANGO
 	help
 	  This enables the installation of Weston's demo clients.
+# Uses VIDIOC_EXPBUF, only available from 3.8+
+ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8),)

If you want to say "build this when headers >= 3.8", then it should be:

ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8),y)

package/weston/weston.mk endef · line 86

Quoted 11 lines
package/weston/weston.mk +5 -2
+WESTON_CONF_OPTS +=	-Dsimple-clients=dmabuf-v4l
+else
+WESTON_CONF_OPTS +=	-Dsimple-clients=
 endif
 
 ifeq ($(BR2_PACKAGE_WESTON_FBDEV),y)
 WESTON_CONF_OPTS += \
-	--enable-fbdev-compositor \
-	WESTON_NATIVE_BACKEND=fbdev-backend.so
+	-Dbackend-fbdev=true \
+	-Dbackend-default=fbdev

I'm still not happy with the -Dbackend-default handling. Indeed, if you enable fbdev, and drm and x11, and xwayland, you are going to pass 4 -Dbackend-default options.

Is this backend-default option mandatory ? Perhaps we can leave it undefined, and simply have the user select the backend at runtime ? I suppose if there is only backend, weston is smart enough at runtime to use that one ?

Could you test with this -Dbackend-default option, making a runtime test ?

Thanks!

Thomas

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

PATCH v2 1/1 package/weston: replace autotools with meson

Quoted 6 lines · Thomas Petazzoni

Hello James,

On Mon, 24 Jun 2019 12:11:45 -0600
James Hilliard <[email protected]> wrote:

Quoted 7 lines
Quoted 3 lines

config BR2_PACKAGE_WESTON_DEMO_CLIENTS
bool "demo clients"
+ depends on BR2_PACKAGE_MESA3D_OPENGL_EGL

Why is this option added as a dependency. I understand about the other depends on and the select on pango, but I don't understand this BR2_PACKAGE_MESA3D_OPENGL_EGL dependency.

I think that was due to this:
https://gitlab.freedesktop.org/wayland/weston/blob/6.0.1/clients/meson.build#L271

Quoted 14 lines

package/weston/Config.in comment "XWayland support needs libepoxy and X.org enabled"

Quoted 11 lines
package/weston/Config.in +8 -0
+     depends on BR2_USE_WCHAR # pango
+     depends on BR2_TOOLCHAIN_HAS_THREADS # pango
+     depends on BR2_USE_MMU # pango
+     depends on BR2_INSTALL_LIBSTDCPP # pango
+     depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango
+     select BR2_PACKAGE_PANGO
      help
        This enables the installation of Weston's demo clients.
+# Uses VIDIOC_EXPBUF, only available from 3.8+
+ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8),)

If you want to say "build this when headers >= 3.8", then it should be:

Quoted 1 line

ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8),y)

will fix

Quoted 6 lines
Quoted 6 lines
package/weston/weston.mk +3 -0
+WESTON_CONF_OPTS +=  -Dsimple-clients=dmabuf-v4l
+else
+WESTON_CONF_OPTS +=  -Dsimple-clients=
 endif
Quoted 10 lines

package/weston/weston.mk endef · line 86

Quoted 6 lines

ifeq ($(BR2_PACKAGE_WESTON_FBDEV),y)
WESTON_CONF_OPTS += \

package/weston/weston.mk +2 -2
-     --enable-fbdev-compositor \
-     WESTON_NATIVE_BACKEND=fbdev-backend.so
+     -Dbackend-fbdev=true \
+     -Dbackend-default=fbdev

I'm still not happy with the -Dbackend-default handling. Indeed, if you enable fbdev, and drm and x11, and xwayland, you are going to pass 4 -Dbackend-default options.

Yeah, I agree, I've been trying to think of a better way to handle this.

Quoted 5 lines

Is this backend-default option mandatory ? Perhaps we can leave it undefined, and simply have the user select the backend at runtime ? I suppose if there is only backend, weston is smart enough at runtime to use that one ?

I'm not sure, maybe a kconfig choice menu is needed for selecting a default?

Quoted 3 lines

Could you test with this -Dbackend-default option, making a runtime test ?

I'll try and experiment.

Quoted 8 lines

Thanks!

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com