Re: [ptxdist] [PATCH] weston: version bump 9.0.0 -> 10.0.0
On Fri, 04 Feb 2022 13:31:34 +0100, Michael Olbrich wrote: > On Fri, Feb 04, 2022 at 11:29:16AM +0100, Michael Tretter wrote: > > Drop the WESTON_DRM_COMPOSITOR option and always build the drm backend. > > It was unconditionally selected as the default anyway and not building > > the backend results in a build failure. > > > > Drop WESTON_LAUNCH, as the weston-launch is deprecated and was BROKEN > > anyway. > > > > Add WESTON_SEATD to enable the libseat-launcher. > > > > Add WESTON_DEPRECATED_WL_SHELL, which defaults to false to enable the > > deprecated wl-shell if clients still require it. > > > > Remove BROKEN from WESTON_PIPEWIRE, as PTXdist now includes Pipewire. > > > > Update the installation of the example config files to use the files > > that are generated by Weston instead of generating it in the rule file > > > > Signed-off-by: Michael Tretter > > --- > > rules/weston.in | 36 ++-- > > rules/weston.make | 31 +-- > > 2 files changed, 31 insertions(+), 36 deletions(-) > > > > diff --git a/rules/weston.in b/rules/weston.in > > index 0005ca1c33cf..05b61d14e64d 100644 > > --- a/rules/weston.in > > +++ b/rules/weston.in > > @@ -13,11 +13,11 @@ menuconfig WESTON > > select LIBINPUT > > select CAIRO > > select CAIRO_PNG > > - select LIBDRM if WESTON_DRM_COMPOSITOR || BUILDTIME > > - select UDEV if WESTON_DRM_COMPOSITOR || > > WESTON_FBDEV_COMPOSITOR > > - select UDEV_LIBUDEV if WESTON_DRM_COMPOSITOR || > > WESTON_FBDEV_COMPOSITOR > > + select LIBDRM if BUILDTIME > > + select UDEV if WESTON_FBDEV_COMPOSITOR > > + select UDEV_LIBUDEV if WESTON_FBDEV_COMPOSITOR > > This looks wrong. If the drm backend is enabled unconditionally then the > dependencies should be as well. A right. These should be always selected. > > > select MESALIB if WESTON_GL > > - select MESALIB_GBM if WESTON_DRM_COMPOSITOR && WESTON_GL > > + select MESALIB_GBM if WESTON_GL > > select MESALIB_EGL if WESTON_GL > > select MESALIB_EGL_WAYLAND if WESTON_GL > > select MESALIB_GLES2if WESTON_GL > > @@ -28,6 +28,7 @@ menuconfig WESTON > > select XORG_LIB_XCURSOR if WESTON_XWAYLAND > > select XORG_SERVER if WESTON_XWAYLAND && RUNTIME > > select XORG_SERVER_XWAYLAND if WESTON_XWAYLAND && RUNTIME > > + select SEATDif WESTON_SEATD > > select SYSTEMD if WESTON_SYSTEMD > > select SYSTEMD_LOGIND if WESTON_SYSTEMD_LOGIND > > select DBUS if WESTON_SYSTEMD_LOGIND > > @@ -39,6 +40,7 @@ menuconfig WESTON > > select GST_PLUGINS_GOOD1_RTPif WESTON_REMOTING && RUNTIME > > select GST_PLUGINS_GOOD1_UDPif WESTON_REMOTING && RUNTIME > > select PANGOif WESTON_IVISHELL_EXAMPLE > > + select PIPEWIRE if WESTON_PIPEWIRE > > prompt "weston" > > help > > Wayland compositor reference implementation > > @@ -49,13 +51,8 @@ config WESTON_XWAYLAND > > bool > > prompt "Xwayland support" > > > > -config WESTON_DRM_COMPOSITOR > > - bool > > - prompt "drm compositor" > > - > > config WESTON_GL > > bool > > - depends on WESTON_DRM_COMPOSITOR > > prompt "OpenGL accelerated compositing" > > > > config WESTON_HEADLESS_COMPOSITOR > > @@ -66,14 +63,16 @@ config WESTON_FBDEV_COMPOSITOR > > bool > > prompt "fbdev compositor" > > > > -config WESTON_LAUNCH > > +config WESTON_DEPRECATED_WL_SHELL > > bool > > - prompt "weston-launch support" > > - # needs pam > > - depends on BROKEN > > + default n > > drop this line. It's the default. Ack. > > > + prompt "enable the deprecated wl-shell protocol" > > help > > - weston-launch is a setuid-root program which does privileged > > - operations on Weston's behalf > > + 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 > > @@ -81,6 +80,10 @@ config WESTON_STARTSCRIPT > > depends on INITMETHOD_BBINIT > > prompt "install /etc/init.d/weston-init" > > > > +config WESTON_SEATD > > + bool > > + default y > > Why add an option when it's always enabled? This should actually be an option that can be disabled. I will add the missing prompt. > > > + > > config WESTON_SYSTEMD > > bool > > default INITMETHOD_SYSTEMD > > @@ -123,12 +126,9 @@ config WESTON_SHELL_KIOSK > > config WESTON_PIPEWIRE > > bool > > prompt "pipewire plugin" > > - # needs pipewire > > - depends on BROKEN > > > > config WESTON_REMOTING > >
Re: [ptxdist] [PATCH] weston: version bump 9.0.0 -> 10.0.0
On Fri, Feb 04, 2022 at 11:29:16AM +0100, Michael Tretter wrote: > Drop the WESTON_DRM_COMPOSITOR option and always build the drm backend. > It was unconditionally selected as the default anyway and not building > the backend results in a build failure. > > Drop WESTON_LAUNCH, as the weston-launch is deprecated and was BROKEN > anyway. > > Add WESTON_SEATD to enable the libseat-launcher. > > Add WESTON_DEPRECATED_WL_SHELL, which defaults to false to enable the > deprecated wl-shell if clients still require it. > > Remove BROKEN from WESTON_PIPEWIRE, as PTXdist now includes Pipewire. > > Update the installation of the example config files to use the files > that are generated by Weston instead of generating it in the rule file > > Signed-off-by: Michael Tretter > --- > rules/weston.in | 36 ++-- > rules/weston.make | 31 +-- > 2 files changed, 31 insertions(+), 36 deletions(-) > > diff --git a/rules/weston.in b/rules/weston.in > index 0005ca1c33cf..05b61d14e64d 100644 > --- a/rules/weston.in > +++ b/rules/weston.in > @@ -13,11 +13,11 @@ menuconfig WESTON > select LIBINPUT > select CAIRO > select CAIRO_PNG > - select LIBDRM if WESTON_DRM_COMPOSITOR || BUILDTIME > - select UDEV if WESTON_DRM_COMPOSITOR || > WESTON_FBDEV_COMPOSITOR > - select UDEV_LIBUDEV if WESTON_DRM_COMPOSITOR || > WESTON_FBDEV_COMPOSITOR > + select LIBDRM if BUILDTIME > + select UDEV if WESTON_FBDEV_COMPOSITOR > + select UDEV_LIBUDEV if WESTON_FBDEV_COMPOSITOR This looks wrong. If the drm backend is enabled unconditionally then the dependencies should be as well. > select MESALIB if WESTON_GL > - select MESALIB_GBM if WESTON_DRM_COMPOSITOR && WESTON_GL > + select MESALIB_GBM if WESTON_GL > select MESALIB_EGL if WESTON_GL > select MESALIB_EGL_WAYLAND if WESTON_GL > select MESALIB_GLES2if WESTON_GL > @@ -28,6 +28,7 @@ menuconfig WESTON > select XORG_LIB_XCURSOR if WESTON_XWAYLAND > select XORG_SERVER if WESTON_XWAYLAND && RUNTIME > select XORG_SERVER_XWAYLAND if WESTON_XWAYLAND && RUNTIME > + select SEATDif WESTON_SEATD > select SYSTEMD if WESTON_SYSTEMD > select SYSTEMD_LOGIND if WESTON_SYSTEMD_LOGIND > select DBUS if WESTON_SYSTEMD_LOGIND > @@ -39,6 +40,7 @@ menuconfig WESTON > select GST_PLUGINS_GOOD1_RTPif WESTON_REMOTING && RUNTIME > select GST_PLUGINS_GOOD1_UDPif WESTON_REMOTING && RUNTIME > select PANGOif WESTON_IVISHELL_EXAMPLE > + select PIPEWIRE if WESTON_PIPEWIRE > prompt "weston" > help > Wayland compositor reference implementation > @@ -49,13 +51,8 @@ config WESTON_XWAYLAND > bool > prompt "Xwayland support" > > -config WESTON_DRM_COMPOSITOR > - bool > - prompt "drm compositor" > - > config WESTON_GL > bool > - depends on WESTON_DRM_COMPOSITOR > prompt "OpenGL accelerated compositing" > > config WESTON_HEADLESS_COMPOSITOR > @@ -66,14 +63,16 @@ config WESTON_FBDEV_COMPOSITOR > bool > prompt "fbdev compositor" > > -config WESTON_LAUNCH > +config WESTON_DEPRECATED_WL_SHELL > bool > - prompt "weston-launch support" > - # needs pam > - depends on BROKEN > + default n drop this line. It's the default. > + prompt "enable the deprecated wl-shell protocol" > help > - weston-launch is a setuid-root program which does privileged > - operations on Weston's behalf > + 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 > @@ -81,6 +80,10 @@ config WESTON_STARTSCRIPT > depends on INITMETHOD_BBINIT > prompt "install /etc/init.d/weston-init" > > +config WESTON_SEATD > + bool > + default y Why add an option when it's always enabled? > + > config WESTON_SYSTEMD > bool > default INITMETHOD_SYSTEMD > @@ -123,12 +126,9 @@ config WESTON_SHELL_KIOSK > config WESTON_PIPEWIRE > bool > prompt "pipewire plugin" > - # needs pipewire > - depends on BROKEN > > config WESTON_REMOTING > bool > - select WESTON_DRM_COMPOSITOR > select WESTON_GL > prompt "remoting plugin" > > diff --git a/rules/weston.make b/rules/weston.make > index 716c990e7c36..ed22ce8fe2d2 100644 > --- a/rules/weston.make > +++ b/rules/weston.make > @@ -15,9 +15,9 @@ PACKAGES-$(PTXCONF_WESTON) += weston > # > # Paths and
[ptxdist] [PATCH] weston: version bump 9.0.0 -> 10.0.0
Drop the WESTON_DRM_COMPOSITOR option and always build the drm backend. It was unconditionally selected as the default anyway and not building the backend results in a build failure. Drop WESTON_LAUNCH, as the weston-launch is deprecated and was BROKEN anyway. Add WESTON_SEATD to enable the libseat-launcher. Add WESTON_DEPRECATED_WL_SHELL, which defaults to false to enable the deprecated wl-shell if clients still require it. Remove BROKEN from WESTON_PIPEWIRE, as PTXdist now includes Pipewire. Update the installation of the example config files to use the files that are generated by Weston instead of generating it in the rule file Signed-off-by: Michael Tretter --- rules/weston.in | 36 ++-- rules/weston.make | 31 +-- 2 files changed, 31 insertions(+), 36 deletions(-) diff --git a/rules/weston.in b/rules/weston.in index 0005ca1c33cf..05b61d14e64d 100644 --- a/rules/weston.in +++ b/rules/weston.in @@ -13,11 +13,11 @@ menuconfig WESTON select LIBINPUT select CAIRO select CAIRO_PNG - select LIBDRM if WESTON_DRM_COMPOSITOR || BUILDTIME - select UDEV if WESTON_DRM_COMPOSITOR || WESTON_FBDEV_COMPOSITOR - select UDEV_LIBUDEV if WESTON_DRM_COMPOSITOR || WESTON_FBDEV_COMPOSITOR + select LIBDRM if BUILDTIME + select UDEV if WESTON_FBDEV_COMPOSITOR + select UDEV_LIBUDEV if WESTON_FBDEV_COMPOSITOR select MESALIB if WESTON_GL - select MESALIB_GBM if WESTON_DRM_COMPOSITOR && WESTON_GL + select MESALIB_GBM if WESTON_GL select MESALIB_EGL if WESTON_GL select MESALIB_EGL_WAYLAND if WESTON_GL select MESALIB_GLES2if WESTON_GL @@ -28,6 +28,7 @@ menuconfig WESTON select XORG_LIB_XCURSOR if WESTON_XWAYLAND select XORG_SERVER if WESTON_XWAYLAND && RUNTIME select XORG_SERVER_XWAYLAND if WESTON_XWAYLAND && RUNTIME + select SEATDif WESTON_SEATD select SYSTEMD if WESTON_SYSTEMD select SYSTEMD_LOGIND if WESTON_SYSTEMD_LOGIND select DBUS if WESTON_SYSTEMD_LOGIND @@ -39,6 +40,7 @@ menuconfig WESTON select GST_PLUGINS_GOOD1_RTPif WESTON_REMOTING && RUNTIME select GST_PLUGINS_GOOD1_UDPif WESTON_REMOTING && RUNTIME select PANGOif WESTON_IVISHELL_EXAMPLE + select PIPEWIRE if WESTON_PIPEWIRE prompt "weston" help Wayland compositor reference implementation @@ -49,13 +51,8 @@ config WESTON_XWAYLAND bool prompt "Xwayland support" -config WESTON_DRM_COMPOSITOR - bool - prompt "drm compositor" - config WESTON_GL bool - depends on WESTON_DRM_COMPOSITOR prompt "OpenGL accelerated compositing" config WESTON_HEADLESS_COMPOSITOR @@ -66,14 +63,16 @@ config WESTON_FBDEV_COMPOSITOR bool prompt "fbdev compositor" -config WESTON_LAUNCH +config WESTON_DEPRECATED_WL_SHELL bool - prompt "weston-launch support" - # needs pam - depends on BROKEN + default n + prompt "enable the deprecated wl-shell protocol" help - weston-launch is a setuid-root program which does privileged - operations on Weston's behalf + 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 @@ -81,6 +80,10 @@ config WESTON_STARTSCRIPT depends on INITMETHOD_BBINIT prompt "install /etc/init.d/weston-init" +config WESTON_SEATD + bool + default y + config WESTON_SYSTEMD bool default INITMETHOD_SYSTEMD @@ -123,12 +126,9 @@ config WESTON_SHELL_KIOSK config WESTON_PIPEWIRE bool prompt "pipewire plugin" - # needs pipewire - depends on BROKEN config WESTON_REMOTING bool - select WESTON_DRM_COMPOSITOR select WESTON_GL prompt "remoting plugin" diff --git a/rules/weston.make b/rules/weston.make index 716c990e7c36..ed22ce8fe2d2 100644 --- a/rules/weston.make +++ b/rules/weston.make @@ -15,9 +15,9 @@ PACKAGES-$(PTXCONF_WESTON) += weston # # Paths and names # -WESTON_VERSION := 9.0.0 -LIBWESTON_MAJOR := 9 -WESTON_MD5 := b406da0fe9139fd39653238fde22a6cf +WESTON_VERSION := 10.0.0 +LIBWESTON_MAJOR := 10 +WESTON_MD5 := bc4abe2ee6904a4890a0c641c6257f91 WESTON := weston-$(WESTON_VERSION) WESTON_SUFFIX := tar.xz WESTON_URL := http://wayland.freedesktop.org/releases/$(WESTON).$(WESTON_SUFFIX) @@ -36,9 +36,8
