[Buildroot] [PATCH v3 00/11] Weston package enhancements

[Buildroot] [PATCH v3 00/11] Weston package enhancements

[Gustavo Zacarias]

Changes for v3:
* Explicitly disable EGL if not available
* EGL requires mesa as provider
* libva can in fact be disabled/enabled
* Add explicit dbus support
* Add explicit lcms support
* Add explicit webp support
* Add explicit systemd support
* Add explicit libxml2 support

Changes for v2:
* Add libdrm dependency for DRM compositor
* Add weston-launch support
* Drop useless --disable-xwayland-test

Gustavo Zacarias (11):
  weston: add EGL support
  weston: set default backend for fbdev
  weston: add DRM compoitor support
  weston: handle optional libva support
  weston: add weston-launch support
  weston: drop --disable-xwayland-test
  weston: handle dbus dependency
  weston: handle lcms dependecy
  weston: handle webp dependency
  weston: handle systemd dependency
  weston: handle libxml2 dependency

 package/weston/Config.in | 10 ++++++
 package/weston/weston.mk | 82 ++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 83 insertions(+), 9 deletions(-)

-- 
2.7.3

[Buildroot] [PATCH v3 01/11] weston: add EGL support

[Gustavo Zacarias]

Also drop simple-egl-clients from the rpi compositor since it's a
duplicate of the global one.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/weston/weston.mk | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/package/weston/weston.mk b/package/weston/weston.mk
index d818071..e7ad97e 100644
--- a/package/weston/weston.mk
+++ b/package/weston/weston.mk
@@ -15,7 +15,6 @@ WESTON_DEPENDENCIES = host-pkgconf wayland wayland-protocols \
 
 WESTON_CONF_OPTS = \
 	--with-dtddir=$(STAGING_DIR)/usr/share/wayland \
-	--disable-egl \
 	--disable-simple-egl-clients \
 	--disable-xwayland \
 	--disable-x11-compositor \
@@ -28,6 +27,14 @@ WESTON_CONF_OPTS = \
 WESTON_MAKE_OPTS = \
 	WAYLAND_PROTOCOLS_DATADIR=$(STAGING_DIR)/usr/share/wayland-protocols
 
+# Needs wayland-egl, which normally only mesa provides
+ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_MESA3D_OPENGL_EGL),yy)
+WESTON_CONF_OPTS += --enable-egl
+WESTON_DEPENDENCIES += libegl
+else
+WESTON_CONF_OPTS += --disable-egl
+endif
+
 ifeq ($(BR2_PACKAGE_LIBUNWIND),y)
 WESTON_DEPENDENCIES += libunwind
 else
@@ -53,7 +60,6 @@ WESTON_CONF_OPTS += --enable-rpi-compositor \
 	--disable-resize-optimization \
 	--disable-setuid-install \
 	--disable-xwayland-test \
-	--disable-simple-egl-clients \
 	WESTON_NATIVE_BACKEND=rpi-backend.so
 else
 WESTON_CONF_OPTS += --disable-rpi-compositor
-- 
2.7.3

[Buildroot] [PATCH v3 02/11] weston: set default backend for fbdev

[Gustavo Zacarias]

When it's enabled set the default weston backend to fbdev, otherwise the
drm backend is the default even though we are not building it.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/weston/weston.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/weston/weston.mk b/package/weston/weston.mk
index e7ad97e..5af23df 100644
--- a/package/weston/weston.mk
+++ b/package/weston/weston.mk
@@ -49,7 +49,9 @@ WESTON_CONF_OPTS += --disable-rdp-compositor
 endif
 
 ifeq ($(BR2_PACKAGE_WESTON_FBDEV),y)
-WESTON_CONF_OPTS += --enable-fbdev-compositor
+WESTON_CONF_OPTS += \
+	--enable-fbdev-compositor \
+	WESTON_NATIVE_BACKEND=fbdev-backend.so
 else
 WESTON_CONF_OPTS += --disable-fbdev-compositor
 endif
-- 
2.7.3

[Buildroot] [PATCH v3 03/11] weston: add DRM compoitor support

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/weston/Config.in | 10 ++++++++++
 package/weston/weston.mk | 10 +++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/package/weston/Config.in b/package/weston/Config.in
index aaf1706..8cefa41 100644
--- a/package/weston/Config.in
+++ b/package/weston/Config.in
@@ -37,6 +37,16 @@ if BR2_PACKAGE_WESTON
 config BR2_PACKAGE_WESTON_HAS_COMPOSITOR
 	bool
 
+config BR2_PACKAGE_WESTON_DRM
+	bool "DRM compositor"
+	depends on BR2_PACKAGE_MESA3D_OPENGL_EGL
+	select BR2_PACKAGE_LIBDRM
+	select BR2_PACKAGE_WESTON_HAS_COMPOSITOR
+
+# Uses libgbm from mesa3d
+comment "DRM compositor needs an OpenGL EGL backend provided by mesa3d"
+	depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL
+
 config BR2_PACKAGE_WESTON_FBDEV
 	bool "fbdev compositor"
 
diff --git a/package/weston/weston.mk b/package/weston/weston.mk
index 5af23df..d600bc3 100644
--- a/package/weston/weston.mk
+++ b/package/weston/weston.mk
@@ -18,7 +18,6 @@ WESTON_CONF_OPTS = \
 	--disable-simple-egl-clients \
 	--disable-xwayland \
 	--disable-x11-compositor \
-	--disable-drm-compositor \
 	--disable-wayland-compositor \
 	--disable-headless-compositor \
 	--disable-weston-launch \
@@ -56,6 +55,15 @@ else
 WESTON_CONF_OPTS += --disable-fbdev-compositor
 endif
 
+ifeq ($(BR2_PACKAGE_WESTON_DRM),y)
+WESTON_CONF_OPTS += \
+	--enable-drm-compositor \
+	WESTON_NATIVE_BACKEND=drm-backend.so
+WESTON_DEPENDENCIES += libdrm
+else
+WESTON_CONF_OPTS += --disable-drm-compositor
+endif
+
 ifeq ($(BR2_PACKAGE_WESTON_RPI),y)
 WESTON_DEPENDENCIES += rpi-userland
 WESTON_CONF_OPTS += --enable-rpi-compositor \
-- 
2.7.3

[Buildroot] [PATCH v3 04/11] weston: handle optional libva support

[Gustavo Zacarias]

It's used for the recorder.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/weston/weston.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/weston/weston.mk b/package/weston/weston.mk
index d600bc3..08c6337 100644
--- a/package/weston/weston.mk
+++ b/package/weston/weston.mk
@@ -75,4 +75,11 @@ else
 WESTON_CONF_OPTS += --disable-rpi-compositor
 endif # BR2_PACKAGE_WESTON_RPI
 
+ifeq ($(BR2_PACKAGE_LIBVA),y)
+WESTON_CONF_OPTS += --enable-vaapi-recorder
+WESTON_DEPENDENIES += libva
+else
+WESTON_CONF_OPTS += --disable-vaapi-recorder
+endif
+
 $(eval $(autotools-package))
-- 
2.7.3

[Buildroot] [PATCH v3 05/11] weston: add weston-launch support

[Gustavo Zacarias]

The weston-launch supplemental group is for users to be able to
use/launch weston.
For a full weston(-launch) experience users should be at least members
of weston-launch, video (for framebuffer permissions) and optionally
audio.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/weston/weston.mk | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/package/weston/weston.mk b/package/weston/weston.mk
index 08c6337..e83abe0 100644
--- a/package/weston/weston.mk
+++ b/package/weston/weston.mk
@@ -20,12 +20,26 @@ WESTON_CONF_OPTS = \
 	--disable-x11-compositor \
 	--disable-wayland-compositor \
 	--disable-headless-compositor \
-	--disable-weston-launch \
-	--disable-colord
+	--disable-colord \
+	--disable-setuid-install
 
 WESTON_MAKE_OPTS = \
 	WAYLAND_PROTOCOLS_DATADIR=$(STAGING_DIR)/usr/share/wayland-protocols
 
+# weston-launch must be u+s root in order to work properly
+ifeq ($(BR2_PACKAGE_LINUX_PAM),y)
+define WESTON_PERMISSIONS
+	/usr/bin/weston-launch f 4755 0 0 - - - - -
+endef
+define WESTON_USERS
+	- - weston-launch -1 - - - - Weston launcher group
+endef
+WESTON_CONF_OPTS += --enable-weston-launch
+WESTON_DEPENDENCIES += linux-pam
+else
+WESTON_CONF_OPTS += --disable-weston-launch
+endif
+
 # Needs wayland-egl, which normally only mesa provides
 ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_MESA3D_OPENGL_EGL),yy)
 WESTON_CONF_OPTS += --enable-egl
@@ -68,7 +82,6 @@ ifeq ($(BR2_PACKAGE_WESTON_RPI),y)
 WESTON_DEPENDENCIES += rpi-userland
 WESTON_CONF_OPTS += --enable-rpi-compositor \
 	--disable-resize-optimization \
-	--disable-setuid-install \
 	--disable-xwayland-test \
 	WESTON_NATIVE_BACKEND=rpi-backend.so
 else
-- 
2.7.3

[Buildroot] [PATCH v3 06/11] weston: drop --disable-xwayland-test

[Gustavo Zacarias]

It's in the rpi backend block which makes no sense, and it depends on
xwayland being enabled which we currently don't support so remove it.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/weston/weston.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/weston/weston.mk b/package/weston/weston.mk
index e83abe0..363a2bf 100644
--- a/package/weston/weston.mk
+++ b/package/weston/weston.mk
@@ -82,7 +82,6 @@ ifeq ($(BR2_PACKAGE_WESTON_RPI),y)
 WESTON_DEPENDENCIES += rpi-userland
 WESTON_CONF_OPTS += --enable-rpi-compositor \
 	--disable-resize-optimization \
-	--disable-xwayland-test \
 	WESTON_NATIVE_BACKEND=rpi-backend.so
 else
 WESTON_CONF_OPTS += --disable-rpi-compositor
-- 
2.7.3

[Buildroot] [PATCH v3 07/11] weston: handle dbus dependency

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/weston/weston.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/weston/weston.mk b/package/weston/weston.mk
index 363a2bf..72190a8 100644
--- a/package/weston/weston.mk
+++ b/package/weston/weston.mk
@@ -26,6 +26,13 @@ WESTON_CONF_OPTS = \
 WESTON_MAKE_OPTS = \
 	WAYLAND_PROTOCOLS_DATADIR=$(STAGING_DIR)/usr/share/wayland-protocols
 
+ifeq ($(BR2_PACKAGE_DBUS),y)
+WESTON_CONF_OPTS += --enable-dbus
+WESTON_DEPENDENCIES += dbus
+else
+WESTON_CONF_OPTS += --disable-dbus
+endif
+
 # weston-launch must be u+s root in order to work properly
 ifeq ($(BR2_PACKAGE_LINUX_PAM),y)
 define WESTON_PERMISSIONS
-- 
2.7.3

[Buildroot] [PATCH v3 08/11] weston: handle lcms dependecy

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/weston/weston.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/weston/weston.mk b/package/weston/weston.mk
index 72190a8..e3a8f29 100644
--- a/package/weston/weston.mk
+++ b/package/weston/weston.mk
@@ -101,4 +101,11 @@ else
 WESTON_CONF_OPTS += --disable-vaapi-recorder
 endif
 
+ifeq ($(BR2_PACKAGE_LCMS2),y)
+WESTON_CONF_OPTS += --enable-lcms
+WESTON_DEPENDENCIES += lcms2
+else
+WESTON_CONF_OPTS += --disable-lcms
+endif
+
 $(eval $(autotools-package))
-- 
2.7.3

[Buildroot] [PATCH v3 09/11] weston: handle webp dependency

[Gustavo Zacarias]

It doesn't have an enable/disable switch so it's just the dependency.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/weston/weston.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/weston/weston.mk b/package/weston/weston.mk
index e3a8f29..de734e0 100644
--- a/package/weston/weston.mk
+++ b/package/weston/weston.mk
@@ -11,7 +11,8 @@ WESTON_LICENSE = MIT
 WESTON_LICENSE_FILES = COPYING
 
 WESTON_DEPENDENCIES = host-pkgconf wayland wayland-protocols \
-	libxkbcommon pixman libpng jpeg mtdev udev cairo libinput
+	libxkbcommon pixman libpng jpeg mtdev udev cairo libinput \
+	$(if $(BR2_PACKAGE_WEBP),webp)
 
 WESTON_CONF_OPTS = \
 	--with-dtddir=$(STAGING_DIR)/usr/share/wayland \
-- 
2.7.3

[Buildroot] [PATCH v3 10/11] weston: handle systemd dependency

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/weston/weston.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/weston/weston.mk b/package/weston/weston.mk
index de734e0..9313fcc 100644
--- a/package/weston/weston.mk
+++ b/package/weston/weston.mk
@@ -109,4 +109,11 @@ else
 WESTON_CONF_OPTS += --disable-lcms
 endif
 
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+WESTON_CONF_OPTS += --enable-systemd-login --enable-systemd-notify
+WESTON_DEPENDENCIES += systemd
+else
+WESTON_CONF_OPTS += --disable-systemd-login --disable-systemd-notify
+endif
+
 $(eval $(autotools-package))
-- 
2.7.3

[Buildroot] [PATCH v3 11/11] weston: handle libxml2 dependency

[Gustavo Zacarias]

It's used for JUnit XML output support.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/weston/weston.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/weston/weston.mk b/package/weston/weston.mk
index 9313fcc..2891fe3 100644
--- a/package/weston/weston.mk
+++ b/package/weston/weston.mk
@@ -116,4 +116,11 @@ else
 WESTON_CONF_OPTS += --disable-systemd-login --disable-systemd-notify
 endif
 
+ifeq ($(BR2_PACKAGE_LIBXML2),y)
+WESTON_CONF_OPTS += --enable-junit-xml
+WESTON_DEPENDENCIES += libxml2
+else
+WESTON_CONF_OPTS += --disable-junit-xml
+endif
+
 $(eval $(autotools-package))
-- 
2.7.3

[Buildroot] [PATCH v3 00/11] Weston package enhancements

[Thomas Petazzoni]

Hello,

On Tue, 29 Mar 2016 11:38:59 -0300, Gustavo Zacarias wrote:

> Gustavo Zacarias (11):
>   weston: add EGL support
>   weston: set default backend for fbdev
>   weston: add DRM compoitor support
>   weston: handle optional libva support
>   weston: add weston-launch support
>   weston: drop --disable-xwayland-test
>   weston: handle dbus dependency
>   weston: handle lcms dependecy
>   weston: handle webp dependency
>   weston: handle systemd dependency
>   weston: handle libxml2 dependency

I've applied all, but I have a few comments on a few of them, which
I'll do as reply to the patches themselves.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH v3 11/11] weston: handle libxml2 dependency

[Thomas Petazzoni]

Hello,

On Tue, 29 Mar 2016 11:39:10 -0300, Gustavo Zacarias wrote:
> It's used for JUnit XML output support.
> 
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
>  package/weston/weston.mk | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/package/weston/weston.mk b/package/weston/weston.mk
> index 9313fcc..2891fe3 100644
> --- a/package/weston/weston.mk
> +++ b/package/weston/weston.mk
> @@ -116,4 +116,11 @@ else
>  WESTON_CONF_OPTS += --disable-systemd-login --disable-systemd-notify
>  endif
>  
> +ifeq ($(BR2_PACKAGE_LIBXML2),y)
> +WESTON_CONF_OPTS += --enable-junit-xml
> +WESTON_DEPENDENCIES += libxml2
> +else
> +WESTON_CONF_OPTS += --disable-junit-xml
> +endif

Do we really care about this JUnit XML output support ?

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH v3 11/11] weston: handle libxml2 dependency

[Gustavo Zacarias]

On 30/03/16 12:02, Thomas Petazzoni wrote:

>> +ifeq ($(BR2_PACKAGE_LIBXML2),y)
>> +WESTON_CONF_OPTS += --enable-junit-xml
>> +WESTON_DEPENDENCIES += libxml2
>> +else
>> +WESTON_CONF_OPTS += --disable-junit-xml
>> +endif
>
> Do we really care about this JUnit XML output support ?
>
> Thomas

Probably not very useful, just wanted to cover all available possibilities.
Regards.