https://lists.freedesktop.org/archives/wayland-devel/2024-September/043776.html
Includes initial HW underlay support, output mirroring configuration, PipeWire dmabuf support, and a bunch of GL renderer improvements. For details, see: https://lists.freedesktop.org/archives/wayland-devel/2024-August/043705.html Tests can now be disabled with a Meson option, so the patch is not needed anymore. Signed-off-by: Philipp Zabel <[email protected]> --- .../0001-HACK-don-t-build-tests.patch | 23 ------------------- patches/weston-13.0.3/series | 4 ---- rules/weston.in | 1 + rules/weston.make | 11 ++++----- 4 files changed, 6 insertions(+), 33 deletions(-) delete mode 100644 patches/weston-13.0.3/0001-HACK-don-t-build-tests.patch delete mode 100644 patches/weston-13.0.3/series diff --git a/patches/weston-13.0.3/0001-HACK-don-t-build-tests.patch b/patches/weston-13.0.3/0001-HACK-don-t-build-tests.patch deleted file mode 100644 index 5a24e11b133f..000000000000 --- a/patches/weston-13.0.3/0001-HACK-don-t-build-tests.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Michael Olbrich <[email protected]> -Date: Fri, 26 May 2023 11:41:19 +0200 -Subject: [PATCH] HACK: don't build tests - -The tests can introduce additional dependencies (e.g. xcb-cursor for xwayland) -that are not otherwise needed. The tests are not used in ptxdist anyways, so -just don't build them. - -Signed-off-by: Michael Olbrich <[email protected]> ---- - tests/meson.build | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tests/meson.build b/tests/meson.build -index 1d59a93e121c..b7c4412bfdf8 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -1,3 +1,5 @@ -+subdir_done() -+ - plugin_test_shell_desktop = shared_library( - 'weston-test-desktop-shell', - 'weston-test-desktop-shell.c', diff --git a/patches/weston-13.0.3/series b/patches/weston-13.0.3/series deleted file mode 100644 index a5dc0b485ab5..000000000000 --- a/patches/weston-13.0.3/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-HACK-don-t-build-tests.patch -# 4082f10e9dae6df168955b4fa61a61b3 - git-ptx-patches magic diff --git a/rules/weston.in b/rules/weston.in index 10f0e9172d4f..5ad7b585e9b4 100644 --- a/rules/weston.in +++ b/rules/weston.in @@ -8,6 +8,7 @@ menuconfig WESTON select WAYLAND select WAYLAND_PROTOCOLS select LIBXKBCOMMON + select LIBDISPLAY_INFO select LIBJPEG select LIBPNG select LIBINPUT diff --git a/rules/weston.make b/rules/weston.make index 35ddab180cc7..92280bb74c8d 100644 --- a/rules/weston.make +++ b/rules/weston.make @@ -15,9 +15,9 @@ PACKAGES-$(PTXCONF_WESTON) += weston # # Paths and names # -WESTON_VERSION := 13.0.3 -LIBWESTON_MAJOR := 13 -WESTON_MD5 := 1525ba0696a046381fa499e901c2cd17 +WESTON_VERSION := 14.0.0 +LIBWESTON_MAJOR := 14 +WESTON_MD5 := 21b8a54e29d45b0b93d898e900c2954f WESTON := weston-$(WESTON_VERSION) WESTON_SUFFIX := tar.gz WESTON_URL := https://gitlab.freedesktop.org/wayland/weston/-/archive/$(WESTON_VERSION)/$(WESTON).$(WESTON_SUFFIX) @@ -47,8 +47,6 @@ WESTON_CONF_OPT := \ -Dbackend-x11=false \ -Dcolor-management-lcms=false \ -Ddemo-clients=$(call ptx/truefalse,PTXCONF_WESTON_IVISHELL_EXAMPLE) \ - -Ddeprecated-color-management-colord=false \ - -Ddeprecated-color-management-static=false \ -Ddesktop-shell-client-default=weston-desktop-shell \ -Ddoc=false \ -Dimage-jpeg=true \ @@ -66,6 +64,7 @@ WESTON_CONF_OPT := \ -Dsystemd=$(call ptx/truefalse,PTXCONF_WESTON_SYSTEMD) \ -Dtest-junit-xml=false \ -Dtest-skip-is-failure=false \ + -Dtests=false \ -Dtools=calibrator,debug,info,terminal,touch-calibrator \ -Dwcap-decode=$(call ptx/truefalse,PTXCONF_WESTON_WCAP_TOOLS) \ -Dxwayland=$(call ptx/truefalse,PTXCONF_WESTON_XWAYLAND) \ @@ -80,7 +79,7 @@ $(STATEDIR)/weston.install: @$(call world/install, WESTON) ifndef PTXCONF_WESTON_IVISHELL_EXAMPLE - @install -D -m644 $(WESTON_DIR)-build/compositor/weston.ini \ + @install -D -m644 $(WESTON_DIR)-build/frontend/weston.ini \ $(WESTON_PKGDIR)/etc/xdg/weston/weston.ini else @install -D -m644 $(WESTON_DIR)-build/ivi-shell/weston.ini \ -- 2.39.2
