From e013639da85280bd02e53c1fb8e4adaa01e8f08f Mon Sep 17 00:00:00 2001 From: Michael Tretter Date: Fri, 23 Sep 2022 09:49:08 +0200 Subject: weston: version bump 10.0.2 -> 11.0.0 Bump Weston to version 11.0.0 The fbdev backend and the wl_shell support have been removed. Remove the config items, too. weston-info has been replaced by wayland-info. Enable WAYLAND_UTILS to get wayland-info. libweston-desktop has been merged into libweston. Signed-off-by: Michael Tretter Message-Id: <20220923074908.2149330-3-m.tretter@pengutronix.de> Signed-off-by: Michael Olbrich --- rules/weston.in | 14 -------------- rules/weston.make | 15 +++++---------- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/rules/weston.in b/rules/weston.in index 6fe570e0a..a698a7491 100644 --- a/rules/weston.in +++ b/rules/weston.in @@ -59,20 +59,6 @@ config WESTON_HEADLESS_COMPOSITOR bool prompt "headless compositor" -config WESTON_FBDEV_COMPOSITOR - bool - prompt "fbdev compositor" - -config WESTON_DEPRECATED_WL_SHELL - bool - prompt "enable the deprecated wl-shell protocol" - help - 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 default y diff --git a/rules/weston.make b/rules/weston.make index adb24b0c7..cbfbe624c 100644 --- a/rules/weston.make +++ b/rules/weston.make @@ -15,9 +15,9 @@ PACKAGES-$(PTXCONF_WESTON) += weston # # Paths and names # -WESTON_VERSION := 10.0.2 -LIBWESTON_MAJOR := 10 -WESTON_MD5 := 8d46c0c0dd5c2ddfdced0a79ea7b6155 +WESTON_VERSION := 11.0.0 +LIBWESTON_MAJOR := 11 +WESTON_MD5 := ce50a4b11e5bb6d4a3a517ab34e86aa5 WESTON := weston-$(WESTON_VERSION) WESTON_SUFFIX := tar.xz WESTON_URL := https://gitlab.freedesktop.org/wayland/weston/-/releases/$(WESTON_VERSION)/downloads/$(WESTON).$(WESTON_SUFFIX) @@ -43,12 +43,10 @@ WESTON_CONF_OPT := \ -Dbackend-rdp=false \ -Dbackend-wayland=$(call ptx/truefalse,PTXCONF_WESTON_GL) \ -Dbackend-x11=false \ - -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) \ + -Ddeprecated-color-management-colord=false \ + -Ddeprecated-color-management-static=false \ -Ddesktop-shell-client-default=weston-desktop-shell \ -Ddoc=false \ -Dimage-jpeg=true \ @@ -66,7 +64,6 @@ WESTON_CONF_OPT := \ -Dshell-kiosk=$(call ptx/truefalse,PTXCONF_WESTON_SHELL_KIOSK) \ -Dsimple-clients=$(subst $(space),$(comma),$(WESTON_SIMPLE_CLIENTS-y)) \ -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 \ @@ -106,7 +103,6 @@ $(STATEDIR)/weston.targetinstall: @$(call install_fixup, weston,DESCRIPTION,"wayland reference compositor implementation") @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston) - @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-info) @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-debug) @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-screenshooter) ifdef PTXCONF_WESTON_SIMPLE_CLIENTS @@ -129,7 +125,6 @@ ifdef PTXCONF_WESTON_WCAP_TOOLS endif @$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)) - @$(call install_lib, weston, 0, 0, 0644, libweston-desktop-$(LIBWESTON_MAJOR)) ifdef PTXCONF_WESTON_XWAYLAND @$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)/xwayland) endif -- cgit v1.2.3