* [ptxdist] [PATCH] weston: version bump 9.0.0 -> 10.0.0
@ 2022-02-04 10:29 Michael Tretter
2022-02-04 12:31 ` Michael Olbrich
0 siblings, 1 reply; 3+ messages in thread
From: Michael Tretter @ 2022-02-04 10:29 UTC (permalink / raw)
To: ptxdist; +Cc: mtr
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 <m.tretter@pengutronix.de>
---
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_GLES2 if 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 SEATD if 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_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
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 @@ WESTON_CONF_TOOL := meson
WESTON_CONF_OPT := \
$(CROSS_MESON_USR) \
-Dbackend-default=drm \
- -Dbackend-drm=$(call ptx/truefalse,PTXCONF_WESTON_DRM_COMPOSITOR) \
+ -Dbackend-drm=true \
-Dbackend-drm-screencast-vaapi=false \
- -Dbackend-fbdev=$(call ptx/truefalse,PTXCONF_WESTON_FBDEV_COMPOSITOR) \
-Dbackend-headless=$(call ptx/truefalse,PTXCONF_WESTON_HEADLESS_COMPOSITOR) \
-Dbackend-rdp=false \
-Dbackend-wayland=$(call ptx/truefalse,PTXCONF_WESTON_GL) \
@@ -46,10 +45,14 @@ WESTON_CONF_OPT := \
-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) \
-Ddesktop-shell-client-default=weston-desktop-shell \
-Ddoc=false \
-Dimage-jpeg=true \
-Dimage-webp=false \
+ -Dlauncher-libseat=$(call ptx/truefalse,PTXCONF_WESTON_SEATD) \
-Dlauncher-logind=$(call ptx/truefalse,PTXCONF_WESTON_SYSTEMD_LOGIND) \
-Dpipewire=$(call ptx/truefalse,PTXCONF_WESTON_PIPEWIRE) \
-Dremoting=$(call ptx/truefalse,PTXCONF_WESTON_REMOTING) \
@@ -64,9 +67,9 @@ WESTON_CONF_OPT := \
-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 \
-Dwcap-decode=$(call ptx/truefalse,PTXCONF_WESTON_WCAP_TOOLS) \
- -Dweston-launch=$(call ptx/truefalse,PTXCONF_WESTON_LAUNCH) \
-Dxwayland=$(call ptx/truefalse,PTXCONF_WESTON_XWAYLAND) \
-Dxwayland-path=/usr/bin/Xwayland
@@ -78,18 +81,12 @@ $(STATEDIR)/weston.install:
@$(call targetinfo)
@$(call world/install, WESTON)
- @mkdir -p $(WESTON_PKGDIR)/etc/xdg/weston
ifndef PTXCONF_WESTON_IVISHELL_EXAMPLE
- @bindir="/usr/bin" \
- abs_top_builddir="/usr/bin" \
- libexecdir="/usr/libexec" \
- ptxd_replace_magic "$(WESTON_DIR)/weston.ini.in" > \
- "$(WESTON_PKGDIR)/etc/xdg/weston/weston.ini"
+ @install -D -m644 $(WESTON_DIR)-build/compositor/weston.ini \
+ $(WESTON_PKGDIR)/etc/xdg/weston/weston.ini
else
- @bindir="/usr/bin" \
- westondatadir="/usr/share/weston" \
- ptxd_replace_magic "$(WESTON_DIR)/ivi-shell/weston.ini.in" > \
- "$(WESTON_PKGDIR)/etc/xdg/weston/weston.ini"
+ @install -D -m644 $(WESTON_DIR)-build/ivi-shell/weston.ini \
+ $(WESTON_PKGDIR)/etc/xdg/weston/weston.ini
endif
@$(call touch)
@@ -137,9 +134,7 @@ endif
ifdef PTXCONF_WESTON_XWAYLAND
@$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)/xwayland)
endif
-ifdef PTXCONF_WESTON_DRM_COMPOSITOR
@$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)/drm-backend)
-endif
ifdef PTXCONF_WESTON_HEADLESS_COMPOSITOR
@$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)/headless-backend)
endif
--
2.30.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [ptxdist] [PATCH] weston: version bump 9.0.0 -> 10.0.0
2022-02-04 10:29 [ptxdist] [PATCH] weston: version bump 9.0.0 -> 10.0.0 Michael Tretter
@ 2022-02-04 12:31 ` Michael Olbrich
2022-02-04 12:58 ` Michael Tretter
0 siblings, 1 reply; 3+ messages in thread
From: Michael Olbrich @ 2022-02-04 12:31 UTC (permalink / raw)
To: Michael Tretter; +Cc: ptxdist, mtr
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 <m.tretter@pengutronix.de>
> ---
> 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_GLES2 if 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 SEATD if 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_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
> 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 names
> #
> -WESTON_VERSION := 9.0.0
> -LIBWESTON_MAJOR := 9
> -WESTON_MD5 := b406da0fe9139fd39653238fde22a6cf
> +WESTON_VERSION := 10.0.0
> +LIBWESTON_MAJOR := 10
Maybe derive this from the version. See SYSTEMD_VERSION_MAJOR for an
example.
Michael
> +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 @@ WESTON_CONF_TOOL := meson
> WESTON_CONF_OPT := \
> $(CROSS_MESON_USR) \
> -Dbackend-default=drm \
> - -Dbackend-drm=$(call ptx/truefalse,PTXCONF_WESTON_DRM_COMPOSITOR) \
> + -Dbackend-drm=true \
> -Dbackend-drm-screencast-vaapi=false \
> - -Dbackend-fbdev=$(call ptx/truefalse,PTXCONF_WESTON_FBDEV_COMPOSITOR) \
> -Dbackend-headless=$(call ptx/truefalse,PTXCONF_WESTON_HEADLESS_COMPOSITOR) \
> -Dbackend-rdp=false \
> -Dbackend-wayland=$(call ptx/truefalse,PTXCONF_WESTON_GL) \
> @@ -46,10 +45,14 @@ WESTON_CONF_OPT := \
> -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) \
> -Ddesktop-shell-client-default=weston-desktop-shell \
> -Ddoc=false \
> -Dimage-jpeg=true \
> -Dimage-webp=false \
> + -Dlauncher-libseat=$(call ptx/truefalse,PTXCONF_WESTON_SEATD) \
> -Dlauncher-logind=$(call ptx/truefalse,PTXCONF_WESTON_SYSTEMD_LOGIND) \
> -Dpipewire=$(call ptx/truefalse,PTXCONF_WESTON_PIPEWIRE) \
> -Dremoting=$(call ptx/truefalse,PTXCONF_WESTON_REMOTING) \
> @@ -64,9 +67,9 @@ WESTON_CONF_OPT := \
> -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 \
> -Dwcap-decode=$(call ptx/truefalse,PTXCONF_WESTON_WCAP_TOOLS) \
> - -Dweston-launch=$(call ptx/truefalse,PTXCONF_WESTON_LAUNCH) \
> -Dxwayland=$(call ptx/truefalse,PTXCONF_WESTON_XWAYLAND) \
> -Dxwayland-path=/usr/bin/Xwayland
>
> @@ -78,18 +81,12 @@ $(STATEDIR)/weston.install:
> @$(call targetinfo)
> @$(call world/install, WESTON)
>
> - @mkdir -p $(WESTON_PKGDIR)/etc/xdg/weston
> ifndef PTXCONF_WESTON_IVISHELL_EXAMPLE
> - @bindir="/usr/bin" \
> - abs_top_builddir="/usr/bin" \
> - libexecdir="/usr/libexec" \
> - ptxd_replace_magic "$(WESTON_DIR)/weston.ini.in" > \
> - "$(WESTON_PKGDIR)/etc/xdg/weston/weston.ini"
> + @install -D -m644 $(WESTON_DIR)-build/compositor/weston.ini \
> + $(WESTON_PKGDIR)/etc/xdg/weston/weston.ini
> else
> - @bindir="/usr/bin" \
> - westondatadir="/usr/share/weston" \
> - ptxd_replace_magic "$(WESTON_DIR)/ivi-shell/weston.ini.in" > \
> - "$(WESTON_PKGDIR)/etc/xdg/weston/weston.ini"
> + @install -D -m644 $(WESTON_DIR)-build/ivi-shell/weston.ini \
> + $(WESTON_PKGDIR)/etc/xdg/weston/weston.ini
> endif
>
> @$(call touch)
> @@ -137,9 +134,7 @@ endif
> ifdef PTXCONF_WESTON_XWAYLAND
> @$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)/xwayland)
> endif
> -ifdef PTXCONF_WESTON_DRM_COMPOSITOR
> @$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)/drm-backend)
> -endif
> ifdef PTXCONF_WESTON_HEADLESS_COMPOSITOR
> @$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)/headless-backend)
> endif
> --
> 2.30.2
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [ptxdist] [PATCH] weston: version bump 9.0.0 -> 10.0.0
2022-02-04 12:31 ` Michael Olbrich
@ 2022-02-04 12:58 ` Michael Tretter
0 siblings, 0 replies; 3+ messages in thread
From: Michael Tretter @ 2022-02-04 12:58 UTC (permalink / raw)
To: ptxdist
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 <m.tretter@pengutronix.de>
> > ---
> > 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_GLES2 if 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 SEATD if 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_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
> > 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
> > 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
>
> Maybe derive this from the version. See SYSTEMD_VERSION_MAJOR for an
> example.
Deriving LIBWESTON_MAJOR from WESTON_VERSION only works for releases. If you
want to build a release candidate, LIBWESTON_MAJOR will be incremented, but
the WESTON_VERSION will still stick to the previous version. In fact, if you
would want to build the current main branch, it will already require
LIBWESTON_MAJOR := 11.
I will send a v2.
Michael
>
> Michael
>
> > +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 @@ WESTON_CONF_TOOL := meson
> > WESTON_CONF_OPT := \
> > $(CROSS_MESON_USR) \
> > -Dbackend-default=drm \
> > - -Dbackend-drm=$(call ptx/truefalse,PTXCONF_WESTON_DRM_COMPOSITOR) \
> > + -Dbackend-drm=true \
> > -Dbackend-drm-screencast-vaapi=false \
> > - -Dbackend-fbdev=$(call ptx/truefalse,PTXCONF_WESTON_FBDEV_COMPOSITOR) \
> > -Dbackend-headless=$(call ptx/truefalse,PTXCONF_WESTON_HEADLESS_COMPOSITOR) \
> > -Dbackend-rdp=false \
> > -Dbackend-wayland=$(call ptx/truefalse,PTXCONF_WESTON_GL) \
> > @@ -46,10 +45,14 @@ WESTON_CONF_OPT := \
> > -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) \
> > -Ddesktop-shell-client-default=weston-desktop-shell \
> > -Ddoc=false \
> > -Dimage-jpeg=true \
> > -Dimage-webp=false \
> > + -Dlauncher-libseat=$(call ptx/truefalse,PTXCONF_WESTON_SEATD) \
> > -Dlauncher-logind=$(call ptx/truefalse,PTXCONF_WESTON_SYSTEMD_LOGIND) \
> > -Dpipewire=$(call ptx/truefalse,PTXCONF_WESTON_PIPEWIRE) \
> > -Dremoting=$(call ptx/truefalse,PTXCONF_WESTON_REMOTING) \
> > @@ -64,9 +67,9 @@ WESTON_CONF_OPT := \
> > -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 \
> > -Dwcap-decode=$(call ptx/truefalse,PTXCONF_WESTON_WCAP_TOOLS) \
> > - -Dweston-launch=$(call ptx/truefalse,PTXCONF_WESTON_LAUNCH) \
> > -Dxwayland=$(call ptx/truefalse,PTXCONF_WESTON_XWAYLAND) \
> > -Dxwayland-path=/usr/bin/Xwayland
> >
> > @@ -78,18 +81,12 @@ $(STATEDIR)/weston.install:
> > @$(call targetinfo)
> > @$(call world/install, WESTON)
> >
> > - @mkdir -p $(WESTON_PKGDIR)/etc/xdg/weston
> > ifndef PTXCONF_WESTON_IVISHELL_EXAMPLE
> > - @bindir="/usr/bin" \
> > - abs_top_builddir="/usr/bin" \
> > - libexecdir="/usr/libexec" \
> > - ptxd_replace_magic "$(WESTON_DIR)/weston.ini.in" > \
> > - "$(WESTON_PKGDIR)/etc/xdg/weston/weston.ini"
> > + @install -D -m644 $(WESTON_DIR)-build/compositor/weston.ini \
> > + $(WESTON_PKGDIR)/etc/xdg/weston/weston.ini
> > else
> > - @bindir="/usr/bin" \
> > - westondatadir="/usr/share/weston" \
> > - ptxd_replace_magic "$(WESTON_DIR)/ivi-shell/weston.ini.in" > \
> > - "$(WESTON_PKGDIR)/etc/xdg/weston/weston.ini"
> > + @install -D -m644 $(WESTON_DIR)-build/ivi-shell/weston.ini \
> > + $(WESTON_PKGDIR)/etc/xdg/weston/weston.ini
> > endif
> >
> > @$(call touch)
> > @@ -137,9 +134,7 @@ endif
> > ifdef PTXCONF_WESTON_XWAYLAND
> > @$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)/xwayland)
> > endif
> > -ifdef PTXCONF_WESTON_DRM_COMPOSITOR
> > @$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)/drm-backend)
> > -endif
> > ifdef PTXCONF_WESTON_HEADLESS_COMPOSITOR
> > @$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)/headless-backend)
> > endif
> > --
> > 2.30.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-02-04 12:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-04 10:29 [ptxdist] [PATCH] weston: version bump 9.0.0 -> 10.0.0 Michael Tretter
2022-02-04 12:31 ` Michael Olbrich
2022-02-04 12:58 ` Michael Tretter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox