[ptxdist] [PATCH 1/2] neatvnc: version bump 0.6.0 -> 0.7.1

[ptxdist] [PATCH 1/2] neatvnc: version bump 0.6.0 -> 0.7.1

[Philipp Zabel]

https://github.com/any1/neatvnc/releases/tag/v0.7.1

Incompatible API change in nvnc_enable_auth().

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/neatvnc.in   | 5 +++++
 rules/neatvnc.make | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/rules/neatvnc.in b/rules/neatvnc.in
index 0d0030ba772c..d962bf1907b9 100644
--- a/rules/neatvnc.in
+++ b/rules/neatvnc.in
@@ -12,6 +12,7 @@ menuconfig NEATVNC
 	select MESALIB		if NEATVNC_GBM
 	select MESALIB_GBM	if NEATVNC_GBM
 	select GNUTLS		if NEATVNC_TLS
+	select NETTLE		if NEATVNC_NETTLE
 	prompt "neatvnc                       "
 	help
 	  VNC Server library
@@ -36,4 +37,8 @@ config NEATVNC_TLS
 	bool
 	prompt "enable encryption and authentication"
 
+config NEATVNC_NETTLE
+	bool
+	prompt "enable websocket support"
+
 endif
diff --git a/rules/neatvnc.make b/rules/neatvnc.make
index b71b269ac4c6..c4e63a2259a0 100644
--- a/rules/neatvnc.make
+++ b/rules/neatvnc.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_NEATVNC) += neatvnc
 #
 # Paths and names
 #
-NEATVNC_VERSION	:= 0.6.0
-NEATVNC_MD5	:= 3a43fa75904990c023794b6057006c85
+NEATVNC_VERSION	:= 0.7.1
+NEATVNC_MD5	:= 230c9d236686d79d9f72e96c9842b70a
 NEATVNC		:= neatvnc-$(NEATVNC_VERSION)
 NEATVNC_SUFFIX	:= tar.gz
 NEATVNC_URL	:= https://github.com/any1/neatvnc/archive/refs/tags/v$(NEATVNC_VERSION).$(NEATVNC_SUFFIX)
@@ -38,6 +38,7 @@ NEATVNC_CONF_OPT	:=  \
 	-Dgbm=$(call ptx/endis,PTXCONF_NEATVNC_GBM)d \
 	-Dh264=$(call ptx/endis,PTXCONF_NEATVNC_OPENH264)d \
 	-Djpeg=$(call ptx/endis,PTXCONF_NEATVNC_JPEG)d \
+	-Dnettle=$(call ptx/endis,PTXCONF_NEATVNC_NETTLE)d \
 	-Dsystemtap=false \
 	-Dtests=false \
 	-Dtls=$(call ptx/endis,PTXCONF_NEATVNC_TLS)d
-- 
2.39.2

[ptxdist] [PATCH 2/2] weston: version bump 12.0.2 -> 13.0.0

[Philipp Zabel]

https://lists.freedesktop.org/archives/wayland-devel/2023-November/043326.html

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/weston.in   | 14 +-------------
 rules/weston.make |  8 +++-----
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/rules/weston.in b/rules/weston.in
index ade68d6c4251..ec1847721e48 100644
--- a/rules/weston.in
+++ b/rules/weston.in
@@ -14,6 +14,7 @@ menuconfig WESTON
 	select CAIRO
 	select CAIRO_PNG
 	select LIBDRM
+	select SEATD
 	select UDEV
 	select UDEV_LIBUDEV
 	select MESALIB			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) \
-- 
2.39.2

Re: [ptxdist] [APPLIED] neatvnc: version bump 0.6.0 -> 0.7.1

[Michael Olbrich]

Thanks, applied as cb9e1ff22d813ef65d4cb8743960611b24d24469.

Michael

[sent from post-receive hook]

On Thu, 07 Dec 2023 12:09:59 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> https://github.com/any1/neatvnc/releases/tag/v0.7.1
> 
> Incompatible API change in nvnc_enable_auth().
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20231128095243.3994605-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/neatvnc.in b/rules/neatvnc.in
> index 0d0030ba772c..d962bf1907b9 100644
> --- a/rules/neatvnc.in
> +++ b/rules/neatvnc.in
> @@ -12,6 +12,7 @@ menuconfig NEATVNC
>  	select MESALIB		if NEATVNC_GBM
>  	select MESALIB_GBM	if NEATVNC_GBM
>  	select GNUTLS		if NEATVNC_TLS
> +	select NETTLE		if NEATVNC_NETTLE
>  	prompt "neatvnc                       "
>  	help
>  	  VNC Server library
> @@ -36,4 +37,8 @@ config NEATVNC_TLS
>  	bool
>  	prompt "enable encryption and authentication"
>  
> +config NEATVNC_NETTLE
> +	bool
> +	prompt "enable websocket support"
> +
>  endif
> diff --git a/rules/neatvnc.make b/rules/neatvnc.make
> index b71b269ac4c6..c4e63a2259a0 100644
> --- a/rules/neatvnc.make
> +++ b/rules/neatvnc.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_NEATVNC) += neatvnc
>  #
>  # Paths and names
>  #
> -NEATVNC_VERSION	:= 0.6.0
> -NEATVNC_MD5	:= 3a43fa75904990c023794b6057006c85
> +NEATVNC_VERSION	:= 0.7.1
> +NEATVNC_MD5	:= 230c9d236686d79d9f72e96c9842b70a
>  NEATVNC		:= neatvnc-$(NEATVNC_VERSION)
>  NEATVNC_SUFFIX	:= tar.gz
>  NEATVNC_URL	:= https://github.com/any1/neatvnc/archive/refs/tags/v$(NEATVNC_VERSION).$(NEATVNC_SUFFIX)
> @@ -38,6 +38,7 @@ NEATVNC_CONF_OPT	:=  \
>  	-Dgbm=$(call ptx/endis,PTXCONF_NEATVNC_GBM)d \
>  	-Dh264=$(call ptx/endis,PTXCONF_NEATVNC_OPENH264)d \
>  	-Djpeg=$(call ptx/endis,PTXCONF_NEATVNC_JPEG)d \
> +	-Dnettle=$(call ptx/endis,PTXCONF_NEATVNC_NETTLE)d \
>  	-Dsystemtap=false \
>  	-Dtests=false \
>  	-Dtls=$(call ptx/endis,PTXCONF_NEATVNC_TLS)d