On Fri, Aug 23, 2019 at 11:42:23PM +0200, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel <[email protected]> > --- > rules/weston.in | 5 +++++ > rules/weston.make | 11 ++++++++--- > 2 files changed, 13 insertions(+), 3 deletions(-) > > diff --git a/rules/weston.in b/rules/weston.in > index 42dcb9eeadbe..a2d1c9ec8fbe 100644 > --- a/rules/weston.in > +++ b/rules/weston.in > @@ -39,6 +39,7 @@ menuconfig WESTON > select GST_PLUGINS_GOOD1_RTP if WESTON_REMOTING && RUNTIME > select GST_PLUGINS_GOOD1_UDP if WESTON_REMOTING && RUNTIME > select PANGO if WESTON_IVISHELL_EXAMPLE > + select PIPEWIRE if WESTON_PIPEWIRE
PIPEWIRE is not defined. Michael > prompt "weston " > help > Wayland compositor reference implementation > @@ -110,6 +111,10 @@ config WESTON_IVISHELL_EXAMPLE > application, a few demo clients and the weston.ini configuration for > the IVI-Shell. > > +config WESTON_PIPEWIRE > + bool > + prompt "pipewire plugin" > + > config WESTON_REMOTING > bool > prompt "remoting plugin" > diff --git a/rules/weston.make b/rules/weston.make > index 1dd13bfb32d3..4c38fd2d1aa1 100644 > --- a/rules/weston.make > +++ b/rules/weston.make > @@ -15,9 +15,9 @@ PACKAGES-$(PTXCONF_WESTON) += weston > # > # Paths and names > # > -WESTON_VERSION := 6.0.1 > -LIBWESTON_MAJOR := 6 > -WESTON_MD5 := e7b10710ef1eac82258f97bfd41fe534 > +WESTON_VERSION := 7.0.0 > +LIBWESTON_MAJOR := 7 > +WESTON_MD5 := cbfda483bc2501d0831af3f33c707850 > WESTON := weston-$(WESTON_VERSION) > WESTON_SUFFIX := tar.xz > WESTON_URL := > http://wayland.freedesktop.org/releases/$(WESTON).$(WESTON_SUFFIX) > @@ -53,9 +53,11 @@ WESTON_CONF_OPT := \ > -Dcolor-management-lcms=false \ > -Ddemo-clients=$(call ptx/truefalse,PTXCONF_WESTON_IVISHELL_EXAMPLE) \ > -Ddesktop-shell-client-default=weston-desktop-shell \ > + -Ddoc=false \ > -Dimage-jpeg=true \ > -Dimage-webp=false \ > -Dlauncher-logind=$(call ptx/truefalse,PTXCONF_WESTON_SYSTEMD_LOGIND) \ > + -Dpipewire=$(call ptx/truefalse,PTXCONF_WESTON_PIPEWIRE) \ > -Dremoting=$(call ptx/truefalse,PTXCONF_WESTON_REMOTING) \ > -Drenderer-gl=$(call ptx/truefalse,PTXCONF_WESTON_GL) \ > -Dresize-pool=true \ > @@ -154,6 +156,9 @@ 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_PIPEWIRE > + @$(call install_lib, weston, 0, 0, 0644, > libweston-$(LIBWESTON_MAJOR)/pipewire-plugin) > +endif > ifdef PTXCONF_WESTON_REMOTING > @$(call install_lib, weston, 0, 0, 0644, > libweston-$(LIBWESTON_MAJOR)/remoting-plugin) > endif > -- > 2.20.1 > > > _______________________________________________ > ptxdist mailing list > [email protected] > -- 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 [email protected]
