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.za...@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
