* [ptxdist] [PATCH 2/4] weston: optionally build and install remoting plugin
2019-03-28 9:32 [ptxdist] [PATCH 1/4] weston: bump version 5.0.0 -> 6.0.0 Philipp Zabel
@ 2019-03-28 9:32 ` Philipp Zabel
2019-03-28 9:32 ` [ptxdist] [PATCH 3/4] weston: optionally install simple clients Philipp Zabel
` (4 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Philipp Zabel @ 2019-03-28 9:32 UTC (permalink / raw)
To: ptxdist
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 36ab6257b47f..d42eaf27ed75 100644
--- a/rules/weston.in
+++ b/rules/weston.in
@@ -30,6 +30,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
prompt "weston "
help
Wayland compositor reference implementation
@@ -101,4 +103,8 @@ 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"
+
endif
diff --git a/rules/weston.make b/rules/weston.make
index 73c16a607479..c093fdf65f63 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -55,7 +55,7 @@ WESTON_CONF_OPT := \
-Dxwayland=$(call ptx/truefalse,PTXCONF_WESTON_XWAYLAND) \
-Dxwayland-path=/usr/bin/Xwayland \
-Dsystemd=$(call ptx/truefalse,PTXCONF_WESTON_SYSTEMD) \
- -Dremoting=false \
+ -Dremoting=$(call ptx/truefalse,PTXCONF_WESTON_REMOTING) \
-Dshell-desktop=true \
-Dshell-fullscreen=true \
-Dshell-ivi=false \
@@ -140,6 +140,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
^ permalink raw reply [flat|nested] 8+ messages in thread* [ptxdist] [PATCH 3/4] weston: optionally install simple clients
2019-03-28 9:32 [ptxdist] [PATCH 1/4] weston: bump version 5.0.0 -> 6.0.0 Philipp Zabel
2019-03-28 9:32 ` [ptxdist] [PATCH 2/4] weston: optionally build and install remoting plugin Philipp Zabel
@ 2019-03-28 9:32 ` Philipp Zabel
2019-03-28 9:32 ` [ptxdist] [PATCH 4/4] weston: optionally install touch calibrator Philipp Zabel
` (3 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Philipp Zabel @ 2019-03-28 9:32 UTC (permalink / raw)
To: ptxdist
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 d42eaf27ed75..5974ac910125 100644
--- a/rules/weston.in
+++ b/rules/weston.in
@@ -107,4 +107,10 @@ config WESTON_REMOTING
bool
prompt "remoting plugin"
+config WESTON_SIMPLE_CLIENTS
+ bool
+ prompt "simple clients"
+ help
+ Install the weston-simple-* test clients.
+
endif
diff --git a/rules/weston.make b/rules/weston.make
index c093fdf65f63..942a66c67f5e 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -117,6 +117,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
^ permalink raw reply [flat|nested] 8+ messages in thread* [ptxdist] [PATCH 4/4] weston: optionally install touch calibrator
2019-03-28 9:32 [ptxdist] [PATCH 1/4] weston: bump version 5.0.0 -> 6.0.0 Philipp Zabel
2019-03-28 9:32 ` [ptxdist] [PATCH 2/4] weston: optionally build and install remoting plugin Philipp Zabel
2019-03-28 9:32 ` [ptxdist] [PATCH 3/4] weston: optionally install simple clients Philipp Zabel
@ 2019-03-28 9:32 ` Philipp Zabel
2019-03-29 6:15 ` [ptxdist] [PATCH 1/4] weston: bump version 5.0.0 -> 6.0.0 Michael Olbrich
` (2 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Philipp Zabel @ 2019-03-28 9:32 UTC (permalink / raw)
To: ptxdist
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 5974ac910125..e4ab8780863e 100644
--- a/rules/weston.in
+++ b/rules/weston.in
@@ -113,4 +113,11 @@ config WESTON_SIMPLE_CLIENTS
help
Install the weston-simple-* test clients.
+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 942a66c67f5e..7cfad5eb12fe 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -128,6 +128,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
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [ptxdist] [PATCH 1/4] weston: bump version 5.0.0 -> 6.0.0
2019-03-28 9:32 [ptxdist] [PATCH 1/4] weston: bump version 5.0.0 -> 6.0.0 Philipp Zabel
` (2 preceding siblings ...)
2019-03-28 9:32 ` [ptxdist] [PATCH 4/4] weston: optionally install touch calibrator Philipp Zabel
@ 2019-03-29 6:15 ` Michael Olbrich
2019-03-29 6:48 ` Michael Olbrich
2019-03-29 7:55 ` Michael Tretter
2019-03-29 8:31 ` Michael Olbrich
5 siblings, 1 reply; 8+ messages in thread
From: Michael Olbrich @ 2019-03-29 6:15 UTC (permalink / raw)
To: Philipp Zabel, ptxdist
On Thu, Mar 28, 2019 at 10:32:07AM +0100, Philipp Zabel wrote:
> - 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>
> ---
> rules/weston.make | 90 +++++++++++++++++++++++------------------------
> 1 file changed, 45 insertions(+), 45 deletions(-)
>
> diff --git a/rules/weston.make b/rules/weston.make
> index fa0577d92650..73c16a607479 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,47 @@ WESTON_LICENSE := MIT
> # Prepare
> # ----------------------------------------------------------------------------
>
> -#
> -# autoconf
> -#
> -WESTON_CONF_TOOL := autoconf
ifdef PTXCONF_ARCH_X86
> +WESTON_SIMPLE_DMABUF_DRM-$(PTXCONF_LIBDRM_INTEL) += intel
endif
> +WESTON_SIMPLE_DMABUF_DRM-$(PTXCONF_LIBDRM_FREEDRENO) += freedreno
> +WESTON_SIMPLE_DMABUF_DRM-$(PTXCONF_LIBDRM_ETNAVIV) += etnaviv
And don't use options from other packages. This breaks dev packages.
Mirror these options locally (see e.g. igt-gpu-tools).
> +
> +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-drm=$(call ptx/truefalse,PTXCONF_WESTON_DRM_COMPOSITOR) \
> + -Dbackend-drm-screencast-vaapi=false \
> + -Dbackend-headless=$(call ptx/truefalse,PTXCONF_WESTON_HEADLESS_COMPOSITOR) \
> + -Dbackend-rdp=false \
> + -Dscreenshare=false \
> + -Dbackend-wayland=$(call ptx/truefalse,PTXCONF_WESTON_GL) \
> + -Dbackend-x11=false \
> + -Dbackend-fbdev=$(call ptx/truefalse,PTXCONF_WESTON_FBDEV_COMPOSITOR) \
> + -Dbackend-default=drm \
> + -Drenderer-gl=$(call ptx/truefalse,PTXCONF_WESTON_GL) \
> + -Dweston-launch=$(call ptx/truefalse,PTXCONF_WESTON_LAUNCH) \
> + -Dxwayland=$(call ptx/truefalse,PTXCONF_WESTON_XWAYLAND) \
> + -Dxwayland-path=/usr/bin/Xwayland \
> + -Dsystemd=$(call ptx/truefalse,PTXCONF_WESTON_SYSTEMD) \
> + -Dremoting=false \
> + -Dshell-desktop=true \
> + -Dshell-fullscreen=true \
> + -Dshell-ivi=false \
> + -Ddesktop-shell-client-default=weston-desktop-shell \
> + -Dcolor-management-lcms=false \
> + -Dcolor-management-colord=false \
> + -Dlauncher-logind=$(call ptx/truefalse,PTXCONF_SYSTEMD_LOGIND) \
> + -Dimage-jpeg=true \
> + -Dimage-webp=false \
> + -Dtools=calibrator,debug,info,terminal,touch-calibrator \
> + -Dsimple-dmabuf-drm=$(subst $(space),$(comma),$(WESTON_SIMPLE_DMABUF_DRM-y)) \
> + -Ddemo-clients=false \
> + -Dsimple-clients=$(subst $(space),$(comma),$(WESTON_SIMPLE_CLIENTS-y)) \
> + -Dresize-pool=true \
> + -Dwcap-decode=$(call ptx/truefalse,PTXCONF_WESTON_PCAP_TOOLS) \
PTXCONF_WESTON_WCAP_TOOLS (with a W).
Michael
> + -Dtest-junit-xml=false
>
> # ----------------------------------------------------------------------------
> # Install
> @@ -113,9 +112,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 +151,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
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [ptxdist] [PATCH 1/4] weston: bump version 5.0.0 -> 6.0.0
2019-03-29 6:15 ` [ptxdist] [PATCH 1/4] weston: bump version 5.0.0 -> 6.0.0 Michael Olbrich
@ 2019-03-29 6:48 ` Michael Olbrich
0 siblings, 0 replies; 8+ messages in thread
From: Michael Olbrich @ 2019-03-29 6:48 UTC (permalink / raw)
To: Philipp Zabel, ptxdist
On Fri, Mar 29, 2019 at 07:15:59AM +0100, Michael Olbrich wrote:
> On Thu, Mar 28, 2019 at 10:32:07AM +0100, Philipp Zabel wrote:
> > - 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>
> > ---
> > rules/weston.make | 90 +++++++++++++++++++++++------------------------
> > 1 file changed, 45 insertions(+), 45 deletions(-)
> >
> > diff --git a/rules/weston.make b/rules/weston.make
> > index fa0577d92650..73c16a607479 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,47 @@ WESTON_LICENSE := MIT
> > # Prepare
> > # ----------------------------------------------------------------------------
> >
> > -#
> > -# autoconf
> > -#
> > -WESTON_CONF_TOOL := autoconf
>
> ifdef PTXCONF_ARCH_X86
> > +WESTON_SIMPLE_DMABUF_DRM-$(PTXCONF_LIBDRM_INTEL) += intel
> endif
>
> > +WESTON_SIMPLE_DMABUF_DRM-$(PTXCONF_LIBDRM_FREEDRENO) += freedreno
> > +WESTON_SIMPLE_DMABUF_DRM-$(PTXCONF_LIBDRM_ETNAVIV) += etnaviv
>
> And don't use options from other packages. This breaks dev packages.
> Mirror these options locally (see e.g. igt-gpu-tools).
>
> > +
> > +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-drm=$(call ptx/truefalse,PTXCONF_WESTON_DRM_COMPOSITOR) \
> > + -Dbackend-drm-screencast-vaapi=false \
> > + -Dbackend-headless=$(call ptx/truefalse,PTXCONF_WESTON_HEADLESS_COMPOSITOR) \
> > + -Dbackend-rdp=false \
> > + -Dscreenshare=false \
> > + -Dbackend-wayland=$(call ptx/truefalse,PTXCONF_WESTON_GL) \
> > + -Dbackend-x11=false \
> > + -Dbackend-fbdev=$(call ptx/truefalse,PTXCONF_WESTON_FBDEV_COMPOSITOR) \
> > + -Dbackend-default=drm \
> > + -Drenderer-gl=$(call ptx/truefalse,PTXCONF_WESTON_GL) \
> > + -Dweston-launch=$(call ptx/truefalse,PTXCONF_WESTON_LAUNCH) \
> > + -Dxwayland=$(call ptx/truefalse,PTXCONF_WESTON_XWAYLAND) \
> > + -Dxwayland-path=/usr/bin/Xwayland \
> > + -Dsystemd=$(call ptx/truefalse,PTXCONF_WESTON_SYSTEMD) \
> > + -Dremoting=false \
> > + -Dshell-desktop=true \
> > + -Dshell-fullscreen=true \
> > + -Dshell-ivi=false \
> > + -Ddesktop-shell-client-default=weston-desktop-shell \
> > + -Dcolor-management-lcms=false \
> > + -Dcolor-management-colord=false \
> > + -Dlauncher-logind=$(call ptx/truefalse,PTXCONF_SYSTEMD_LOGIND) \
> > + -Dimage-jpeg=true \
> > + -Dimage-webp=false \
> > + -Dtools=calibrator,debug,info,terminal,touch-calibrator \
> > + -Dsimple-dmabuf-drm=$(subst $(space),$(comma),$(WESTON_SIMPLE_DMABUF_DRM-y)) \
> > + -Ddemo-clients=false \
> > + -Dsimple-clients=$(subst $(space),$(comma),$(WESTON_SIMPLE_CLIENTS-y)) \
> > + -Dresize-pool=true \
> > + -Dwcap-decode=$(call ptx/truefalse,PTXCONF_WESTON_PCAP_TOOLS) \
And sort these. Check with configure_helper.py to make sure the order is
correct.
Michael
>
> PTXCONF_WESTON_WCAP_TOOLS (with a W).
>
> Michael
>
> > + -Dtest-junit-xml=false
> >
> > # ----------------------------------------------------------------------------
> > # Install
> > @@ -113,9 +112,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 +151,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
>
> --
> Pengutronix e.K. | |
> Industrial Linux Solutions | http://www.pengutronix.de/ |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 1/4] weston: bump version 5.0.0 -> 6.0.0
2019-03-28 9:32 [ptxdist] [PATCH 1/4] weston: bump version 5.0.0 -> 6.0.0 Philipp Zabel
` (3 preceding siblings ...)
2019-03-29 6:15 ` [ptxdist] [PATCH 1/4] weston: bump version 5.0.0 -> 6.0.0 Michael Olbrich
@ 2019-03-29 7:55 ` Michael Tretter
2019-03-29 8:31 ` Michael Olbrich
5 siblings, 0 replies; 8+ messages in thread
From: Michael Tretter @ 2019-03-29 7:55 UTC (permalink / raw)
To: Philipp Zabel; +Cc: ptxdist
On Thu, 28 Mar 2019 10:32:07 +0100, Philipp Zabel wrote:
> - 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>
> ---
> rules/weston.make | 90 +++++++++++++++++++++++------------------------
> 1 file changed, 45 insertions(+), 45 deletions(-)
>
> diff --git a/rules/weston.make b/rules/weston.make
> index fa0577d92650..73c16a607479 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,47 @@ WESTON_LICENSE := MIT
> # Prepare
> # ----------------------------------------------------------------------------
>
> -#
> -# autoconf
> -#
> -WESTON_CONF_TOOL := autoconf
> +WESTON_SIMPLE_DMABUF_DRM-$(PTXCONF_LIBDRM_INTEL) += intel
> +WESTON_SIMPLE_DMABUF_DRM-$(PTXCONF_LIBDRM_FREEDRENO) += freedreno
> +WESTON_SIMPLE_DMABUF_DRM-$(PTXCONF_LIBDRM_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-drm=$(call ptx/truefalse,PTXCONF_WESTON_DRM_COMPOSITOR) \
> + -Dbackend-drm-screencast-vaapi=false \
> + -Dbackend-headless=$(call ptx/truefalse,PTXCONF_WESTON_HEADLESS_COMPOSITOR) \
> + -Dbackend-rdp=false \
> + -Dscreenshare=false \
> + -Dbackend-wayland=$(call ptx/truefalse,PTXCONF_WESTON_GL) \
> + -Dbackend-x11=false \
> + -Dbackend-fbdev=$(call ptx/truefalse,PTXCONF_WESTON_FBDEV_COMPOSITOR) \
> + -Dbackend-default=drm \
> + -Drenderer-gl=$(call ptx/truefalse,PTXCONF_WESTON_GL) \
> + -Dweston-launch=$(call ptx/truefalse,PTXCONF_WESTON_LAUNCH) \
> + -Dxwayland=$(call ptx/truefalse,PTXCONF_WESTON_XWAYLAND) \
> + -Dxwayland-path=/usr/bin/Xwayland \
> + -Dsystemd=$(call ptx/truefalse,PTXCONF_WESTON_SYSTEMD) \
> + -Dremoting=false \
> + -Dshell-desktop=true \
> + -Dshell-fullscreen=true \
> + -Dshell-ivi=false \
-Dshell-ivi=$(call ptx/truefalse,PTXCONF_WESTON_IVISHELL) \
> + -Ddesktop-shell-client-default=weston-desktop-shell \
> + -Dcolor-management-lcms=false \
> + -Dcolor-management-colord=false \
> + -Dlauncher-logind=$(call ptx/truefalse,PTXCONF_SYSTEMD_LOGIND) \
> + -Dimage-jpeg=true \
> + -Dimage-webp=false \
> + -Dtools=calibrator,debug,info,terminal,touch-calibrator \
> + -Dsimple-dmabuf-drm=$(subst $(space),$(comma),$(WESTON_SIMPLE_DMABUF_DRM-y)) \
> + -Ddemo-clients=false \
-Ddemo-clients=$(call ptx/truefalse,PTXCONF_WESTON_IVISHELL_EXAMPLE) \
As the demo clients depend on pangocairo, PANGO must be selected if
PTXCONF_WESTON_IVISHELL_EXAMPLE is enabled.
Michael
> + -Dsimple-clients=$(subst $(space),$(comma),$(WESTON_SIMPLE_CLIENTS-y)) \
> + -Dresize-pool=true \
> + -Dwcap-decode=$(call ptx/truefalse,PTXCONF_WESTON_PCAP_TOOLS) \
> + -Dtest-junit-xml=false
>
> # ----------------------------------------------------------------------------
> # Install
> @@ -113,9 +112,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 +151,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)
>
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [ptxdist] [PATCH 1/4] weston: bump version 5.0.0 -> 6.0.0
2019-03-28 9:32 [ptxdist] [PATCH 1/4] weston: bump version 5.0.0 -> 6.0.0 Philipp Zabel
` (4 preceding siblings ...)
2019-03-29 7:55 ` Michael Tretter
@ 2019-03-29 8:31 ` Michael Olbrich
5 siblings, 0 replies; 8+ messages in thread
From: Michael Olbrich @ 2019-03-29 8:31 UTC (permalink / raw)
To: Philipp Zabel; +Cc: ptxdist
On Thu, Mar 28, 2019 at 10:32:07AM +0100, Philipp Zabel wrote:
> - 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>
> ---
> rules/weston.make | 90 +++++++++++++++++++++++------------------------
> 1 file changed, 45 insertions(+), 45 deletions(-)
>
> diff --git a/rules/weston.make b/rules/weston.make
> index fa0577d92650..73c16a607479 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,47 @@ WESTON_LICENSE := MIT
> # Prepare
> # ----------------------------------------------------------------------------
>
> -#
> -# autoconf
> -#
> -WESTON_CONF_TOOL := autoconf
> +WESTON_SIMPLE_DMABUF_DRM-$(PTXCONF_LIBDRM_INTEL) += intel
> +WESTON_SIMPLE_DMABUF_DRM-$(PTXCONF_LIBDRM_FREEDRENO) += freedreno
> +WESTON_SIMPLE_DMABUF_DRM-$(PTXCONF_LIBDRM_ETNAVIV) += etnaviv
> +
> +WESTON_SIMPLE_CLIENTS-y := damage im shm touch
> +WESTON_SIMPLE_CLIENTS-$(PTXCONF_WESTON_GL) += egl dmabuf-egl
> +
> +WESTON_CONF_TOOL := meson
'select HOST_MESON' is missing in weston.in
Michael
> 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-drm=$(call ptx/truefalse,PTXCONF_WESTON_DRM_COMPOSITOR) \
> + -Dbackend-drm-screencast-vaapi=false \
> + -Dbackend-headless=$(call ptx/truefalse,PTXCONF_WESTON_HEADLESS_COMPOSITOR) \
> + -Dbackend-rdp=false \
> + -Dscreenshare=false \
> + -Dbackend-wayland=$(call ptx/truefalse,PTXCONF_WESTON_GL) \
> + -Dbackend-x11=false \
> + -Dbackend-fbdev=$(call ptx/truefalse,PTXCONF_WESTON_FBDEV_COMPOSITOR) \
> + -Dbackend-default=drm \
> + -Drenderer-gl=$(call ptx/truefalse,PTXCONF_WESTON_GL) \
> + -Dweston-launch=$(call ptx/truefalse,PTXCONF_WESTON_LAUNCH) \
> + -Dxwayland=$(call ptx/truefalse,PTXCONF_WESTON_XWAYLAND) \
> + -Dxwayland-path=/usr/bin/Xwayland \
> + -Dsystemd=$(call ptx/truefalse,PTXCONF_WESTON_SYSTEMD) \
> + -Dremoting=false \
> + -Dshell-desktop=true \
> + -Dshell-fullscreen=true \
> + -Dshell-ivi=false \
> + -Ddesktop-shell-client-default=weston-desktop-shell \
> + -Dcolor-management-lcms=false \
> + -Dcolor-management-colord=false \
> + -Dlauncher-logind=$(call ptx/truefalse,PTXCONF_SYSTEMD_LOGIND) \
> + -Dimage-jpeg=true \
> + -Dimage-webp=false \
> + -Dtools=calibrator,debug,info,terminal,touch-calibrator \
> + -Dsimple-dmabuf-drm=$(subst $(space),$(comma),$(WESTON_SIMPLE_DMABUF_DRM-y)) \
> + -Ddemo-clients=false \
> + -Dsimple-clients=$(subst $(space),$(comma),$(WESTON_SIMPLE_CLIENTS-y)) \
> + -Dresize-pool=true \
> + -Dwcap-decode=$(call ptx/truefalse,PTXCONF_WESTON_PCAP_TOOLS) \
> + -Dtest-junit-xml=false
>
> # ----------------------------------------------------------------------------
> # Install
> @@ -113,9 +112,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 +151,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
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 8+ messages in thread