* [ptxdist] [PATCH 1/3] weston: select WESTON_GL for PipeWire plugin
@ 2022-09-23 7:49 Michael Tretter
2022-09-23 7:49 ` [ptxdist] [PATCH 2/3] weston: add missing license file Michael Tretter
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Michael Tretter @ 2022-09-23 7:49 UTC (permalink / raw)
To: ptxdist; +Cc: mtr
Like the remoting plugin the PipeWire plugin uses DRM virtual, which
requires the renderer-gl.
Select WESTON_GL to avoid the error during configure.
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
rules/weston.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/rules/weston.in b/rules/weston.in
index 550eda4b19aa..6fe570e0a4b2 100644
--- a/rules/weston.in
+++ b/rules/weston.in
@@ -125,6 +125,7 @@ config WESTON_SHELL_KIOSK
config WESTON_PIPEWIRE
bool
+ select WESTON_GL
prompt "pipewire plugin"
config WESTON_REMOTING
--
2.30.2
^ permalink raw reply [flat|nested] 6+ messages in thread* [ptxdist] [PATCH 2/3] weston: add missing license file 2022-09-23 7:49 [ptxdist] [PATCH 1/3] weston: select WESTON_GL for PipeWire plugin Michael Tretter @ 2022-09-23 7:49 ` Michael Tretter 2022-09-28 14:29 ` [ptxdist] [APPLIED] " Michael Olbrich 2022-09-23 7:49 ` [ptxdist] [PATCH 3/3] weston: version bump 10.0.2 -> 11.0.0 Michael Tretter 2022-09-28 14:29 ` [ptxdist] [APPLIED] weston: select WESTON_GL for PipeWire plugin Michael Olbrich 2 siblings, 1 reply; 6+ messages in thread From: Michael Tretter @ 2022-09-23 7:49 UTC (permalink / raw) To: ptxdist; +Cc: mtr Add the Weston license file with the md5 hash. Signed-off-by: Michael Tretter <m.tretter@pengutronix.de> --- rules/weston.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/weston.make b/rules/weston.make index 552253a78cb9..adb24b0c739b 100644 --- a/rules/weston.make +++ b/rules/weston.make @@ -24,6 +24,7 @@ WESTON_URL := https://gitlab.freedesktop.org/wayland/weston/-/releases/$(WESTON_ WESTON_SOURCE := $(SRCDIR)/$(WESTON).$(WESTON_SUFFIX) WESTON_DIR := $(BUILDDIR)/$(WESTON) WESTON_LICENSE := MIT +WESTON_LICENSE_FILES := file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 # ---------------------------------------------------------------------------- # Prepare -- 2.30.2 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [APPLIED] weston: add missing license file 2022-09-23 7:49 ` [ptxdist] [PATCH 2/3] weston: add missing license file Michael Tretter @ 2022-09-28 14:29 ` Michael Olbrich 0 siblings, 0 replies; 6+ messages in thread From: Michael Olbrich @ 2022-09-28 14:29 UTC (permalink / raw) To: ptxdist; +Cc: Michael Tretter Thanks, applied as c74ee97ffc287e84b9809003c20152d827b1d495. Michael [sent from post-receive hook] On Wed, 28 Sep 2022 16:29:08 +0200, Michael Tretter <m.tretter@pengutronix.de> wrote: > Add the Weston license file with the md5 hash. > > Signed-off-by: Michael Tretter <m.tretter@pengutronix.de> > Message-Id: <20220923074908.2149330-2-m.tretter@pengutronix.de> > Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> > > diff --git a/rules/weston.make b/rules/weston.make > index 552253a78cb9..adb24b0c739b 100644 > --- a/rules/weston.make > +++ b/rules/weston.make > @@ -24,6 +24,7 @@ WESTON_URL := https://gitlab.freedesktop.org/wayland/weston/-/releases/$(WESTON_ > WESTON_SOURCE := $(SRCDIR)/$(WESTON).$(WESTON_SUFFIX) > WESTON_DIR := $(BUILDDIR)/$(WESTON) > WESTON_LICENSE := MIT > +WESTON_LICENSE_FILES := file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 > > # ---------------------------------------------------------------------------- > # Prepare ^ permalink raw reply [flat|nested] 6+ messages in thread
* [ptxdist] [PATCH 3/3] weston: version bump 10.0.2 -> 11.0.0 2022-09-23 7:49 [ptxdist] [PATCH 1/3] weston: select WESTON_GL for PipeWire plugin Michael Tretter 2022-09-23 7:49 ` [ptxdist] [PATCH 2/3] weston: add missing license file Michael Tretter @ 2022-09-23 7:49 ` Michael Tretter 2022-09-28 14:29 ` [ptxdist] [APPLIED] " Michael Olbrich 2022-09-28 14:29 ` [ptxdist] [APPLIED] weston: select WESTON_GL for PipeWire plugin Michael Olbrich 2 siblings, 1 reply; 6+ messages in thread From: Michael Tretter @ 2022-09-23 7:49 UTC (permalink / raw) To: ptxdist; +Cc: mtr Bump Weston to version 11.0.0 The fbdev backend and the wl_shell support have been removed. Remove the config items, too. weston-info has been replaced by wayland-info. Enable WAYLAND_UTILS to get wayland-info. libweston-desktop has been merged into libweston. Signed-off-by: Michael Tretter <m.tretter@pengutronix.de> --- rules/weston.in | 14 -------------- rules/weston.make | 15 +++++---------- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/rules/weston.in b/rules/weston.in index 6fe570e0a4b2..a698a7491509 100644 --- a/rules/weston.in +++ b/rules/weston.in @@ -59,20 +59,6 @@ config WESTON_HEADLESS_COMPOSITOR bool prompt "headless compositor" -config WESTON_FBDEV_COMPOSITOR - bool - prompt "fbdev compositor" - -config WESTON_DEPRECATED_WL_SHELL - bool - prompt "enable the deprecated wl-shell protocol" - help - Allow clients to use the deprecated wl-shell protocol. - - The wl-shell is deprecated. If you have to enable this option, - consider migrating your clients to the xdg-shell protocol and - disabling this option. - config WESTON_STARTSCRIPT bool default y diff --git a/rules/weston.make b/rules/weston.make index adb24b0c739b..cbfbe624c03c 100644 --- a/rules/weston.make +++ b/rules/weston.make @@ -15,9 +15,9 @@ PACKAGES-$(PTXCONF_WESTON) += weston # # Paths and names # -WESTON_VERSION := 10.0.2 -LIBWESTON_MAJOR := 10 -WESTON_MD5 := 8d46c0c0dd5c2ddfdced0a79ea7b6155 +WESTON_VERSION := 11.0.0 +LIBWESTON_MAJOR := 11 +WESTON_MD5 := ce50a4b11e5bb6d4a3a517ab34e86aa5 WESTON := weston-$(WESTON_VERSION) WESTON_SUFFIX := tar.xz WESTON_URL := https://gitlab.freedesktop.org/wayland/weston/-/releases/$(WESTON_VERSION)/downloads/$(WESTON).$(WESTON_SUFFIX) @@ -43,12 +43,10 @@ WESTON_CONF_OPT := \ -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) \ - -Ddeprecated-backend-fbdev=$(call ptx/truefalse,PTXCONF_WESTON_FBDEV_COMPOSITOR) \ - -Ddeprecated-weston-launch=false \ - -Ddeprecated-wl-shell=$(call ptx/truefalse,PTXCONF_WESTON_DEPRECATED_WL_SHELL) \ + -Ddeprecated-color-management-colord=false \ + -Ddeprecated-color-management-static=false \ -Ddesktop-shell-client-default=weston-desktop-shell \ -Ddoc=false \ -Dimage-jpeg=true \ @@ -66,7 +64,6 @@ WESTON_CONF_OPT := \ -Dshell-kiosk=$(call ptx/truefalse,PTXCONF_WESTON_SHELL_KIOSK) \ -Dsimple-clients=$(subst $(space),$(comma),$(WESTON_SIMPLE_CLIENTS-y)) \ -Dsystemd=$(call ptx/truefalse,PTXCONF_WESTON_SYSTEMD) \ - -Dtest-gl-renderer=false \ -Dtest-junit-xml=false \ -Dtest-skip-is-failure=false \ -Dtools=calibrator,debug,info,terminal,touch-calibrator \ @@ -106,7 +103,6 @@ $(STATEDIR)/weston.targetinstall: @$(call install_fixup, weston,DESCRIPTION,"wayland reference compositor implementation") @$(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) @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-screenshooter) ifdef PTXCONF_WESTON_SIMPLE_CLIENTS @@ -129,7 +125,6 @@ ifdef PTXCONF_WESTON_WCAP_TOOLS endif @$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)) - @$(call install_lib, weston, 0, 0, 0644, libweston-desktop-$(LIBWESTON_MAJOR)) ifdef PTXCONF_WESTON_XWAYLAND @$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)/xwayland) endif -- 2.30.2 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [APPLIED] weston: version bump 10.0.2 -> 11.0.0 2022-09-23 7:49 ` [ptxdist] [PATCH 3/3] weston: version bump 10.0.2 -> 11.0.0 Michael Tretter @ 2022-09-28 14:29 ` Michael Olbrich 0 siblings, 0 replies; 6+ messages in thread From: Michael Olbrich @ 2022-09-28 14:29 UTC (permalink / raw) To: ptxdist; +Cc: Michael Tretter Thanks, applied as e013639da85280bd02e53c1fb8e4adaa01e8f08f. Michael [sent from post-receive hook] On Wed, 28 Sep 2022 16:29:09 +0200, Michael Tretter <m.tretter@pengutronix.de> wrote: > Bump Weston to version 11.0.0 > > The fbdev backend and the wl_shell support have been removed. Remove the > config items, too. > > weston-info has been replaced by wayland-info. Enable WAYLAND_UTILS to > get wayland-info. > > libweston-desktop has been merged into libweston. > > Signed-off-by: Michael Tretter <m.tretter@pengutronix.de> > Message-Id: <20220923074908.2149330-3-m.tretter@pengutronix.de> > Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> > > diff --git a/rules/weston.in b/rules/weston.in > index 6fe570e0a4b2..a698a7491509 100644 > --- a/rules/weston.in > +++ b/rules/weston.in > @@ -59,20 +59,6 @@ config WESTON_HEADLESS_COMPOSITOR > bool > prompt "headless compositor" > > -config WESTON_FBDEV_COMPOSITOR > - bool > - prompt "fbdev compositor" > - > -config WESTON_DEPRECATED_WL_SHELL > - bool > - prompt "enable the deprecated wl-shell protocol" > - help > - Allow clients to use the deprecated wl-shell protocol. > - > - The wl-shell is deprecated. If you have to enable this option, > - consider migrating your clients to the xdg-shell protocol and > - disabling this option. > - > config WESTON_STARTSCRIPT > bool > default y > diff --git a/rules/weston.make b/rules/weston.make > index adb24b0c739b..cbfbe624c03c 100644 > --- a/rules/weston.make > +++ b/rules/weston.make > @@ -15,9 +15,9 @@ PACKAGES-$(PTXCONF_WESTON) += weston > # > # Paths and names > # > -WESTON_VERSION := 10.0.2 > -LIBWESTON_MAJOR := 10 > -WESTON_MD5 := 8d46c0c0dd5c2ddfdced0a79ea7b6155 > +WESTON_VERSION := 11.0.0 > +LIBWESTON_MAJOR := 11 > +WESTON_MD5 := ce50a4b11e5bb6d4a3a517ab34e86aa5 > WESTON := weston-$(WESTON_VERSION) > WESTON_SUFFIX := tar.xz > WESTON_URL := https://gitlab.freedesktop.org/wayland/weston/-/releases/$(WESTON_VERSION)/downloads/$(WESTON).$(WESTON_SUFFIX) > @@ -43,12 +43,10 @@ WESTON_CONF_OPT := \ > -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) \ > - -Ddeprecated-backend-fbdev=$(call ptx/truefalse,PTXCONF_WESTON_FBDEV_COMPOSITOR) \ > - -Ddeprecated-weston-launch=false \ > - -Ddeprecated-wl-shell=$(call ptx/truefalse,PTXCONF_WESTON_DEPRECATED_WL_SHELL) \ > + -Ddeprecated-color-management-colord=false \ > + -Ddeprecated-color-management-static=false \ > -Ddesktop-shell-client-default=weston-desktop-shell \ > -Ddoc=false \ > -Dimage-jpeg=true \ > @@ -66,7 +64,6 @@ WESTON_CONF_OPT := \ > -Dshell-kiosk=$(call ptx/truefalse,PTXCONF_WESTON_SHELL_KIOSK) \ > -Dsimple-clients=$(subst $(space),$(comma),$(WESTON_SIMPLE_CLIENTS-y)) \ > -Dsystemd=$(call ptx/truefalse,PTXCONF_WESTON_SYSTEMD) \ > - -Dtest-gl-renderer=false \ > -Dtest-junit-xml=false \ > -Dtest-skip-is-failure=false \ > -Dtools=calibrator,debug,info,terminal,touch-calibrator \ > @@ -106,7 +103,6 @@ $(STATEDIR)/weston.targetinstall: > @$(call install_fixup, weston,DESCRIPTION,"wayland reference compositor implementation") > > @$(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) > @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-screenshooter) > ifdef PTXCONF_WESTON_SIMPLE_CLIENTS > @@ -129,7 +125,6 @@ ifdef PTXCONF_WESTON_WCAP_TOOLS > endif > > @$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)) > - @$(call install_lib, weston, 0, 0, 0644, libweston-desktop-$(LIBWESTON_MAJOR)) > ifdef PTXCONF_WESTON_XWAYLAND > @$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)/xwayland) > endif ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [APPLIED] weston: select WESTON_GL for PipeWire plugin 2022-09-23 7:49 [ptxdist] [PATCH 1/3] weston: select WESTON_GL for PipeWire plugin Michael Tretter 2022-09-23 7:49 ` [ptxdist] [PATCH 2/3] weston: add missing license file Michael Tretter 2022-09-23 7:49 ` [ptxdist] [PATCH 3/3] weston: version bump 10.0.2 -> 11.0.0 Michael Tretter @ 2022-09-28 14:29 ` Michael Olbrich 2 siblings, 0 replies; 6+ messages in thread From: Michael Olbrich @ 2022-09-28 14:29 UTC (permalink / raw) To: ptxdist; +Cc: Michael Tretter Thanks, applied as 32d47ffd00174f8d1443875c55807d8439778883. Michael [sent from post-receive hook] On Wed, 28 Sep 2022 16:29:06 +0200, Michael Tretter <m.tretter@pengutronix.de> wrote: > Like the remoting plugin the PipeWire plugin uses DRM virtual, which > requires the renderer-gl. > > Select WESTON_GL to avoid the error during configure. > > Signed-off-by: Michael Tretter <m.tretter@pengutronix.de> > Message-Id: <20220923074908.2149330-1-m.tretter@pengutronix.de> > Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> > > diff --git a/rules/weston.in b/rules/weston.in > index 550eda4b19aa..6fe570e0a4b2 100644 > --- a/rules/weston.in > +++ b/rules/weston.in > @@ -125,6 +125,7 @@ config WESTON_SHELL_KIOSK > > config WESTON_PIPEWIRE > bool > + select WESTON_GL > prompt "pipewire plugin" > > config WESTON_REMOTING ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-09-28 14:30 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-09-23 7:49 [ptxdist] [PATCH 1/3] weston: select WESTON_GL for PipeWire plugin Michael Tretter 2022-09-23 7:49 ` [ptxdist] [PATCH 2/3] weston: add missing license file Michael Tretter 2022-09-28 14:29 ` [ptxdist] [APPLIED] " Michael Olbrich 2022-09-23 7:49 ` [ptxdist] [PATCH 3/3] weston: version bump 10.0.2 -> 11.0.0 Michael Tretter 2022-09-28 14:29 ` [ptxdist] [APPLIED] " Michael Olbrich 2022-09-28 14:29 ` [ptxdist] [APPLIED] weston: select WESTON_GL for PipeWire plugin Michael Olbrich
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox