[ptxdist] [PATCH 0/8] libwebsockets: Pin down options and bump version

[ptxdist] [PATCH 0/8] libwebsockets: Pin down options and bump version

[Alexander Dahl via ptxdist]

Hei hei,

currently evaluating options on how to implement websockets in our
applications.  Did a litte modernization on this package here.

The list of CMake conf options for this package is huge.  And so is the
difference in binary size depending on what options are set, ranging
from <150kB to >400kB on my platform.  Problem: libwebsockets uses those
options for different purposes, which makes it very difficult to pin
down _all_ of them.

If splitting up related pin down changes in multiple commits is not
desired, I can squash commits of course.

Greets
Alex

Alexander Dahl (8):
  libwebsockets: Reorder conf opts
  libwebsockets: Add conf opt to disable -Werror
  libwebsockets: Make shared library build explicit
  libwebsockets: Remove tests and examples from build
  libwebsockets: Pin down more conf opts
  libwebsockets: version bump 4.3.3 -> 4.4.1
  libwebsockets: Make roles configurable
  libwebsockets: Pin down higher level config options

 rules/libwebsockets.in   | 21 +++++++++++++
 rules/libwebsockets.make | 68 ++++++++++++++++++++++++++++++++--------
 2 files changed, 76 insertions(+), 13 deletions(-)


base-commit: 468b451437f729a6e996572ee7c2f654f76e1463
-- 
2.39.5

[ptxdist] [PATCH 1/8] libwebsockets: Reorder conf opts

[Alexander Dahl via ptxdist]

Reduce the configure_helper.py diff output.  Adding all options
supported by libwebsockets would be a very long list however.

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/libwebsockets.make | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/rules/libwebsockets.make b/rules/libwebsockets.make
index 9203b308d..9facfa749 100644
--- a/rules/libwebsockets.make
+++ b/rules/libwebsockets.make
@@ -34,19 +34,19 @@ LIBWEBSOCKETS_LICENSE_FILES	:= file://LICENSE;md5=382bfdf329e774859fd401eaf850d2
 LIBWEBSOCKETS_CONF_TOOL	:= cmake
 LIBWEBSOCKETS_CONF_OPT	:=  \
 	$(CROSS_CMAKE_USR) \
+	-DLWS_IPV6=$(call ptx/onoff, PTXCONF_GLOBAL_IPV6) \
 	-DLWS_WITHOUT_DAEMONIZE=OFF \
-	-DLWS_WITH_ZLIB=ON \
-	-DLWS_WITH_SSL=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_TLS) \
-	-DLWS_WITH_LIBEV=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBEV) \
-	-DLWS_WITH_LIBUV=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBUV) \
-	-DLWS_WITH_LIBEVENT=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBEVENT) \
-	-DLWS_WITH_GLIB=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_GLIB) \
-	-DLWS_WITHOUT_TESTAPPS=ON \
-	-DLWS_WITHOUT_TEST_PING=ON \
-	-DLWS_WITHOUT_TEST_CLIENT=ON \
 	-DLWS_WITHOUT_EXTENSIONS=OFF \
+	-DLWS_WITHOUT_TESTAPPS=ON \
+	-DLWS_WITHOUT_TEST_CLIENT=ON \
+	-DLWS_WITHOUT_TEST_PING=ON \
 	-DLWS_WITH_EXTERNAL_POLL=ON \
-	-DLWS_IPV6=$(call ptx/onoff, PTXCONF_GLOBAL_IPV6)
+	-DLWS_WITH_GLIB=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_GLIB) \
+	-DLWS_WITH_LIBEV=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBEV) \
+	-DLWS_WITH_LIBEVENT=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBEVENT) \
+	-DLWS_WITH_LIBUV=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBUV) \
+	-DLWS_WITH_SSL=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_TLS) \
+	-DLWS_WITH_ZLIB=ON
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.39.5

[ptxdist] [PATCH 2/8] libwebsockets: Add conf opt to disable -Werror

[Alexander Dahl via ptxdist]

Avoid build failure if custom additional compiler warnings are enabled.

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/libwebsockets.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/libwebsockets.make b/rules/libwebsockets.make
index 9facfa749..2d29df23b 100644
--- a/rules/libwebsockets.make
+++ b/rules/libwebsockets.make
@@ -34,6 +34,7 @@ LIBWEBSOCKETS_LICENSE_FILES	:= file://LICENSE;md5=382bfdf329e774859fd401eaf850d2
 LIBWEBSOCKETS_CONF_TOOL	:= cmake
 LIBWEBSOCKETS_CONF_OPT	:=  \
 	$(CROSS_CMAKE_USR) \
+	-DDISABLE_WERROR=ON \
 	-DLWS_IPV6=$(call ptx/onoff, PTXCONF_GLOBAL_IPV6) \
 	-DLWS_WITHOUT_DAEMONIZE=OFF \
 	-DLWS_WITHOUT_EXTENSIONS=OFF \
-- 
2.39.5

[ptxdist] [PATCH 3/8] libwebsockets: Make shared library build explicit

[Alexander Dahl via ptxdist]

This is what gets installed later anyways.  Avoid that extra build time
for the static library.

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/libwebsockets.make | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/rules/libwebsockets.make b/rules/libwebsockets.make
index 2d29df23b..36606940c 100644
--- a/rules/libwebsockets.make
+++ b/rules/libwebsockets.make
@@ -36,6 +36,7 @@ LIBWEBSOCKETS_CONF_OPT	:=  \
 	$(CROSS_CMAKE_USR) \
 	-DDISABLE_WERROR=ON \
 	-DLWS_IPV6=$(call ptx/onoff, PTXCONF_GLOBAL_IPV6) \
+	-DLWS_LINK_TESTAPPS_DYNAMIC=ON \
 	-DLWS_WITHOUT_DAEMONIZE=OFF \
 	-DLWS_WITHOUT_EXTENSIONS=OFF \
 	-DLWS_WITHOUT_TESTAPPS=ON \
@@ -46,7 +47,9 @@ LIBWEBSOCKETS_CONF_OPT	:=  \
 	-DLWS_WITH_LIBEV=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBEV) \
 	-DLWS_WITH_LIBEVENT=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBEVENT) \
 	-DLWS_WITH_LIBUV=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBUV) \
+	-DLWS_WITH_SHARED=ON \
 	-DLWS_WITH_SSL=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_TLS) \
+	-DLWS_WITH_STATIC=OFF \
 	-DLWS_WITH_ZLIB=ON
 
 # ----------------------------------------------------------------------------
-- 
2.39.5

[ptxdist] [PATCH 4/8] libwebsockets: Remove tests and examples from build

[Alexander Dahl via ptxdist]

Further reduce build time.

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/libwebsockets.make | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/rules/libwebsockets.make b/rules/libwebsockets.make
index 36606940c..8d801bbce 100644
--- a/rules/libwebsockets.make
+++ b/rules/libwebsockets.make
@@ -34,7 +34,9 @@ LIBWEBSOCKETS_LICENSE_FILES	:= file://LICENSE;md5=382bfdf329e774859fd401eaf850d2
 LIBWEBSOCKETS_CONF_TOOL	:= cmake
 LIBWEBSOCKETS_CONF_OPT	:=  \
 	$(CROSS_CMAKE_USR) \
+	-DBUILD_TESTING=OFF \
 	-DDISABLE_WERROR=ON \
+	-DLWS_CTEST_INTERNET_AVAILABLE=OFF \
 	-DLWS_IPV6=$(call ptx/onoff, PTXCONF_GLOBAL_IPV6) \
 	-DLWS_LINK_TESTAPPS_DYNAMIC=ON \
 	-DLWS_WITHOUT_DAEMONIZE=OFF \
@@ -42,11 +44,14 @@ LIBWEBSOCKETS_CONF_OPT	:=  \
 	-DLWS_WITHOUT_TESTAPPS=ON \
 	-DLWS_WITHOUT_TEST_CLIENT=ON \
 	-DLWS_WITHOUT_TEST_PING=ON \
+	-DLWS_WITHOUT_TEST_SERVER=ON \
+	-DLWS_WITHOUT_TEST_SERVER_EXTPOLL=ON \
 	-DLWS_WITH_EXTERNAL_POLL=ON \
 	-DLWS_WITH_GLIB=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_GLIB) \
 	-DLWS_WITH_LIBEV=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBEV) \
 	-DLWS_WITH_LIBEVENT=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBEVENT) \
 	-DLWS_WITH_LIBUV=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBUV) \
+	-DLWS_WITH_MINIMAL_EXAMPLES=OFF \
 	-DLWS_WITH_SHARED=ON \
 	-DLWS_WITH_SSL=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_TLS) \
 	-DLWS_WITH_STATIC=OFF \
-- 
2.39.5

[ptxdist] [PATCH 5/8] libwebsockets: Pin down more conf opts

[Alexander Dahl via ptxdist]

These will not be set different for this platform,
or conflict with other options anyways.

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/libwebsockets.make | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/rules/libwebsockets.make b/rules/libwebsockets.make
index 8d801bbce..3c6792ae0 100644
--- a/rules/libwebsockets.make
+++ b/rules/libwebsockets.make
@@ -39,6 +39,9 @@ LIBWEBSOCKETS_CONF_OPT	:=  \
 	-DLWS_CTEST_INTERNET_AVAILABLE=OFF \
 	-DLWS_IPV6=$(call ptx/onoff, PTXCONF_GLOBAL_IPV6) \
 	-DLWS_LINK_TESTAPPS_DYNAMIC=ON \
+	-DLWS_PLAT_ANDROID=OFF \
+	-DLWS_PLAT_FREERTOS=OFF \
+	-DLWS_PLAT_OPTEE=OFF \
 	-DLWS_WITHOUT_DAEMONIZE=OFF \
 	-DLWS_WITHOUT_EXTENSIONS=OFF \
 	-DLWS_WITHOUT_TESTAPPS=ON \
@@ -46,15 +49,21 @@ LIBWEBSOCKETS_CONF_OPT	:=  \
 	-DLWS_WITHOUT_TEST_PING=ON \
 	-DLWS_WITHOUT_TEST_SERVER=ON \
 	-DLWS_WITHOUT_TEST_SERVER_EXTPOLL=ON \
+	-DLWS_WITH_ASAN=OFF \
+	-DLWS_WITH_BORINGSSL=OFF \
+	-DLWS_WITH_BUNDLED_ZLIB=OFF \
+	-DLWS_WITH_CYASSL=OFF \
 	-DLWS_WITH_EXTERNAL_POLL=ON \
 	-DLWS_WITH_GLIB=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_GLIB) \
 	-DLWS_WITH_LIBEV=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBEV) \
 	-DLWS_WITH_LIBEVENT=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBEVENT) \
 	-DLWS_WITH_LIBUV=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBUV) \
+	-DLWS_WITH_MBEDTLS=OFF \
 	-DLWS_WITH_MINIMAL_EXAMPLES=OFF \
 	-DLWS_WITH_SHARED=ON \
 	-DLWS_WITH_SSL=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_TLS) \
 	-DLWS_WITH_STATIC=OFF \
+	-DLWS_WITH_WOLFSSL=OFF \
 	-DLWS_WITH_ZLIB=ON
 
 # ----------------------------------------------------------------------------
-- 
2.39.5

[ptxdist] [PATCH 6/8] libwebsockets: version bump 4.3.3 -> 4.4.1

[Alexander Dahl via ptxdist]

Disable all (most) conf options added with the new version, because
those features significantly increase binary size.

License covers more files, and adds OFL for new contrib files.
Build tested only.

- API CHANGE: VFS open() has an extra file_ops pointer at the beginning.
- Secure Streams:  new thin layer on top of the traditional lws apis,
  which continue unchanged.
- html parsing: now allows it to work on devices with very little RAM
- Support for various embedded EPD devices.
- Many fixes and cleanups

Link: https://libwebsockets.org/git/libwebsockets/tree/changelog
Link: https://github.com/warmcat/libwebsockets/compare/v4.3.3...v4.4.1
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/libwebsockets.make | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/rules/libwebsockets.make b/rules/libwebsockets.make
index 3c6792ae0..72fdd8a29 100644
--- a/rules/libwebsockets.make
+++ b/rules/libwebsockets.make
@@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_LIBWEBSOCKETS) += libwebsockets
 #
 # Paths and names
 #
-LIBWEBSOCKETS_VERSION		:= 4.3.3
-LIBWEBSOCKETS_MD5		:= c078b08b712316f6302f54a9d05273ae
+LIBWEBSOCKETS_VERSION		:= 4.4.1
+LIBWEBSOCKETS_MD5		:= 4930ef82adc24b7912a8bb729f4a7df9
 LIBWEBSOCKETS			:= libwebsockets-$(LIBWEBSOCKETS_VERSION)
 LIBWEBSOCKETS_SUFFIX		:= tar.gz
 LIBWEBSOCKETS_URL		:= https://github.com/warmcat/libwebsockets/archive/refs/tags/v$(LIBWEBSOCKETS_VERSION).$(LIBWEBSOCKETS_SUFFIX)
 LIBWEBSOCKETS_SOURCE		:= $(SRCDIR)/$(LIBWEBSOCKETS).$(LIBWEBSOCKETS_SUFFIX)
 LIBWEBSOCKETS_DIR		:= $(BUILDDIR)/$(LIBWEBSOCKETS)
 LIBWEBSOCKETS_LICENSE		:= MIT AND BSD-2-Clause AND BSD-3-Clause
-LIBWEBSOCKETS_LICENSE_FILES	:= file://LICENSE;md5=382bfdf329e774859fd401eaf850d29b
+LIBWEBSOCKETS_LICENSE_FILES	:= file://LICENSE;md5=b5d391cc7929bcba238f9ba6805f7574
 
 # ----------------------------------------------------------------------------
 # Prepare
@@ -40,6 +40,7 @@ LIBWEBSOCKETS_CONF_OPT	:=  \
 	-DLWS_IPV6=$(call ptx/onoff, PTXCONF_GLOBAL_IPV6) \
 	-DLWS_LINK_TESTAPPS_DYNAMIC=ON \
 	-DLWS_PLAT_ANDROID=OFF \
+	-DLWS_PLAT_BAREMETAL=OFF \
 	-DLWS_PLAT_FREERTOS=OFF \
 	-DLWS_PLAT_OPTEE=OFF \
 	-DLWS_WITHOUT_DAEMONIZE=OFF \
@@ -53,16 +54,26 @@ LIBWEBSOCKETS_CONF_OPT	:=  \
 	-DLWS_WITH_BORINGSSL=OFF \
 	-DLWS_WITH_BUNDLED_ZLIB=OFF \
 	-DLWS_WITH_CYASSL=OFF \
+	-DLWS_WITH_DLO=OFF \
 	-DLWS_WITH_EXTERNAL_POLL=ON \
 	-DLWS_WITH_GLIB=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_GLIB) \
+	-DLWS_WITH_GZINFLATE=OFF \
+	-DLWS_WITH_JPEG=OFF \
+	-DLWS_WITH_JSONRPC=OFF \
+	-DLWS_WITH_LHP=OFF \
+	-DLWS_WITH_LIBCAP=ON \
 	-DLWS_WITH_LIBEV=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBEV) \
 	-DLWS_WITH_LIBEVENT=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBEVENT) \
 	-DLWS_WITH_LIBUV=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBUV) \
 	-DLWS_WITH_MBEDTLS=OFF \
 	-DLWS_WITH_MINIMAL_EXAMPLES=OFF \
+	-DLWS_WITH_OTA=OFF \
+	-DLWS_WITH_SECURE_STREAMS=OFF \
 	-DLWS_WITH_SHARED=ON \
 	-DLWS_WITH_SSL=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_TLS) \
 	-DLWS_WITH_STATIC=OFF \
+	-DLWS_WITH_UPNG=OFF \
+	-DLWS_WITH_WOL=OFF \
 	-DLWS_WITH_WOLFSSL=OFF \
 	-DLWS_WITH_ZLIB=ON
 
-- 
2.39.5

[ptxdist] [PATCH 7/8] libwebsockets: Make roles configurable

[Alexander Dahl via ptxdist]

Further reduce library size.

Quote from https://libwebsockets.org/

> "Roles" are wire protocol implementations …

So those are some kind of high level protocol support options here, and
that's also what the CMake option help text in libwebsockets source
suggests.

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/libwebsockets.in   | 21 +++++++++++++++++++++
 rules/libwebsockets.make |  7 +++++++
 2 files changed, 28 insertions(+)

diff --git a/rules/libwebsockets.in b/rules/libwebsockets.in
index e10413604..c27045502 100644
--- a/rules/libwebsockets.in
+++ b/rules/libwebsockets.in
@@ -19,6 +19,27 @@ menuconfig LIBWEBSOCKETS
 
 if LIBWEBSOCKETS
 
+menu "LWS roles                      "
+
+comment "not all roles are optional in this ptxdist package"
+
+config LIBWEBSOCKETS_ROLE_RAW_FILE
+	bool
+	prompt "raw files support"
+	default y
+
+config LIBWEBSOCKETS_ROLE_WS
+	bool
+	prompt "websockets support"
+	default y
+
+config LIBWEBSOCKETS_ROLE_H2
+	bool
+	prompt "http/2 support"
+	default y
+
+endmenu
+
 config LIBWEBSOCKETS_TLS
 	bool
 	prompt "TLS (SSL) support"
diff --git a/rules/libwebsockets.make b/rules/libwebsockets.make
index 72fdd8a29..9c039f1d4 100644
--- a/rules/libwebsockets.make
+++ b/rules/libwebsockets.make
@@ -43,6 +43,12 @@ LIBWEBSOCKETS_CONF_OPT	:=  \
 	-DLWS_PLAT_BAREMETAL=OFF \
 	-DLWS_PLAT_FREERTOS=OFF \
 	-DLWS_PLAT_OPTEE=OFF \
+	-DLWS_ROLE_DBUS=OFF \
+	-DLWS_ROLE_H1=ON \
+	-DLWS_ROLE_MQTT=OFF \
+	-DLWS_ROLE_RAW_FILE=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_ROLE_RAW_FILE) \
+	-DLWS_ROLE_RAW_PROXY=OFF \
+	-DLWS_ROLE_WS=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_ROLE_WS) \
 	-DLWS_WITHOUT_DAEMONIZE=OFF \
 	-DLWS_WITHOUT_EXTENSIONS=OFF \
 	-DLWS_WITHOUT_TESTAPPS=ON \
@@ -58,6 +64,7 @@ LIBWEBSOCKETS_CONF_OPT	:=  \
 	-DLWS_WITH_EXTERNAL_POLL=ON \
 	-DLWS_WITH_GLIB=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_GLIB) \
 	-DLWS_WITH_GZINFLATE=OFF \
+	-DLWS_WITH_HTTP2=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_ROLE_H2) \
 	-DLWS_WITH_JPEG=OFF \
 	-DLWS_WITH_JSONRPC=OFF \
 	-DLWS_WITH_LHP=OFF \
-- 
2.39.5

[ptxdist] [PATCH 8/8] libwebsockets: Pin down higher level config options

[Alexander Dahl via ptxdist]

These only set other options or are set anyways, should stay like this
to not interfere.

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/libwebsockets.make | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/rules/libwebsockets.make b/rules/libwebsockets.make
index 9c039f1d4..b8306210e 100644
--- a/rules/libwebsockets.make
+++ b/rules/libwebsockets.make
@@ -37,6 +37,7 @@ LIBWEBSOCKETS_CONF_OPT	:=  \
 	-DBUILD_TESTING=OFF \
 	-DDISABLE_WERROR=ON \
 	-DLWS_CTEST_INTERNET_AVAILABLE=OFF \
+	-DLWS_FOR_GITOHASHI=OFF \
 	-DLWS_IPV6=$(call ptx/onoff, PTXCONF_GLOBAL_IPV6) \
 	-DLWS_LINK_TESTAPPS_DYNAMIC=ON \
 	-DLWS_PLAT_ANDROID=OFF \
@@ -60,6 +61,8 @@ LIBWEBSOCKETS_CONF_OPT	:=  \
 	-DLWS_WITH_BORINGSSL=OFF \
 	-DLWS_WITH_BUNDLED_ZLIB=OFF \
 	-DLWS_WITH_CYASSL=OFF \
+	-DLWS_WITH_DIR=ON \
+	-DLWS_WITH_DISTRO_RECOMMENDED=OFF \
 	-DLWS_WITH_DLO=OFF \
 	-DLWS_WITH_EXTERNAL_POLL=ON \
 	-DLWS_WITH_GLIB=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_GLIB) \
@@ -67,13 +70,16 @@ LIBWEBSOCKETS_CONF_OPT	:=  \
 	-DLWS_WITH_HTTP2=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_ROLE_H2) \
 	-DLWS_WITH_JPEG=OFF \
 	-DLWS_WITH_JSONRPC=OFF \
+	-DLWS_WITH_LEJP_CONF=ON \
 	-DLWS_WITH_LHP=OFF \
 	-DLWS_WITH_LIBCAP=ON \
 	-DLWS_WITH_LIBEV=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBEV) \
 	-DLWS_WITH_LIBEVENT=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBEVENT) \
 	-DLWS_WITH_LIBUV=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBUV) \
+	-DLWS_WITH_LWSWS=OFF \
 	-DLWS_WITH_MBEDTLS=OFF \
 	-DLWS_WITH_MINIMAL_EXAMPLES=OFF \
+	-DLWS_WITH_NETWORK=ON \
 	-DLWS_WITH_OTA=OFF \
 	-DLWS_WITH_SECURE_STREAMS=OFF \
 	-DLWS_WITH_SHARED=ON \
-- 
2.39.5

Re: [ptxdist] [APPLIED] libwebsockets: Reorder conf opts

[Michael Olbrich]

Thanks, applied as a80dd44b79173b12c839a32e61c13e21a4815703.

Michael

[sent from post-receive hook]

On Thu, 23 Oct 2025 15:13:42 +0200, Alexander Dahl <ada@thorsis.com> wrote:
> Reduce the configure_helper.py diff output.  Adding all options
> supported by libwebsockets would be a very long list however.
> 
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20251021131118.919834-2-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libwebsockets.make b/rules/libwebsockets.make
> index 9203b308da81..9facfa7498e1 100644
> --- a/rules/libwebsockets.make
> +++ b/rules/libwebsockets.make
> @@ -34,19 +34,19 @@ LIBWEBSOCKETS_LICENSE_FILES	:= file://LICENSE;md5=382bfdf329e774859fd401eaf850d2
>  LIBWEBSOCKETS_CONF_TOOL	:= cmake
>  LIBWEBSOCKETS_CONF_OPT	:=  \
>  	$(CROSS_CMAKE_USR) \
> +	-DLWS_IPV6=$(call ptx/onoff, PTXCONF_GLOBAL_IPV6) \
>  	-DLWS_WITHOUT_DAEMONIZE=OFF \
> -	-DLWS_WITH_ZLIB=ON \
> -	-DLWS_WITH_SSL=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_TLS) \
> -	-DLWS_WITH_LIBEV=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBEV) \
> -	-DLWS_WITH_LIBUV=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBUV) \
> -	-DLWS_WITH_LIBEVENT=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBEVENT) \
> -	-DLWS_WITH_GLIB=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_GLIB) \
> +	-DLWS_WITHOUT_EXTENSIONS=OFF \
>  	-DLWS_WITHOUT_TESTAPPS=ON \
> -	-DLWS_WITHOUT_TEST_PING=ON \
>  	-DLWS_WITHOUT_TEST_CLIENT=ON \
> -	-DLWS_WITHOUT_EXTENSIONS=OFF \
> +	-DLWS_WITHOUT_TEST_PING=ON \
>  	-DLWS_WITH_EXTERNAL_POLL=ON \
> -	-DLWS_IPV6=$(call ptx/onoff, PTXCONF_GLOBAL_IPV6)
> +	-DLWS_WITH_GLIB=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_GLIB) \
> +	-DLWS_WITH_LIBEV=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBEV) \
> +	-DLWS_WITH_LIBEVENT=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBEVENT) \
> +	-DLWS_WITH_LIBUV=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBUV) \
> +	-DLWS_WITH_SSL=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_TLS) \
> +	-DLWS_WITH_ZLIB=ON
>  
>  # ----------------------------------------------------------------------------
>  # Target-Install

Re: [ptxdist] [APPLIED] libwebsockets: Add conf opt to disable -Werror

[Michael Olbrich]

Thanks, applied as c73c7795b37a4b2097830d408e74e7cd83452c93.

Michael

[sent from post-receive hook]

On Thu, 23 Oct 2025 15:13:42 +0200, Alexander Dahl <ada@thorsis.com> wrote:
> Avoid build failure if custom additional compiler warnings are enabled.
> 
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20251021131118.919834-3-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libwebsockets.make b/rules/libwebsockets.make
> index 9facfa7498e1..2d29df23bd08 100644
> --- a/rules/libwebsockets.make
> +++ b/rules/libwebsockets.make
> @@ -34,6 +34,7 @@ LIBWEBSOCKETS_LICENSE_FILES	:= file://LICENSE;md5=382bfdf329e774859fd401eaf850d2
>  LIBWEBSOCKETS_CONF_TOOL	:= cmake
>  LIBWEBSOCKETS_CONF_OPT	:=  \
>  	$(CROSS_CMAKE_USR) \
> +	-DDISABLE_WERROR=ON \
>  	-DLWS_IPV6=$(call ptx/onoff, PTXCONF_GLOBAL_IPV6) \
>  	-DLWS_WITHOUT_DAEMONIZE=OFF \
>  	-DLWS_WITHOUT_EXTENSIONS=OFF \

Re: [ptxdist] [APPLIED] libwebsockets: Make shared library build explicit

[Michael Olbrich]

Thanks, applied as ba1f48257149ceabb33dfa5c1f14dae1a16017be.

Michael

[sent from post-receive hook]

On Thu, 23 Oct 2025 15:13:43 +0200, Alexander Dahl <ada@thorsis.com> wrote:
> This is what gets installed later anyways.  Avoid that extra build time
> for the static library.
> 
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20251021131118.919834-4-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libwebsockets.make b/rules/libwebsockets.make
> index 2d29df23bd08..36606940c577 100644
> --- a/rules/libwebsockets.make
> +++ b/rules/libwebsockets.make
> @@ -36,6 +36,7 @@ LIBWEBSOCKETS_CONF_OPT	:=  \
>  	$(CROSS_CMAKE_USR) \
>  	-DDISABLE_WERROR=ON \
>  	-DLWS_IPV6=$(call ptx/onoff, PTXCONF_GLOBAL_IPV6) \
> +	-DLWS_LINK_TESTAPPS_DYNAMIC=ON \
>  	-DLWS_WITHOUT_DAEMONIZE=OFF \
>  	-DLWS_WITHOUT_EXTENSIONS=OFF \
>  	-DLWS_WITHOUT_TESTAPPS=ON \
> @@ -46,7 +47,9 @@ LIBWEBSOCKETS_CONF_OPT	:=  \
>  	-DLWS_WITH_LIBEV=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBEV) \
>  	-DLWS_WITH_LIBEVENT=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBEVENT) \
>  	-DLWS_WITH_LIBUV=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBUV) \
> +	-DLWS_WITH_SHARED=ON \
>  	-DLWS_WITH_SSL=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_TLS) \
> +	-DLWS_WITH_STATIC=OFF \
>  	-DLWS_WITH_ZLIB=ON
>  
>  # ----------------------------------------------------------------------------

Re: [ptxdist] [APPLIED] libwebsockets: Remove tests and examples from build

[Michael Olbrich]

Thanks, applied as c391a06673fea92f87826bb0dbf88c525d797394.

Michael

[sent from post-receive hook]

On Thu, 23 Oct 2025 15:13:44 +0200, Alexander Dahl <ada@thorsis.com> wrote:
> Further reduce build time.
> 
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20251021131118.919834-5-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libwebsockets.make b/rules/libwebsockets.make
> index 36606940c577..8d801bbce90a 100644
> --- a/rules/libwebsockets.make
> +++ b/rules/libwebsockets.make
> @@ -34,7 +34,9 @@ LIBWEBSOCKETS_LICENSE_FILES	:= file://LICENSE;md5=382bfdf329e774859fd401eaf850d2
>  LIBWEBSOCKETS_CONF_TOOL	:= cmake
>  LIBWEBSOCKETS_CONF_OPT	:=  \
>  	$(CROSS_CMAKE_USR) \
> +	-DBUILD_TESTING=OFF \
>  	-DDISABLE_WERROR=ON \
> +	-DLWS_CTEST_INTERNET_AVAILABLE=OFF \
>  	-DLWS_IPV6=$(call ptx/onoff, PTXCONF_GLOBAL_IPV6) \
>  	-DLWS_LINK_TESTAPPS_DYNAMIC=ON \
>  	-DLWS_WITHOUT_DAEMONIZE=OFF \
> @@ -42,11 +44,14 @@ LIBWEBSOCKETS_CONF_OPT	:=  \
>  	-DLWS_WITHOUT_TESTAPPS=ON \
>  	-DLWS_WITHOUT_TEST_CLIENT=ON \
>  	-DLWS_WITHOUT_TEST_PING=ON \
> +	-DLWS_WITHOUT_TEST_SERVER=ON \
> +	-DLWS_WITHOUT_TEST_SERVER_EXTPOLL=ON \
>  	-DLWS_WITH_EXTERNAL_POLL=ON \
>  	-DLWS_WITH_GLIB=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_GLIB) \
>  	-DLWS_WITH_LIBEV=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBEV) \
>  	-DLWS_WITH_LIBEVENT=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBEVENT) \
>  	-DLWS_WITH_LIBUV=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBUV) \
> +	-DLWS_WITH_MINIMAL_EXAMPLES=OFF \
>  	-DLWS_WITH_SHARED=ON \
>  	-DLWS_WITH_SSL=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_TLS) \
>  	-DLWS_WITH_STATIC=OFF \

Re: [ptxdist] [APPLIED] libwebsockets: Pin down more conf opts

[Michael Olbrich]

Thanks, applied as 8c8d6a5e9799d1255b3f7f08b1dda9d398b93006.

Michael

[sent from post-receive hook]

On Thu, 23 Oct 2025 15:13:45 +0200, Alexander Dahl <ada@thorsis.com> wrote:
> These will not be set different for this platform,
> or conflict with other options anyways.
> 
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20251021131118.919834-6-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libwebsockets.make b/rules/libwebsockets.make
> index 8d801bbce90a..3c6792ae010b 100644
> --- a/rules/libwebsockets.make
> +++ b/rules/libwebsockets.make
> @@ -39,6 +39,9 @@ LIBWEBSOCKETS_CONF_OPT	:=  \
>  	-DLWS_CTEST_INTERNET_AVAILABLE=OFF \
>  	-DLWS_IPV6=$(call ptx/onoff, PTXCONF_GLOBAL_IPV6) \
>  	-DLWS_LINK_TESTAPPS_DYNAMIC=ON \
> +	-DLWS_PLAT_ANDROID=OFF \
> +	-DLWS_PLAT_FREERTOS=OFF \
> +	-DLWS_PLAT_OPTEE=OFF \
>  	-DLWS_WITHOUT_DAEMONIZE=OFF \
>  	-DLWS_WITHOUT_EXTENSIONS=OFF \
>  	-DLWS_WITHOUT_TESTAPPS=ON \
> @@ -46,15 +49,21 @@ LIBWEBSOCKETS_CONF_OPT	:=  \
>  	-DLWS_WITHOUT_TEST_PING=ON \
>  	-DLWS_WITHOUT_TEST_SERVER=ON \
>  	-DLWS_WITHOUT_TEST_SERVER_EXTPOLL=ON \
> +	-DLWS_WITH_ASAN=OFF \
> +	-DLWS_WITH_BORINGSSL=OFF \
> +	-DLWS_WITH_BUNDLED_ZLIB=OFF \
> +	-DLWS_WITH_CYASSL=OFF \
>  	-DLWS_WITH_EXTERNAL_POLL=ON \
>  	-DLWS_WITH_GLIB=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_GLIB) \
>  	-DLWS_WITH_LIBEV=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBEV) \
>  	-DLWS_WITH_LIBEVENT=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBEVENT) \
>  	-DLWS_WITH_LIBUV=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBUV) \
> +	-DLWS_WITH_MBEDTLS=OFF \
>  	-DLWS_WITH_MINIMAL_EXAMPLES=OFF \
>  	-DLWS_WITH_SHARED=ON \
>  	-DLWS_WITH_SSL=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_TLS) \
>  	-DLWS_WITH_STATIC=OFF \
> +	-DLWS_WITH_WOLFSSL=OFF \
>  	-DLWS_WITH_ZLIB=ON
>  
>  # ----------------------------------------------------------------------------

Re: [ptxdist] [APPLIED] libwebsockets: version bump 4.3.3 -> 4.4.1

[Michael Olbrich]

Thanks, applied as ea568f2f3ad3e52a5db5fc591ebcaade2b40e250.

Michael

[sent from post-receive hook]

On Thu, 23 Oct 2025 15:13:45 +0200, Alexander Dahl <ada@thorsis.com> wrote:
> Disable all (most) conf options added with the new version, because
> those features significantly increase binary size.
> 
> License covers more files, and adds OFL for new contrib files.
> Build tested only.
> 
> - API CHANGE: VFS open() has an extra file_ops pointer at the beginning.
> - Secure Streams:  new thin layer on top of the traditional lws apis,
>   which continue unchanged.
> - html parsing: now allows it to work on devices with very little RAM
> - Support for various embedded EPD devices.
> - Many fixes and cleanups
> 
> Link: https://libwebsockets.org/git/libwebsockets/tree/changelog
> Link: https://github.com/warmcat/libwebsockets/compare/v4.3.3...v4.4.1
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20251021131118.919834-7-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libwebsockets.make b/rules/libwebsockets.make
> index 3c6792ae010b..72fdd8a2907b 100644
> --- a/rules/libwebsockets.make
> +++ b/rules/libwebsockets.make
> @@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_LIBWEBSOCKETS) += libwebsockets
>  #
>  # Paths and names
>  #
> -LIBWEBSOCKETS_VERSION		:= 4.3.3
> -LIBWEBSOCKETS_MD5		:= c078b08b712316f6302f54a9d05273ae
> +LIBWEBSOCKETS_VERSION		:= 4.4.1
> +LIBWEBSOCKETS_MD5		:= 4930ef82adc24b7912a8bb729f4a7df9
>  LIBWEBSOCKETS			:= libwebsockets-$(LIBWEBSOCKETS_VERSION)
>  LIBWEBSOCKETS_SUFFIX		:= tar.gz
>  LIBWEBSOCKETS_URL		:= https://github.com/warmcat/libwebsockets/archive/refs/tags/v$(LIBWEBSOCKETS_VERSION).$(LIBWEBSOCKETS_SUFFIX)
>  LIBWEBSOCKETS_SOURCE		:= $(SRCDIR)/$(LIBWEBSOCKETS).$(LIBWEBSOCKETS_SUFFIX)
>  LIBWEBSOCKETS_DIR		:= $(BUILDDIR)/$(LIBWEBSOCKETS)
>  LIBWEBSOCKETS_LICENSE		:= MIT AND BSD-2-Clause AND BSD-3-Clause
> -LIBWEBSOCKETS_LICENSE_FILES	:= file://LICENSE;md5=382bfdf329e774859fd401eaf850d29b
> +LIBWEBSOCKETS_LICENSE_FILES	:= file://LICENSE;md5=b5d391cc7929bcba238f9ba6805f7574
>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> @@ -40,6 +40,7 @@ LIBWEBSOCKETS_CONF_OPT	:=  \
>  	-DLWS_IPV6=$(call ptx/onoff, PTXCONF_GLOBAL_IPV6) \
>  	-DLWS_LINK_TESTAPPS_DYNAMIC=ON \
>  	-DLWS_PLAT_ANDROID=OFF \
> +	-DLWS_PLAT_BAREMETAL=OFF \
>  	-DLWS_PLAT_FREERTOS=OFF \
>  	-DLWS_PLAT_OPTEE=OFF \
>  	-DLWS_WITHOUT_DAEMONIZE=OFF \
> @@ -53,16 +54,26 @@ LIBWEBSOCKETS_CONF_OPT	:=  \
>  	-DLWS_WITH_BORINGSSL=OFF \
>  	-DLWS_WITH_BUNDLED_ZLIB=OFF \
>  	-DLWS_WITH_CYASSL=OFF \
> +	-DLWS_WITH_DLO=OFF \
>  	-DLWS_WITH_EXTERNAL_POLL=ON \
>  	-DLWS_WITH_GLIB=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_GLIB) \
> +	-DLWS_WITH_GZINFLATE=OFF \
> +	-DLWS_WITH_JPEG=OFF \
> +	-DLWS_WITH_JSONRPC=OFF \
> +	-DLWS_WITH_LHP=OFF \
> +	-DLWS_WITH_LIBCAP=ON \
>  	-DLWS_WITH_LIBEV=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBEV) \
>  	-DLWS_WITH_LIBEVENT=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBEVENT) \
>  	-DLWS_WITH_LIBUV=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBUV) \
>  	-DLWS_WITH_MBEDTLS=OFF \
>  	-DLWS_WITH_MINIMAL_EXAMPLES=OFF \
> +	-DLWS_WITH_OTA=OFF \
> +	-DLWS_WITH_SECURE_STREAMS=OFF \
>  	-DLWS_WITH_SHARED=ON \
>  	-DLWS_WITH_SSL=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_TLS) \
>  	-DLWS_WITH_STATIC=OFF \
> +	-DLWS_WITH_UPNG=OFF \
> +	-DLWS_WITH_WOL=OFF \
>  	-DLWS_WITH_WOLFSSL=OFF \
>  	-DLWS_WITH_ZLIB=ON
>  

Re: [ptxdist] [APPLIED] libwebsockets: Make roles configurable

[Michael Olbrich]

Thanks, applied as e328d8cfcb431a78051413297cd5d91a4907e8de.

Michael

[sent from post-receive hook]

On Thu, 23 Oct 2025 15:13:46 +0200, Alexander Dahl <ada@thorsis.com> wrote:
> Further reduce library size.
> 
> Quote from https://libwebsockets.org/
> 
> > "Roles" are wire protocol implementations …
> 
> So those are some kind of high level protocol support options here, and
> that's also what the CMake option help text in libwebsockets source
> suggests.
> 
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20251021131118.919834-8-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libwebsockets.in b/rules/libwebsockets.in
> index e10413604c9d..c27045502ba0 100644
> --- a/rules/libwebsockets.in
> +++ b/rules/libwebsockets.in
> @@ -19,6 +19,27 @@ menuconfig LIBWEBSOCKETS
>  
>  if LIBWEBSOCKETS
>  
> +menu "LWS roles                      "
> +
> +comment "not all roles are optional in this ptxdist package"
> +
> +config LIBWEBSOCKETS_ROLE_RAW_FILE
> +	bool
> +	prompt "raw files support"
> +	default y
> +
> +config LIBWEBSOCKETS_ROLE_WS
> +	bool
> +	prompt "websockets support"
> +	default y
> +
> +config LIBWEBSOCKETS_ROLE_H2
> +	bool
> +	prompt "http/2 support"
> +	default y
> +
> +endmenu
> +
>  config LIBWEBSOCKETS_TLS
>  	bool
>  	prompt "TLS (SSL) support"
> diff --git a/rules/libwebsockets.make b/rules/libwebsockets.make
> index 72fdd8a2907b..9c039f1d4956 100644
> --- a/rules/libwebsockets.make
> +++ b/rules/libwebsockets.make
> @@ -43,6 +43,12 @@ LIBWEBSOCKETS_CONF_OPT	:=  \
>  	-DLWS_PLAT_BAREMETAL=OFF \
>  	-DLWS_PLAT_FREERTOS=OFF \
>  	-DLWS_PLAT_OPTEE=OFF \
> +	-DLWS_ROLE_DBUS=OFF \
> +	-DLWS_ROLE_H1=ON \
> +	-DLWS_ROLE_MQTT=OFF \
> +	-DLWS_ROLE_RAW_FILE=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_ROLE_RAW_FILE) \
> +	-DLWS_ROLE_RAW_PROXY=OFF \
> +	-DLWS_ROLE_WS=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_ROLE_WS) \
>  	-DLWS_WITHOUT_DAEMONIZE=OFF \
>  	-DLWS_WITHOUT_EXTENSIONS=OFF \
>  	-DLWS_WITHOUT_TESTAPPS=ON \
> @@ -58,6 +64,7 @@ LIBWEBSOCKETS_CONF_OPT	:=  \
>  	-DLWS_WITH_EXTERNAL_POLL=ON \
>  	-DLWS_WITH_GLIB=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_GLIB) \
>  	-DLWS_WITH_GZINFLATE=OFF \
> +	-DLWS_WITH_HTTP2=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_ROLE_H2) \
>  	-DLWS_WITH_JPEG=OFF \
>  	-DLWS_WITH_JSONRPC=OFF \
>  	-DLWS_WITH_LHP=OFF \

Re: [ptxdist] [APPLIED] libwebsockets: Pin down higher level config options

[Michael Olbrich]

Thanks, applied as a350b7f340b3d19cca652ad9b63bcfe82f9e97d8.

Michael

[sent from post-receive hook]

On Thu, 23 Oct 2025 15:13:47 +0200, Alexander Dahl <ada@thorsis.com> wrote:
> These only set other options or are set anyways, should stay like this
> to not interfere.
> 
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20251021131118.919834-9-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libwebsockets.make b/rules/libwebsockets.make
> index 9c039f1d4956..b8306210e61f 100644
> --- a/rules/libwebsockets.make
> +++ b/rules/libwebsockets.make
> @@ -37,6 +37,7 @@ LIBWEBSOCKETS_CONF_OPT	:=  \
>  	-DBUILD_TESTING=OFF \
>  	-DDISABLE_WERROR=ON \
>  	-DLWS_CTEST_INTERNET_AVAILABLE=OFF \
> +	-DLWS_FOR_GITOHASHI=OFF \
>  	-DLWS_IPV6=$(call ptx/onoff, PTXCONF_GLOBAL_IPV6) \
>  	-DLWS_LINK_TESTAPPS_DYNAMIC=ON \
>  	-DLWS_PLAT_ANDROID=OFF \
> @@ -60,6 +61,8 @@ LIBWEBSOCKETS_CONF_OPT	:=  \
>  	-DLWS_WITH_BORINGSSL=OFF \
>  	-DLWS_WITH_BUNDLED_ZLIB=OFF \
>  	-DLWS_WITH_CYASSL=OFF \
> +	-DLWS_WITH_DIR=ON \
> +	-DLWS_WITH_DISTRO_RECOMMENDED=OFF \
>  	-DLWS_WITH_DLO=OFF \
>  	-DLWS_WITH_EXTERNAL_POLL=ON \
>  	-DLWS_WITH_GLIB=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_GLIB) \
> @@ -67,13 +70,16 @@ LIBWEBSOCKETS_CONF_OPT	:=  \
>  	-DLWS_WITH_HTTP2=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_ROLE_H2) \
>  	-DLWS_WITH_JPEG=OFF \
>  	-DLWS_WITH_JSONRPC=OFF \
> +	-DLWS_WITH_LEJP_CONF=ON \
>  	-DLWS_WITH_LHP=OFF \
>  	-DLWS_WITH_LIBCAP=ON \
>  	-DLWS_WITH_LIBEV=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBEV) \
>  	-DLWS_WITH_LIBEVENT=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBEVENT) \
>  	-DLWS_WITH_LIBUV=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBUV) \
> +	-DLWS_WITH_LWSWS=OFF \
>  	-DLWS_WITH_MBEDTLS=OFF \
>  	-DLWS_WITH_MINIMAL_EXAMPLES=OFF \
> +	-DLWS_WITH_NETWORK=ON \
>  	-DLWS_WITH_OTA=OFF \
>  	-DLWS_WITH_SECURE_STREAMS=OFF \
>  	-DLWS_WITH_SHARED=ON \