From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Michael Tretter <m.tretter@pengutronix.de>
Subject: Re: [ptxdist] [APPLIED] weston: version bump 14.0.2 -> 15.0.0
Date: Mon, 9 Mar 2026 08:22:16 +0100 [thread overview]
Message-ID: <20260309072216.4087893-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20260219110316.243620-1-m.tretter@pengutronix.de>
Thanks, applied as 873fed66dbc8162047d2ff880550ef2991943cae.
Michael
[sent from post-receive hook]
On Mon, 09 Mar 2026 08:22:16 +0100, Michael Tretter <m.tretter@pengutronix.de> wrote:
> Disable the deprecated deprecated fullscreen shell.
>
> Add options to enable the new Lua Shell and Vulkan renderer.
>
> Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
> Message-Id: <20260219110316.243620-1-m.tretter@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/weston-14.0.2/0001-build-Allow-libdisplay-info-0.3.0.patch b/patches/weston-14.0.2/0001-build-Allow-libdisplay-info-0.3.0.patch
> deleted file mode 100644
> index 8fcfbcde14b4..000000000000
> --- a/patches/weston-14.0.2/0001-build-Allow-libdisplay-info-0.3.0.patch
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -From: Philipp Zabel <p.zabel@pengutronix.de>
> -Date: Wed, 13 Aug 2025 15:23:39 +0200
> -Subject: [PATCH] build: Allow libdisplay-info 0.3.0
> -
> -There are no breaking changes for the high-level API that Weston uses.
> -
> -Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> -(backported from commit 683eabb61ec43a270f2e3ed67c63bbe3754b1214)
> ----
> - libweston/backend-drm/meson.build | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/libweston/backend-drm/meson.build b/libweston/backend-drm/meson.build
> -index 002669e61f88..a8f2ea59867a 100644
> ---- a/libweston/backend-drm/meson.build
> -+++ b/libweston/backend-drm/meson.build
> -@@ -4,7 +4,7 @@ endif
> -
> - dep_libdisplay_info = dependency(
> - 'libdisplay-info',
> -- version: ['>= 0.1.1', '< 0.3.0'],
> -+ version: ['>= 0.1.1', '< 0.4.0'],
> - fallback: ['display-info', 'di_dep'],
> - default_options: [
> - 'werror=false',
> diff --git a/patches/weston-14.0.2/series b/patches/weston-14.0.2/series
> deleted file mode 100644
> index 5799875be25f..000000000000
> --- a/patches/weston-14.0.2/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-build-Allow-libdisplay-info-0.3.0.patch
> -# b2aa5489b040afd280f18d11d460ee8b - git-ptx-patches magic
> diff --git a/rules/weston.in b/rules/weston.in
> index dc2b800eb10f..972db8f2b9df 100644
> --- a/rules/weston.in
> +++ b/rules/weston.in
> @@ -36,12 +36,15 @@ menuconfig WESTON
> select GST_PLUGINS_GOOD1_JPEG if WESTON_REMOTING && RUNTIME
> select GST_PLUGINS_GOOD1_RTP if WESTON_REMOTING && RUNTIME
> select GST_PLUGINS_GOOD1_UDP if WESTON_REMOTING && RUNTIME
> + select LUA if WESTON_SHELL_LUA
> + select LUA_INSTALL_LIBLUA if WESTON_SHELL_LUA
> select PANGO if WESTON_IVISHELL_EXAMPLE
> select PIPEWIRE if WESTON_PIPEWIRE
> select PIPEWIRE if WESTON_BACKEND_PIPEWIRE
> select NEATVNC if WESTON_BACKEND_VNC
> select PAM if WESTON_BACKEND_VNC
> select LCMS if WESTON_COLOR_MANAGEMENT_LCMS
> + select VULKAN_LOADER if WESTON_VULKAN
> prompt "weston "
> help
> Wayland compositor reference implementation
> @@ -56,6 +59,10 @@ config WESTON_GL
> bool
> prompt "OpenGL accelerated compositing"
>
> +config WESTON_VULKAN
> + bool
> + prompt "Vulkan accelerated compositing"
> +
> config WESTON_HEADLESS_COMPOSITOR
> bool
> prompt "headless compositor"
> @@ -108,6 +115,10 @@ config WESTON_SHELL_KIOSK
> bool
> prompt "kiosk shell"
>
> +config WESTON_SHELL_LUA
> + bool
> + prompt "Lua shell"
> +
> config WESTON_PIPEWIRE
> bool
> select WESTON_GL
> diff --git a/rules/weston.make b/rules/weston.make
> index 774e8de4bc54..a3f2c45bfc32 100644
> --- a/rules/weston.make
> +++ b/rules/weston.make
> @@ -15,9 +15,9 @@ PACKAGES-$(PTXCONF_WESTON) += weston
> #
> # Paths and names
> #
> -WESTON_VERSION := 14.0.2
> -LIBWESTON_MAJOR := 14
> -WESTON_MD5 := ff6cb69bd4ddd07d3076d5fc4fcbad91
> +WESTON_VERSION := 15.0.0
> +LIBWESTON_MAJOR := 15
> +WESTON_MD5 := 8ffb4333fce63cbdea5c1918d5843ca8
> WESTON := weston-$(WESTON_VERSION)
> WESTON_SUFFIX := tar.gz
> WESTON_URL := https://gitlab.freedesktop.org/wayland/weston/-/archive/$(WESTON_VERSION)/$(WESTON).$(WESTON_SUFFIX)
> @@ -38,7 +38,6 @@ WESTON_CONF_OPT := \
> $(CROSS_MESON_USR) \
> -Dbackend-default=drm \
> -Dbackend-drm=true \
> - -Dbackend-drm-screencast-vaapi=false \
> -Dbackend-headless=$(call ptx/truefalse,PTXCONF_WESTON_HEADLESS_COMPOSITOR) \
> -Dbackend-pipewire=$(call ptx/truefalse,PTXCONF_WESTON_BACKEND_PIPEWIRE) \
> -Dbackend-rdp=false \
> @@ -47,19 +46,23 @@ WESTON_CONF_OPT := \
> -Dbackend-x11=false \
> -Dcolor-management-lcms=$(call ptx/truefalse,PTXCONF_WESTON_COLOR_MANAGEMENT_LCMS) \
> -Ddemo-clients=$(call ptx/truefalse,PTXCONF_WESTON_IVISHELL_EXAMPLE) \
> + -Ddeprecated-backend-drm-screencast-vaapi=false \
> + -Ddeprecated-screenshare=false \
> + -Ddeprecated-shell-fullscreen=false \
> -Ddesktop-shell-client-default=weston-desktop-shell \
> -Ddoc=false \
> -Dimage-jpeg=true \
> -Dimage-webp=false \
> + -Dperfetto=false \
> -Dpipewire=$(call ptx/truefalse,PTXCONF_WESTON_PIPEWIRE) \
> -Dremoting=$(call ptx/truefalse,PTXCONF_WESTON_REMOTING) \
> -Drenderer-gl=$(call ptx/truefalse,PTXCONF_WESTON_GL) \
> + -Drenderer-vulkan=$(call ptx/truefalse,PTXCONF_WESTON_VULKAN) \
> -Dresize-pool=true \
> - -Dscreenshare=false \
> -Dshell-desktop=true \
> - -Dshell-fullscreen=true \
> -Dshell-ivi=$(call ptx/truefalse,PTXCONF_WESTON_IVISHELL) \
> -Dshell-kiosk=$(call ptx/truefalse,PTXCONF_WESTON_SHELL_KIOSK) \
> + -Dshell-lua=$(call ptx/truefalse,PTXCONF_WESTON_SHELL_LUA) \
> -Dsimple-clients=$(subst $(space),$(comma),$(WESTON_SIMPLE_CLIENTS-y)) \
> -Dsystemd=$(call ptx/truefalse,PTXCONF_WESTON_SYSTEMD) \
> -Dtest-junit-xml=false \
> @@ -141,6 +144,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_VULKAN
> + @$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)/vulkan-renderer)
> +endif
> ifdef PTXCONF_WESTON_PIPEWIRE
> @$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)/pipewire-plugin)
> endif
> @@ -151,13 +157,16 @@ ifdef PTXCONF_WESTON_COLOR_MANAGEMENT_LCMS
> @$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)/color-lcms)
> endif
> @$(call install_lib, weston, 0, 0, 0644, weston/desktop-shell)
> - @$(call install_lib, weston, 0, 0, 0644, weston/fullscreen-shell)
> ifdef PTXCONF_WESTON_IVISHELL
> @$(call install_lib, weston, 0, 0, 0644, weston/ivi-shell)
> endif
> ifdef PTXCONF_WESTON_SHELL_KIOSK
> @$(call install_lib, weston, 0, 0, 0644, weston/kiosk-shell)
> endif
> +ifdef PTXCONF_WESTON_SHELL_LUA
> + @$(call install_lib, weston, 0, 0, 0644, weston/lua-shell)
> + @$(call install_alternative, weston, 0, 0, 0644, /usr/libexec/shell.lua)
> +endif
> ifdef PTXCONF_WESTON_SYSTEMD
> @$(call install_lib, weston, 0, 0, 0644, weston/systemd-notify)
> endif
prev parent reply other threads:[~2026-03-09 7:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-19 11:03 [ptxdist] [PATCH] " Michael Tretter
2026-03-09 7:22 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260309072216.4087893-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=m.tretter@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox