Minor fixes. https://lore.freedesktop.org/wayland-devel/atX8lVksrJN_SCw6@xpredator/T/#u
* Pin down options to their defaults. * Remove patchset. Signed-off-by: Christian Melki <[email protected]> --- .../0001-Allow-libdisplay-info-0.4.0.patch | 22 ------------------- patches/weston-16.0.0/series | 4 ---- rules/weston.make | 8 +++++-- 3 files changed, 6 insertions(+), 28 deletions(-) delete mode 100644 patches/weston-16.0.0/0001-Allow-libdisplay-info-0.4.0.patch delete mode 100644 patches/weston-16.0.0/series diff --git a/patches/weston-16.0.0/0001-Allow-libdisplay-info-0.4.0.patch b/patches/weston-16.0.0/0001-Allow-libdisplay-info-0.4.0.patch deleted file mode 100644 index d2301a6ed..000000000 --- a/patches/weston-16.0.0/0001-Allow-libdisplay-info-0.4.0.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Tom Pollard <[email protected]> -Date: Tue, 28 Jul 2026 10:51:27 +0100 -Subject: [PATCH] Allow libdisplay-info 0.4.0 - -Signed-off-by: Tom Pollard <[email protected]> ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index e629dfe7f331..baa1ec629313 100644 ---- a/meson.build -+++ b/meson.build -@@ -179,7 +179,7 @@ endif - - dep_libdisplay_info = dependency( - 'libdisplay-info', -- version: ['>= 0.2.0', '< 0.4.0'], -+ version: ['>= 0.2.0', '< 0.5.0'], - fallback: ['display-info', 'di_dep'], - default_options: [ - 'werror=false', diff --git a/patches/weston-16.0.0/series b/patches/weston-16.0.0/series deleted file mode 100644 index 6578f66eb..000000000 --- a/patches/weston-16.0.0/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-Allow-libdisplay-info-0.4.0.patch -# f7b45929c411a7d40119da3e7454b8a3 - git-ptx-patches magic diff --git a/rules/weston.make b/rules/weston.make index b3efb358f..f2c0b8c1b 100644 --- a/rules/weston.make +++ b/rules/weston.make @@ -15,9 +15,9 @@ PACKAGES-$(PTXCONF_WESTON) += weston # # Paths and names # -WESTON_VERSION := 16.0.0 +WESTON_VERSION := 16.0.1 LIBWESTON_MAJOR := 16 -WESTON_MD5 := 532ae0816e63726c78829b6f7899890e +WESTON_MD5 := e8ba90db417689b2fca24580764d2f6d WESTON := weston-$(WESTON_VERSION) WESTON_SUFFIX := tar.gz WESTON_URL := https://gitlab.freedesktop.org/wayland/weston/-/archive/$(WESTON_VERSION)/$(WESTON).$(WESTON_SUFFIX) @@ -36,6 +36,7 @@ WESTON_SIMPLE_CLIENTS-$(PTXCONF_WESTON_GL) += egl dmabuf-egl dmabuf-feedback WESTON_CONF_TOOL := meson WESTON_CONF_OPT := \ $(CROSS_MESON_USR) \ + -Dallow-deprecated-modeset=false \ -Dbackend-default=drm \ -Dbackend-drm=true \ -Dbackend-headless=$(call ptx/truefalse,PTXCONF_WESTON_HEADLESS_COMPOSITOR) \ @@ -46,6 +47,9 @@ 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-pipewire=false \ + -Ddeprecated-remoting=false \ + -Ddeprecated-xdg-shell-v6-unstable=false \ -Ddesktop-shell-client-default=weston-desktop-shell \ -Ddoc=false \ -Dimage-jpeg=true \ -- 2.43.0
