[ptxdist] [PATCH v2 1/4] weston: bump version 5.0.0 -> 6.0.0

[ptxdist] [PATCH v2 1/4] weston: bump version 5.0.0 -> 6.0.0

[Philipp Zabel]

- switch build system to Meson
- weston-screenshooter is now installed in /usr/bin
- build and install debug tool

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>

---
Changes since v1:
- select HOST_MESON
- hook up missing IVI shell options
- select PANGO if IVI shell example is enabled
- mirror libdrm options locally
- limit libdrm_intel use to ARCH_X86
- sort Meson options to please scripts/configure_helper.py
- fix WESTON_WCAP_TOOLS typo
---
 rules/weston.in   | 14 ++++++++
 rules/weston.make | 92 ++++++++++++++++++++++++-----------------------
 2 files changed, 61 insertions(+), 45 deletions(-)

diff --git a/rules/weston.in b/rules/weston.in
index 36ab6257b47f..27e360b69553 100644
--- a/rules/weston.in
+++ b/rules/weston.in
@@ -2,6 +2,7 @@
 
 menuconfig WESTON
 	tristate
+	select HOST_MESON
 	select LIBC_UTIL
 	select PIXMAN
 	select WAYLAND
@@ -30,6 +31,7 @@ menuconfig WESTON
 	select SYSTEMD			if WESTON_SYSTEMD
 	select SYSTEMD_LOGIND		if WESTON_SYSTEMD_LOGIND
 	select DBUS			if WESTON_SYSTEMD_LOGIND
+	select PANGO			if WESTON_IVISHELL_EXAMPLE
 	prompt "weston                        "
 	help
 	  Wayland compositor reference implementation
@@ -101,4 +103,16 @@ config WESTON_IVISHELL_EXAMPLE
 	  application, a few demo clients and the weston.ini configuration for
 	  the IVI-Shell.
 
+config WESTON_SIMPLE_DMABUF_DRM_INTEL
+        bool
+        default LIBDRM_INTEL
+
+config WESTON_SIMPLE_DMABUF_DRM_FREEDRENO
+        bool
+        default LIBDRM_FREEDRENO
+
+config WESTON_SIMPLE_DMABUF_DRM_ETNAVIV
+        bool
+        default LIBDRM_ETNAVIV
+
 endif
diff --git a/rules/weston.make b/rules/weston.make
index fa0577d92650..2bc2605fb1d2 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -17,9 +17,9 @@ PACKAGES-$(PTXCONF_WESTON) += weston
 #
 # Paths and names
 #
-WESTON_VERSION	:= 5.0.0
-LIBWESTON_MAJOR := 5
-WESTON_MD5	:= 752a04ce3c65af4884cfac4e57231bdb
+WESTON_VERSION	:= 6.0.0
+LIBWESTON_MAJOR := 6
+WESTON_MD5	:= 7c634e262f8a464a076c97fd50ad36b3
 WESTON		:= weston-$(WESTON_VERSION)
 WESTON_SUFFIX	:= tar.xz
 WESTON_URL	:= http://wayland.freedesktop.org/releases/$(WESTON).$(WESTON_SUFFIX)
@@ -31,48 +31,49 @@ WESTON_LICENSE	:= MIT
 # Prepare
 # ----------------------------------------------------------------------------
 
-#
-# autoconf
-#
-WESTON_CONF_TOOL	:= autoconf
+ifdef PTXCONF_ARCH_X86
+WESTON_SIMPLE_DMABUF_DRM-$(PTXCONF_WESTON_SIMPLE_DMABUF_DRM_INTEL) += intel
+endif
+WESTON_SIMPLE_DMABUF_DRM-$(PTXCONF_WESTON_SIMPLE_DMABUF_DRM_FREEDRENO) += freedreno
+WESTON_SIMPLE_DMABUF_DRM-$(PTXCONF_WESTON_SIMPLE_DMABUF_DRM_ETNAVIV) += etnaviv
+
+WESTON_SIMPLE_CLIENTS-y := damage im shm touch
+WESTON_SIMPLE_CLIENTS-$(PTXCONF_WESTON_GL) += egl dmabuf-egl
+
+WESTON_CONF_TOOL	:= meson
 WESTON_CONF_OPT		:= \
-	$(CROSS_AUTOCONF_USR) \
-	$(GLOBAL_LARGE_FILE_OPTION) \
-	--disable-static \
-	--enable-shared \
-	--disable-devdocs \
-	--$(call ptx/endis, PTXCONF_WESTON_GL)-egl \
-	--disable-setuid-install \
-	--$(call ptx/endis, PTXCONF_WESTON_XWAYLAND)-xwayland \
-	--disable-xwayland-test \
-	--disable-x11-compositor \
-	--$(call ptx/endis, PTXCONF_WESTON_DRM_COMPOSITOR)-drm-compositor \
-	--$(call ptx/endis, PTXCONF_WESTON_GL)-wayland-compositor \
-	--$(call ptx/endis, PTXCONF_WESTON_HEADLESS_COMPOSITOR)-headless-compositor \
-	--$(call ptx/endis, PTXCONF_WESTON_FBDEV_COMPOSITOR)-fbdev-compositor \
-	--disable-rdp-compositor \
-	--disable-screen-sharing \
-	--disable-vaapi-recorder \
-	--enable-simple-clients \
-	--$(call ptx/endis, PTXCONF_WESTON_GL)-simple-egl-clients \
-	--disable-simple-dmabuf-drm-client \
-	--disable-simple-dmabuf-v4l-client \
-	--enable-clients \
-	--enable-resize-optimization \
-	--$(call ptx/endis, PTXCONF_WESTON_LAUNCH)-weston-launch \
-	--enable-fullscreen-shell \
-	--disable-colord \
-	--$(call ptx/endis, PTXCONF_WESTON_SYSTEMD_LOGIND)-dbus \
-	--$(call ptx/endis, PTXCONF_WESTON_SYSTEMD_LOGIND)-systemd-login \
-	--disable-junit-xml \
-	--$(call ptx/endis, PTXCONF_WESTON_IVISHELL)-ivi-shell \
-	--$(call ptx/endis, PTXCONF_WESTON_WCAP_TOOLS)-wcap-tools \
-	--$(call ptx/endis, PTXCONF_WESTON_IVISHELL_EXAMPLE)-demo-clients-install \
-	--disable-lcms \
-	--$(call ptx/endis, PTXCONF_WESTON_SYSTEMD)-systemd-notify \
-	--with-cairo=$(call ptx/ifdef, PTXCONF_WESTON_GL,glesv2,image) \
-	--with-jpeg \
-	--without-webp
+	$(CROSS_MESON_USR) \
+	-Dbackend-default=drm \
+	-Dbackend-drm=$(call ptx/truefalse,PTXCONF_WESTON_DRM_COMPOSITOR) \
+	-Dbackend-drm-screencast-vaapi=false \
+	-Dbackend-fbdev=$(call ptx/truefalse,PTXCONF_WESTON_FBDEV_COMPOSITOR) \
+	-Dbackend-headless=$(call ptx/truefalse,PTXCONF_WESTON_HEADLESS_COMPOSITOR) \
+	-Dbackend-rdp=false \
+	-Dbackend-wayland=$(call ptx/truefalse,PTXCONF_WESTON_GL) \
+	-Dbackend-x11=false \
+	-Dcolor-management-colord=false \
+	-Dcolor-management-lcms=false \
+	-Ddemo-clients=$(call ptx/truefalse,PTXCONF_WESTON_IVISHELL_EXAMPLE) \
+	-Ddesktop-shell-client-default=weston-desktop-shell \
+	-Dimage-jpeg=true \
+	-Dimage-webp=false \
+	-Dlauncher-logind=$(call ptx/truefalse,PTXCONF_SYSTEMD_LOGIND) \
+	-Dremoting=false \
+	-Drenderer-gl=$(call ptx/truefalse,PTXCONF_WESTON_GL) \
+	-Dresize-pool=true \
+	-Dscreenshare=false \
+	-Dshell-desktop=true \
+	-Dshell-fullscreen=true \
+	-Dshell-ivi=$(call ptx/truefalse,PTXCONF_WESTON_IVISHELL) \
+	-Dsimple-clients=$(subst $(space),$(comma),$(WESTON_SIMPLE_CLIENTS-y)) \
+	-Dsimple-dmabuf-drm=$(subst $(space),$(comma),$(WESTON_SIMPLE_DMABUF_DRM-y)) \
+	-Dsystemd=$(call ptx/truefalse,PTXCONF_WESTON_SYSTEMD) \
+	-Dtest-junit-xml=false \
+	-Dtools=calibrator,debug,info,terminal,touch-calibrator \
+	-Dwcap-decode=$(call ptx/truefalse,PTXCONF_WESTON_WCAP_TOOLS) \
+	-Dweston-launch=$(call ptx/truefalse,PTXCONF_WESTON_LAUNCH) \
+	-Dxwayland=$(call ptx/truefalse,PTXCONF_WESTON_XWAYLAND) \
+	-Dxwayland-path=/usr/bin/Xwayland
 
 # ----------------------------------------------------------------------------
 # Install
@@ -113,9 +114,11 @@ $(STATEDIR)/weston.targetinstall:
 
 	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston)
 	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-info)
+	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-debug)
 ifdef PTXCONF_WESTON_LAUNCH
 	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-launch)
 endif
+	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-screenshooter)
 	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-terminal)
 
 ifdef PTXCONF_WESTON_WCAP_TOOLS
@@ -150,7 +153,6 @@ ifdef PTXCONF_WESTON_SYSTEMD
 endif
 
 	@$(call install_copy, weston, 0, 0, 0755, -, /usr/libexec/weston-simple-im)
-	@$(call install_copy, weston, 0, 0, 0755, -, /usr/libexec/weston-screenshooter)
 	@$(call install_copy, weston, 0, 0, 0755, -, /usr/libexec/weston-desktop-shell)
 	@$(call install_copy, weston, 0, 0, 0755, -, /usr/libexec/weston-keyboard)
 
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 2/4] weston: optionally build and install remoting plugin

[Philipp Zabel]

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/weston.in   | 6 ++++++
 rules/weston.make | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/rules/weston.in b/rules/weston.in
index 27e360b69553..992c5961f565 100644
--- a/rules/weston.in
+++ b/rules/weston.in
@@ -31,6 +31,8 @@ menuconfig WESTON
 	select SYSTEMD			if WESTON_SYSTEMD
 	select SYSTEMD_LOGIND		if WESTON_SYSTEMD_LOGIND
 	select DBUS			if WESTON_SYSTEMD_LOGIND
+	select GSTREAMER1		if WESTON_REMOTING
+	select GST_PLUGINS_BASE1	if WESTON_REMOTING
 	select PANGO			if WESTON_IVISHELL_EXAMPLE
 	prompt "weston                        "
 	help
@@ -103,6 +105,10 @@ config WESTON_IVISHELL_EXAMPLE
 	  application, a few demo clients and the weston.ini configuration for
 	  the IVI-Shell.
 
+config WESTON_REMOTING
+	bool
+	prompt "remoting plugin"
+
 config WESTON_SIMPLE_DMABUF_DRM_INTEL
         bool
         default LIBDRM_INTEL
diff --git a/rules/weston.make b/rules/weston.make
index 2bc2605fb1d2..0a823746c9cc 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -58,7 +58,7 @@ WESTON_CONF_OPT		:= \
 	-Dimage-jpeg=true \
 	-Dimage-webp=false \
 	-Dlauncher-logind=$(call ptx/truefalse,PTXCONF_SYSTEMD_LOGIND) \
-	-Dremoting=false \
+	-Dremoting=$(call ptx/truefalse,PTXCONF_WESTON_REMOTING) \
 	-Drenderer-gl=$(call ptx/truefalse,PTXCONF_WESTON_GL) \
 	-Dresize-pool=true \
 	-Dscreenshare=false \
@@ -142,6 +142,9 @@ endif
 ifdef PTXCONF_WESTON_GL
 	@$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)/wayland-backend)
 	@$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)/gl-renderer)
+endif
+ifdef PTXCONF_WESTON_REMOTING
+	@$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)/remoting-plugin)
 endif
 	@$(call install_lib, weston, 0, 0, 0644, weston/desktop-shell)
 	@$(call install_lib, weston, 0, 0, 0644, weston/fullscreen-shell)
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 3/4] weston: optionally install simple clients

[Philipp Zabel]

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/weston.in   |  6 ++++++
 rules/weston.make | 10 ++++++++++
 2 files changed, 16 insertions(+)

diff --git a/rules/weston.in b/rules/weston.in
index 992c5961f565..200656e2e483 100644
--- a/rules/weston.in
+++ b/rules/weston.in
@@ -109,6 +109,12 @@ config WESTON_REMOTING
 	bool
 	prompt "remoting plugin"
 
+config WESTON_SIMPLE_CLIENTS
+	bool
+	prompt "simple clients"
+	help
+	  Install the weston-simple-* test clients.
+
 config WESTON_SIMPLE_DMABUF_DRM_INTEL
         bool
         default LIBDRM_INTEL
diff --git a/rules/weston.make b/rules/weston.make
index 0a823746c9cc..9622719a6e88 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -119,6 +119,16 @@ ifdef PTXCONF_WESTON_LAUNCH
 	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-launch)
 endif
 	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-screenshooter)
+ifdef PTXCONF_WESTON_SIMPLE_CLIENTS
+	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-simple-damage)
+	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-simple-dmabuf-drm)
+ifdef PTXCONF_WESTON_GL
+	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-simple-egl)
+	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-simple-dmabuf-egl)
+endif
+	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-simple-shm)
+	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-simple-touch)
+endif
 	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-terminal)
 
 ifdef PTXCONF_WESTON_WCAP_TOOLS
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 4/4] weston: optionally install touch calibrator

[Philipp Zabel]

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/weston.in   | 7 +++++++
 rules/weston.make | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/rules/weston.in b/rules/weston.in
index 200656e2e483..9a4541dab074 100644
--- a/rules/weston.in
+++ b/rules/weston.in
@@ -127,4 +127,11 @@ config WESTON_SIMPLE_DMABUF_DRM_ETNAVIV
         bool
         default LIBDRM_ETNAVIV
 
+config WESTON_TOUCH_CALIBRATOR
+	bool
+	prompt "touch calibrator"
+	help
+	  Install weston-touch-calibrator tool, interface must be enabled in
+	  weston.ini.
+
 endif
diff --git a/rules/weston.make b/rules/weston.make
index 9622719a6e88..c1021d65e846 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -130,6 +130,9 @@ endif
 	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-simple-touch)
 endif
 	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-terminal)
+ifdef PTXCONF_WESTON_TOUCH_CALIBRATOR
+	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-touch-calibrator)
+endif
 
 ifdef PTXCONF_WESTON_WCAP_TOOLS
 	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/wcap-decode)
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de