| Message ID | 20240214203845.121720-1-thomas@devoogdt.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2] package/weston: bump to 13.0.0 | expand |
On 14/02/2024 21:38, Thomas Devoogdt wrote: > Announce: > https://lists.freedesktop.org/archives/wayland-devel/2023-November/043326.html > > Drop -Dlauncher-libseat=true, as it has been dropped upstream [1]. > > Also drop the BR2_PACKAGE_SEATD_DAEMON, which was added in > commit 6d677931284d58ae0e8e001cfd990eafaee5cecc > "package/weston: select the seatd daemon", and > commit 9d6f966f9ad012879bb472896eb35eeda5baa9ab > "package/weston: don't select seatd daemon if we have logind", > as it is not strictly needed anymore. > > In package/seatd/Config.in we have: > select BR2_PACKAGE_SEATD_BUILTIN \ > if !BR2_PACKAGE_SYSTEMD_LOGIND && !BR2_PACKAGE_SEATD_DAEMON > > Here we have: > select BR2_PACKAGE_SEATD_DAEMON if !BR2_PACKAGE_SYSTEMD_LOGIND > > This makes it impossible to select BR2_PACKAGE_SEATD_BUILTIN as the -only- > backend if not BR2_PACKAGE_SYSTEMD_LOGIND, so drop it altogether. This kind > of logic should be selected in the device defconfigs or by packages that > really need one specific backend. > > [1]: https://gitlab.freedesktop.org/wayland/weston/-/commit/e3b6ed50f1c3c259c51274c78d08b58> > > Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com> Applied to master, thanks. Regards, Arnout > --- > v2: Combine and rework git message these two patches: > - [v1] package/weston: bump to 13.0.0 > https://patchwork.ozlabs.org/project/buildroot/patch/20240214075445.1011185-1-thomas.devoogdt@barco.com/ > - [v1] package/weston: fix auto seatd daemon selection > https://patchwork.ozlabs.org/project/buildroot/patch/20240214182931.116813-1-thomas@devoogdt.com/ > --- > package/weston/Config.in | 1 - > package/weston/weston.hash | 6 +++--- > package/weston/weston.mk | 3 +-- > 3 files changed, 4 insertions(+), 6 deletions(-) > > diff --git a/package/weston/Config.in b/package/weston/Config.in > index db6a78ee8a..1b282fb362 100644 > --- a/package/weston/Config.in > +++ b/package/weston/Config.in > @@ -19,7 +19,6 @@ config BR2_PACKAGE_WESTON > select BR2_PACKAGE_LIBINPUT > select BR2_PACKAGE_LIBDRM > select BR2_PACKAGE_SEATD > - select BR2_PACKAGE_SEATD_DAEMON if !BR2_PACKAGE_SYSTEMD_LOGIND > # Runtime dependency > select BR2_PACKAGE_XKEYBOARD_CONFIG > select BR2_PACKAGE_WESTON_SHELL_DESKTOP if !BR2_PACKAGE_WESTON_HAS_SHELL > diff --git a/package/weston/weston.hash b/package/weston/weston.hash > index 0ecbaa4168..ded5d35275 100644 > --- a/package/weston/weston.hash > +++ b/package/weston/weston.hash > @@ -1,4 +1,4 @@ > -# From https://lists.freedesktop.org/archives/wayland-devel/2023-May/042725.html > -sha256 b18591eab278bc191720f6c09158040b795e7118af1d5ddca6acd9a8e2039535 weston-12.0.1.tar.xz > -sha512 3dcfa1a2a6b9a605d3ecd597bf7ac0f87b0fd1971845b6e5c44b5e34296943ac146dae6e1cfea9be14ad7a9a8b6d30dc765f9289ef80920d7c516ebba1ba4688 weston-12.0.1.tar.xz > +# From https://lists.freedesktop.org/archives/wayland-devel/2023-November/043326.html > +sha256 52ff1d4aa2394a2e416c85a338b627ce97fa71d43eb762fd4aaf145d36fc795a weston-13.0.0.tar.xz > +sha512 8c656cdf24ec9429c76c64ebd2d58351991f5990a6d4b5900ac913243ad8e2c9c0fb1a748f018d177fbfd7e0a8836d0434d97acec287a8f977d47335ae30eacc weston-13.0.0.tar.xz > sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 COPYING > diff --git a/package/weston/weston.mk b/package/weston/weston.mk > index b07e798765..5ae9c22973 100644 > --- a/package/weston/weston.mk > +++ b/package/weston/weston.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -WESTON_VERSION = 12.0.1 > +WESTON_VERSION = 13.0.0 > WESTON_SITE = https://gitlab.freedesktop.org/wayland/weston/-/releases/$(WESTON_VERSION)/downloads > WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz > WESTON_LICENSE = MIT > @@ -19,7 +19,6 @@ WESTON_CONF_OPTS = \ > -Ddoc=false \ > -Dremoting=false \ > -Dbackend-vnc=false \ > - -Dlauncher-libseat=true \ > -Dtools=calibrator,debug,info,terminal,touch-calibrator > > ifeq ($(BR2_PACKAGE_WESTON_SIMPLE_CLIENTS),y)
diff --git a/package/weston/Config.in b/package/weston/Config.in index db6a78ee8a..1b282fb362 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -19,7 +19,6 @@ config BR2_PACKAGE_WESTON select BR2_PACKAGE_LIBINPUT select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_SEATD - select BR2_PACKAGE_SEATD_DAEMON if !BR2_PACKAGE_SYSTEMD_LOGIND # Runtime dependency select BR2_PACKAGE_XKEYBOARD_CONFIG select BR2_PACKAGE_WESTON_SHELL_DESKTOP if !BR2_PACKAGE_WESTON_HAS_SHELL diff --git a/package/weston/weston.hash b/package/weston/weston.hash index 0ecbaa4168..ded5d35275 100644 --- a/package/weston/weston.hash +++ b/package/weston/weston.hash @@ -1,4 +1,4 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2023-May/042725.html -sha256 b18591eab278bc191720f6c09158040b795e7118af1d5ddca6acd9a8e2039535 weston-12.0.1.tar.xz -sha512 3dcfa1a2a6b9a605d3ecd597bf7ac0f87b0fd1971845b6e5c44b5e34296943ac146dae6e1cfea9be14ad7a9a8b6d30dc765f9289ef80920d7c516ebba1ba4688 weston-12.0.1.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2023-November/043326.html +sha256 52ff1d4aa2394a2e416c85a338b627ce97fa71d43eb762fd4aaf145d36fc795a weston-13.0.0.tar.xz +sha512 8c656cdf24ec9429c76c64ebd2d58351991f5990a6d4b5900ac913243ad8e2c9c0fb1a748f018d177fbfd7e0a8836d0434d97acec287a8f977d47335ae30eacc weston-13.0.0.tar.xz sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 COPYING diff --git a/package/weston/weston.mk b/package/weston/weston.mk index b07e798765..5ae9c22973 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -4,7 +4,7 @@ # ################################################################################ -WESTON_VERSION = 12.0.1 +WESTON_VERSION = 13.0.0 WESTON_SITE = https://gitlab.freedesktop.org/wayland/weston/-/releases/$(WESTON_VERSION)/downloads WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz WESTON_LICENSE = MIT @@ -19,7 +19,6 @@ WESTON_CONF_OPTS = \ -Ddoc=false \ -Dremoting=false \ -Dbackend-vnc=false \ - -Dlauncher-libseat=true \ -Dtools=calibrator,debug,info,terminal,touch-calibrator ifeq ($(BR2_PACKAGE_WESTON_SIMPLE_CLIENTS),y)
Announce: https://lists.freedesktop.org/archives/wayland-devel/2023-November/043326.html Drop -Dlauncher-libseat=true, as it has been dropped upstream [1]. Also drop the BR2_PACKAGE_SEATD_DAEMON, which was added in commit 6d677931284d58ae0e8e001cfd990eafaee5cecc "package/weston: select the seatd daemon", and commit 9d6f966f9ad012879bb472896eb35eeda5baa9ab "package/weston: don't select seatd daemon if we have logind", as it is not strictly needed anymore. In package/seatd/Config.in we have: select BR2_PACKAGE_SEATD_BUILTIN \ if !BR2_PACKAGE_SYSTEMD_LOGIND && !BR2_PACKAGE_SEATD_DAEMON Here we have: select BR2_PACKAGE_SEATD_DAEMON if !BR2_PACKAGE_SYSTEMD_LOGIND This makes it impossible to select BR2_PACKAGE_SEATD_BUILTIN as the -only- backend if not BR2_PACKAGE_SYSTEMD_LOGIND, so drop it altogether. This kind of logic should be selected in the device defconfigs or by packages that really need one specific backend. [1]: https://gitlab.freedesktop.org/wayland/weston/-/commit/e3b6ed50f1c3c259c51274c78d08b58> Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com> --- v2: Combine and rework git message these two patches: - [v1] package/weston: bump to 13.0.0 https://patchwork.ozlabs.org/project/buildroot/patch/20240214075445.1011185-1-thomas.devoogdt@barco.com/ - [v1] package/weston: fix auto seatd daemon selection https://patchwork.ozlabs.org/project/buildroot/patch/20240214182931.116813-1-thomas@devoogdt.com/ --- package/weston/Config.in | 1 - package/weston/weston.hash | 6 +++--- package/weston/weston.mk | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-)