[ptxdist] [PATCH] weston: version bump 11.0.2 -> 12.0.0

[ptxdist] [PATCH] weston: version bump 11.0.2 -> 12.0.0

[Michael Tretter]

Add config items for the new VNC and PipeWire backends.

Release Announcement:

https://lists.freedesktop.org/archives/wayland-devel/2023-May/042720.html

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 rules/weston.in   | 11 +++++++++++
 rules/weston.make | 16 ++++++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/rules/weston.in b/rules/weston.in
index a698a7491509..37c0f231ae5f 100644
--- a/rules/weston.in
+++ b/rules/weston.in
@@ -41,6 +41,9 @@ menuconfig WESTON
 	select GST_PLUGINS_GOOD1_UDP	if WESTON_REMOTING && RUNTIME
 	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
 	prompt "weston                        "
 	help
 	  Wayland compositor reference implementation
@@ -59,6 +62,14 @@ config WESTON_HEADLESS_COMPOSITOR
 	bool
 	prompt "headless compositor"
 
+config WESTON_BACKEND_PIPEWIRE
+	bool
+	prompt "PipeWire backend"
+
+config WESTON_BACKEND_VNC
+	bool
+	prompt "VNC backend"
+
 config WESTON_STARTSCRIPT
 	bool
 	default y
diff --git a/rules/weston.make b/rules/weston.make
index b6a15a88dd0b..13bf7f760b8f 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -15,9 +15,9 @@ PACKAGES-$(PTXCONF_WESTON) += weston
 #
 # Paths and names
 #
-WESTON_VERSION	:= 11.0.2
-LIBWESTON_MAJOR := 11
-WESTON_MD5	:= a7633c418400c94ecefb9a6f43c1028e
+WESTON_VERSION	:= 12.0.0
+LIBWESTON_MAJOR := 12
+WESTON_MD5	:= 358ebc5564538ca179af92d3441f4892
 WESTON		:= weston-$(WESTON_VERSION)
 WESTON_SUFFIX	:= tar.gz
 WESTON_URL	:= https://gitlab.freedesktop.org/wayland/weston/-/archive/$(WESTON_VERSION)/$(WESTON).$(WESTON_SUFFIX)
@@ -40,19 +40,21 @@ WESTON_CONF_OPT		:= \
 	-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 \
+	-Dbackend-vnc=$(call ptx/truefalse,PTXCONF_WESTON_BACKEND_VNC) \
 	-Dbackend-wayland=$(call ptx/truefalse,PTXCONF_WESTON_GL) \
 	-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 \
+	-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) \
-	-Dlauncher-logind=$(call ptx/truefalse,PTXCONF_WESTON_SYSTEMD_LOGIND) \
 	-Dpipewire=$(call ptx/truefalse,PTXCONF_WESTON_PIPEWIRE) \
 	-Dremoting=$(call ptx/truefalse,PTXCONF_WESTON_REMOTING) \
 	-Drenderer-gl=$(call ptx/truefalse,PTXCONF_WESTON_GL) \
@@ -132,6 +134,12 @@ endif
 ifdef PTXCONF_WESTON_HEADLESS_COMPOSITOR
 	@$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)/headless-backend)
 endif
+ifdef PTXCONF_WESTON_BACKEND_PIPEWIRE
+	@$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)/pipewire-backend)
+endif
+ifdef PTXCONF_WESTON_BACKEND_VNC
+	@$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)/vnc-backend)
+endif
 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)
-- 
2.39.2

Re: [ptxdist] [APPLIED] weston: version bump 11.0.2 -> 12.0.1

[Michael Olbrich]

Thanks, applied as 661eaa38a1284e3107aa6eda1aff891c6574968d.

Michael

[sent from post-receive hook]

On Fri, 02 Jun 2023 09:17:31 +0200, Michael Tretter <m.tretter@pengutronix.de> wrote:
> Add config items for the new VNC and PipeWire backends.
> 
> Release Announcement:
> 
> https://lists.freedesktop.org/archives/wayland-devel/2023-May/042720.html
> 
> Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
> Message-Id: <20230522122900.2366233-1-m.tretter@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/weston-12.0.1/0001-HACK-don-t-build-tests.patch b/patches/weston-12.0.1/0001-HACK-don-t-build-tests.patch
> new file mode 100644
> index 000000000000..5a24e11b133f
> --- /dev/null
> +++ b/patches/weston-12.0.1/0001-HACK-don-t-build-tests.patch
> @@ -0,0 +1,23 @@
> +From: Michael Olbrich <m.olbrich@pengutronix.de>
> +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 <m.olbrich@pengutronix.de>
> +---
> + 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-12.0.1/series b/patches/weston-12.0.1/series
> new file mode 100644
> index 000000000000..a5dc0b485ab5
> --- /dev/null
> +++ b/patches/weston-12.0.1/series
> @@ -0,0 +1,4 @@
> +# 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 a698a7491509..37c0f231ae5f 100644
> --- a/rules/weston.in
> +++ b/rules/weston.in
> @@ -41,6 +41,9 @@ menuconfig WESTON
>  	select GST_PLUGINS_GOOD1_UDP	if WESTON_REMOTING && RUNTIME
>  	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
>  	prompt "weston                        "
>  	help
>  	  Wayland compositor reference implementation
> @@ -59,6 +62,14 @@ config WESTON_HEADLESS_COMPOSITOR
>  	bool
>  	prompt "headless compositor"
>  
> +config WESTON_BACKEND_PIPEWIRE
> +	bool
> +	prompt "PipeWire backend"
> +
> +config WESTON_BACKEND_VNC
> +	bool
> +	prompt "VNC backend"
> +
>  config WESTON_STARTSCRIPT
>  	bool
>  	default y
> diff --git a/rules/weston.make b/rules/weston.make
> index b6a15a88dd0b..f5998100f0f5 100644
> --- a/rules/weston.make
> +++ b/rules/weston.make
> @@ -15,9 +15,9 @@ PACKAGES-$(PTXCONF_WESTON) += weston
>  #
>  # Paths and names
>  #
> -WESTON_VERSION	:= 11.0.2
> -LIBWESTON_MAJOR := 11
> -WESTON_MD5	:= a7633c418400c94ecefb9a6f43c1028e
> +WESTON_VERSION	:= 12.0.1
> +LIBWESTON_MAJOR := 12
> +WESTON_MD5	:= 62247c0396a941afd3d649f33d53d09c
>  WESTON		:= weston-$(WESTON_VERSION)
>  WESTON_SUFFIX	:= tar.gz
>  WESTON_URL	:= https://gitlab.freedesktop.org/wayland/weston/-/archive/$(WESTON_VERSION)/$(WESTON).$(WESTON_SUFFIX)
> @@ -40,19 +40,21 @@ WESTON_CONF_OPT		:= \
>  	-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 \
> +	-Dbackend-vnc=$(call ptx/truefalse,PTXCONF_WESTON_BACKEND_VNC) \
>  	-Dbackend-wayland=$(call ptx/truefalse,PTXCONF_WESTON_GL) \
>  	-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 \
> +	-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) \
> -	-Dlauncher-logind=$(call ptx/truefalse,PTXCONF_WESTON_SYSTEMD_LOGIND) \
>  	-Dpipewire=$(call ptx/truefalse,PTXCONF_WESTON_PIPEWIRE) \
>  	-Dremoting=$(call ptx/truefalse,PTXCONF_WESTON_REMOTING) \
>  	-Drenderer-gl=$(call ptx/truefalse,PTXCONF_WESTON_GL) \
> @@ -132,6 +134,12 @@ endif
>  ifdef PTXCONF_WESTON_HEADLESS_COMPOSITOR
>  	@$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)/headless-backend)
>  endif
> +ifdef PTXCONF_WESTON_BACKEND_PIPEWIRE
> +	@$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)/pipewire-backend)
> +endif
> +ifdef PTXCONF_WESTON_BACKEND_VNC
> +	@$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)/vnc-backend)
> +endif
>  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)