Re: [ptxdist] [APPLIED] weston: Version bump. 12.0.2 -> 13.0.0

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as 2ad63391637d15b1c530b48a88c63b3318011429.

Michael

[sent from post-receive hook]

On Thu, 07 Dec 2023 12:09:58 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> https://lists.freedesktop.org/archives/wayland-devel/2023-November/043326.html
> logind backend is gone, sort of makes seatd mandatory afaict.
> 
> * Remove deprecated options.
> 
> * seatd is a hard dependency now(?)
> 
> * Forward patchset applies cleanly.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20231204184742.2531725-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/weston-12.0.2/0001-HACK-don-t-build-tests.patch b/patches/weston-13.0.0/0001-HACK-don-t-build-tests.patch
> similarity index 100%
> rename from patches/weston-12.0.2/0001-HACK-don-t-build-tests.patch
> rename to patches/weston-13.0.0/0001-HACK-don-t-build-tests.patch
> diff --git a/patches/weston-12.0.2/series b/patches/weston-13.0.0/series
> similarity index 100%
> rename from patches/weston-12.0.2/series
> rename to patches/weston-13.0.0/series
> diff --git a/rules/weston.in b/rules/weston.in
> index ade68d6c4251..10f0e9172d4f 100644
> --- a/rules/weston.in
> +++ b/rules/weston.in
> @@ -16,6 +16,7 @@ menuconfig WESTON
>  	select LIBDRM
>  	select UDEV
>  	select UDEV_LIBUDEV
> +	select SEATD
>  	select MESALIB			if WESTON_GL
>  	select MESALIB_GBM		if WESTON_GL
>  	select MESALIB_EGL		if WESTON_GL
> @@ -26,10 +27,7 @@ menuconfig WESTON
>  	select LIBXCB			if WESTON_XWAYLAND
>  	select XORG_LIB_XCURSOR		if WESTON_XWAYLAND
>  	select XWAYLAND			if WESTON_XWAYLAND && RUNTIME
> -	select SEATD			if WESTON_SEATD
>  	select SYSTEMD			if WESTON_SYSTEMD
> -	select SYSTEMD_LOGIND		if WESTON_SYSTEMD_LOGIND
> -	select DBUS			if WESTON_SYSTEMD_LOGIND
>  	select GSTREAMER1		if WESTON_REMOTING
>  	select GST_PLUGINS_BASE1	if WESTON_REMOTING
>  	select GST_PLUGINS_BASE1_APP	if WESTON_REMOTING
> @@ -74,20 +72,10 @@ config WESTON_STARTSCRIPT
>  	depends on INITMETHOD_BBINIT
>  	prompt "install /etc/init.d/weston-init"
>  
> -config WESTON_SEATD
> -	bool
> -	default y
> -	prompt "libseat backend"
> -
>  config WESTON_SYSTEMD
>  	bool
>  	default INITMETHOD_SYSTEMD
>  
> -config WESTON_SYSTEMD_LOGIND
> -	bool
> -	depends on WESTON_SYSTEMD
> -	prompt "logind support"
> -
>  config WESTON_WCAP_TOOLS
>  	bool
>  	prompt "wcap tools"
> diff --git a/rules/weston.make b/rules/weston.make
> index 1e8c26c71713..ebf62645b186 100644
> --- a/rules/weston.make
> +++ b/rules/weston.make
> @@ -15,9 +15,9 @@ PACKAGES-$(PTXCONF_WESTON) += weston
>  #
>  # Paths and names
>  #
> -WESTON_VERSION	:= 12.0.2
> -LIBWESTON_MAJOR := 12
> -WESTON_MD5	:= aa03d8bff7163c258c86551c183cb937
> +WESTON_VERSION	:= 13.0.0
> +LIBWESTON_MAJOR := 13
> +WESTON_MD5	:= f5d8614664a26211621910d310b42890
>  WESTON		:= weston-$(WESTON_VERSION)
>  WESTON_SUFFIX	:= tar.gz
>  WESTON_URL	:= https://gitlab.freedesktop.org/wayland/weston/-/archive/$(WESTON_VERSION)/$(WESTON).$(WESTON_SUFFIX)
> @@ -49,12 +49,10 @@ WESTON_CONF_OPT		:= \
>  	-Ddemo-clients=$(call ptx/truefalse,PTXCONF_WESTON_IVISHELL_EXAMPLE) \
>  	-Ddeprecated-color-management-colord=false \
>  	-Ddeprecated-color-management-static=false \
> -	-Ddeprecated-launcher-logind=$(call ptx/truefalse,PTXCONF_WESTON_SYSTEMD_LOGIND) \
>  	-Ddesktop-shell-client-default=weston-desktop-shell \
>  	-Ddoc=false \
>  	-Dimage-jpeg=true \
>  	-Dimage-webp=false \
> -	-Dlauncher-libseat=$(call ptx/truefalse,PTXCONF_WESTON_SEATD) \
>  	-Dpipewire=$(call ptx/truefalse,PTXCONF_WESTON_PIPEWIRE) \
>  	-Dremoting=$(call ptx/truefalse,PTXCONF_WESTON_REMOTING) \
>  	-Drenderer-gl=$(call ptx/truefalse,PTXCONF_WESTON_GL) \