[ptxdist] [PATCH 0/4] Switch to libsoup3

mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed

* [ptxdist] [PATCH 0/4] Switch to libsoup3
@ 2022-10-04 14:45 Bastian Krause
  2022-10-04 14:45 ` [ptxdist] [PATCH 1/4] libnghttp2: new package Bastian Krause
                   ` (3 more replies)
  0 siblings, 4 replies; 9+ messages in thread
From: Bastian Krause @ 2022-10-04 14:45 UTC (permalink / raw)
  To: ptxdist; +Cc: Bastian Krause

libsoup 3.x breaks ABI compatibility with previous versions [1][2].

This series bumps the version of libsoup from 2.72.0 to 3.2.0. No
libsoup2 legacy package is needed since all dependants support libsoup3
already.

libnghttp2 is required now, so introduce a new package for that.

Finally migrate the packages that depend on libsoup and have some kind
of explicit version switch for libsoup2/libsoup3.

Note: gst-plugins-good1 needs no modification because it distinguishes
between libsoup2/libsoup3 automatically.

Regards,
Bastian

[1] https://libsoup.org/libsoup-3.0/migrating-from-libsoup-2.html
[2] https://blog.tingping.se/2021/02/23/future-of-libsoup.html

Bastian Krause (4):
  libnghttp2: new package
  libsoup: version bump 2.72.0 -> 3.2.0
  wpewebkit: use libsoup3
  cog: use libsoup3

 rules/cog.make        |  2 +-
 rules/libnghttp2.in   |  8 +++++
 rules/libnghttp2.make | 77 +++++++++++++++++++++++++++++++++++++++++++
 rules/libsoup.in      |  5 +--
 rules/libsoup.make    | 15 +++++----
 rules/wpewebkit.make  |  8 ++---
 6 files changed, 100 insertions(+), 15 deletions(-)
 create mode 100644 rules/libnghttp2.in
 create mode 100644 rules/libnghttp2.make

-- 
2.30.2

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [ptxdist] [PATCH 1/4] libnghttp2: new package
  2022-10-04 14:45 [ptxdist] [PATCH 0/4] Switch to libsoup3 Bastian Krause
@ 2022-10-04 14:45 ` Bastian Krause
  2022-10-19  5:41   ` [ptxdist] [APPLIED] " Michael Olbrich
  2022-10-04 14:45 ` [ptxdist] [PATCH 2/4] libsoup: version bump 2.72.0 -> 3.2.0 Bastian Krause
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 9+ messages in thread
From: Bastian Krause @ 2022-10-04 14:45 UTC (permalink / raw)
  To: ptxdist; +Cc: Bastian Krause

Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
 rules/libnghttp2.in   |  8 +++++
 rules/libnghttp2.make | 77 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 85 insertions(+)
 create mode 100644 rules/libnghttp2.in
 create mode 100644 rules/libnghttp2.make

diff --git a/rules/libnghttp2.in b/rules/libnghttp2.in
new file mode 100644
index 000000000..ef5f879f2
--- /dev/null
+++ b/rules/libnghttp2.in
@@ -0,0 +1,8 @@
+## SECTION=networking
+
+config LIBNGHTTP2
+	tristate
+	select HOST_CMAKE
+	prompt "libnghttp2"
+	help
+	  HTTP/2 C Library and tools
diff --git a/rules/libnghttp2.make b/rules/libnghttp2.make
new file mode 100644
index 000000000..cde2dc5de
--- /dev/null
+++ b/rules/libnghttp2.make
@@ -0,0 +1,77 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2022 by Bastian Krause <bst@pengutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_LIBNGHTTP2) += libnghttp2
+
+#
+# Paths and names
+#
+LIBNGHTTP2_VERSION	:= 1.50.0
+LIBNGHTTP2_MD5		:= 4168ccacaa009665b6a7fe455842f95b
+LIBNGHTTP2		:= nghttp2-$(LIBNGHTTP2_VERSION)
+LIBNGHTTP2_SUFFIX	:= tar.xz
+LIBNGHTTP2_URL		:= https://github.com/nghttp2/nghttp2/releases/download/v$(LIBNGHTTP2_VERSION)/$(LIBNGHTTP2).$(LIBNGHTTP2_SUFFIX)
+LIBNGHTTP2_SOURCE	:= $(SRCDIR)/$(LIBNGHTTP2).$(LIBNGHTTP2_SUFFIX)
+LIBNGHTTP2_DIR		:= $(BUILDDIR)/$(LIBNGHTTP2)
+LIBNGHTTP2_LICENSE	:= MIT
+LIBNGHTTP2_LICENSE_FILES	:= file://COPYING;md5=764abdf30b2eadd37ce47dcbce0ea1ec
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# cmake
+#
+LIBNGHTTP2_CONF_TOOL	:= cmake
+LIBNGHTTP2_CONF_OPT	:=  \
+	$(CROSS_CMAKE_USR) \
+	-DENABLE_APP=OFF \
+	-DENABLE_ASIO_LIB=OFF \
+	-DENABLE_DEBUG=OFF \
+	-DENABLE_DOC=OFF \
+	-DENABLE_EXAMPLES=OFF \
+	-DENABLE_FAILMALLOC=OFF \
+	-DENABLE_HPACK_TOOLS=OFF \
+	-DENABLE_HTTP3=OFF \
+	-DENABLE_LIB_ONLY=ON \
+	-DENABLE_PYTHON_BINDINGS=OFF \
+	-DENABLE_SHARED_LIB=ON \
+	-DENABLE_STATIC_CRT=OFF \
+	-DENABLE_STATIC_LIB=OFF \
+	-DENABLE_THREADS=ON \
+	-DENABLE_WERROR=OFF \
+	-DWITH_JEMALLOC=OFF \
+	-DWITH_LIBBPF=OFF \
+	-DWITH_LIBXML2=OFF \
+	-DWITH_MRUBY=OFF \
+	-DWITH_NEVERBLEED=OFF
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/libnghttp2.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, libnghttp2)
+	@$(call install_fixup, libnghttp2,PRIORITY,optional)
+	@$(call install_fixup, libnghttp2,SECTION,base)
+	@$(call install_fixup, libnghttp2,AUTHOR,"Bastian Krause <bst@pengutronix.de>")
+	@$(call install_fixup, libnghttp2,DESCRIPTION,missing)
+
+	@$(call install_lib, libnghttp2, 0, 0, 0644, libnghttp2)
+
+	@$(call install_finish, libnghttp2)
+
+	@$(call touch)
+
+# vim: syntax=make
-- 
2.30.2




^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [ptxdist] [APPLIED] libnghttp2: new package
  2022-10-04 14:45 ` [ptxdist] [PATCH 1/4] libnghttp2: new package Bastian Krause
@ 2022-10-19  5:41   ` Michael Olbrich
  0 siblings, 0 replies; 9+ messages in thread
From: Michael Olbrich @ 2022-10-19  5:41 UTC (permalink / raw)
  To: ptxdist; +Cc: Bastian Krause

Thanks, applied as cde9587536a2520edb12dff6ae5b125cd906ba21.

Michael

[sent from post-receive hook]

On Wed, 19 Oct 2022 07:41:10 +0200, Bastian Krause <bst@pengutronix.de> wrote:
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> Message-Id: <20221004144533.2269637-2-bst@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libnghttp2.in b/rules/libnghttp2.in
> new file mode 100644
> index 000000000000..ef5f879f21fd
> --- /dev/null
> +++ b/rules/libnghttp2.in
> @@ -0,0 +1,8 @@
> +## SECTION=networking
> +
> +config LIBNGHTTP2
> +	tristate
> +	select HOST_CMAKE
> +	prompt "libnghttp2"
> +	help
> +	  HTTP/2 C Library and tools
> diff --git a/rules/libnghttp2.make b/rules/libnghttp2.make
> new file mode 100644
> index 000000000000..cde2dc5deadd
> --- /dev/null
> +++ b/rules/libnghttp2.make
> @@ -0,0 +1,77 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2022 by Bastian Krause <bst@pengutronix.de>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_LIBNGHTTP2) += libnghttp2
> +
> +#
> +# Paths and names
> +#
> +LIBNGHTTP2_VERSION	:= 1.50.0
> +LIBNGHTTP2_MD5		:= 4168ccacaa009665b6a7fe455842f95b
> +LIBNGHTTP2		:= nghttp2-$(LIBNGHTTP2_VERSION)
> +LIBNGHTTP2_SUFFIX	:= tar.xz
> +LIBNGHTTP2_URL		:= https://github.com/nghttp2/nghttp2/releases/download/v$(LIBNGHTTP2_VERSION)/$(LIBNGHTTP2).$(LIBNGHTTP2_SUFFIX)
> +LIBNGHTTP2_SOURCE	:= $(SRCDIR)/$(LIBNGHTTP2).$(LIBNGHTTP2_SUFFIX)
> +LIBNGHTTP2_DIR		:= $(BUILDDIR)/$(LIBNGHTTP2)
> +LIBNGHTTP2_LICENSE	:= MIT
> +LIBNGHTTP2_LICENSE_FILES	:= file://COPYING;md5=764abdf30b2eadd37ce47dcbce0ea1ec
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +#
> +# cmake
> +#
> +LIBNGHTTP2_CONF_TOOL	:= cmake
> +LIBNGHTTP2_CONF_OPT	:=  \
> +	$(CROSS_CMAKE_USR) \
> +	-DENABLE_APP=OFF \
> +	-DENABLE_ASIO_LIB=OFF \
> +	-DENABLE_DEBUG=OFF \
> +	-DENABLE_DOC=OFF \
> +	-DENABLE_EXAMPLES=OFF \
> +	-DENABLE_FAILMALLOC=OFF \
> +	-DENABLE_HPACK_TOOLS=OFF \
> +	-DENABLE_HTTP3=OFF \
> +	-DENABLE_LIB_ONLY=ON \
> +	-DENABLE_PYTHON_BINDINGS=OFF \
> +	-DENABLE_SHARED_LIB=ON \
> +	-DENABLE_STATIC_CRT=OFF \
> +	-DENABLE_STATIC_LIB=OFF \
> +	-DENABLE_THREADS=ON \
> +	-DENABLE_WERROR=OFF \
> +	-DWITH_JEMALLOC=OFF \
> +	-DWITH_LIBBPF=OFF \
> +	-DWITH_LIBXML2=OFF \
> +	-DWITH_MRUBY=OFF \
> +	-DWITH_NEVERBLEED=OFF
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/libnghttp2.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, libnghttp2)
> +	@$(call install_fixup, libnghttp2,PRIORITY,optional)
> +	@$(call install_fixup, libnghttp2,SECTION,base)
> +	@$(call install_fixup, libnghttp2,AUTHOR,"Bastian Krause <bst@pengutronix.de>")
> +	@$(call install_fixup, libnghttp2,DESCRIPTION,missing)
> +
> +	@$(call install_lib, libnghttp2, 0, 0, 0644, libnghttp2)
> +
> +	@$(call install_finish, libnghttp2)
> +
> +	@$(call touch)
> +
> +# vim: syntax=make



^ permalink raw reply	[flat|nested] 9+ messages in thread

* [ptxdist] [PATCH 2/4] libsoup: version bump 2.72.0 -> 3.2.0
  2022-10-04 14:45 [ptxdist] [PATCH 0/4] Switch to libsoup3 Bastian Krause
  2022-10-04 14:45 ` [ptxdist] [PATCH 1/4] libnghttp2: new package Bastian Krause
@ 2022-10-04 14:45 ` Bastian Krause
  2022-10-19  5:41   ` [ptxdist] [APPLIED] " Michael Olbrich
  2022-10-04 14:45 ` [ptxdist] [PATCH 3/4] wpewebkit: use libsoup3 Bastian Krause
  2022-10-04 14:45 ` [ptxdist] [PATCH 4/4] cog: " Bastian Krause
  3 siblings, 1 reply; 9+ messages in thread
From: Bastian Krause @ 2022-10-04 14:45 UTC (permalink / raw)
  To: ptxdist; +Cc: Bastian Krause

Note that libsoup 3.x breaks previous ABI [1].

[1] https://libsoup.org/libsoup-3.0/migrating-from-libsoup-2.html

Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
 rules/libsoup.in   |  5 +----
 rules/libsoup.make | 15 +++++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/rules/libsoup.in b/rules/libsoup.in
index 42ee2b1d8..788d7985d 100644
--- a/rules/libsoup.in
+++ b/rules/libsoup.in
@@ -6,11 +6,8 @@ config LIBSOUP
 	select HOST_GLIB
 	select GLIB
 	select SQLITE
+	select LIBNGHTTP2
 	select LIBPSL
-	select LIBXML2
-	select LIBXML2_OUTPUT
-	select LIBXML2_SAX1
-	select HOST_INTLTOOL
 	select GOBJECT_INTROSPECTION	if LIBSOUP_INTROSPECTION
 	prompt "libsoup"
 	help
diff --git a/rules/libsoup.make b/rules/libsoup.make
index 74ae2f030..34b80ecee 100644
--- a/rules/libsoup.make
+++ b/rules/libsoup.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBSOUP) += libsoup
 #
 # Paths and names
 #
-LIBSOUP_VERSION	:= 2.72.0
-LIBSOUP_MD5	:= 859380b76b51fb55d720daea3c76c945
+LIBSOUP_VERSION	:= 3.2.0
+LIBSOUP_MD5	:= 34f1f15aa43f974dadf256aef2e89587
 LIBSOUP		:= libsoup-$(LIBSOUP_VERSION)
 LIBSOUP_SUFFIX	:= tar.xz
 LIBSOUP_URL	:= $(call ptx/mirror, GNOME, libsoup/$(basename $(LIBSOUP_VERSION))/$(LIBSOUP).$(LIBSOUP_SUFFIX))
@@ -35,15 +35,18 @@ LIBSOUP_LICENSE_FILES := \
 LIBSOUP_CONF_TOOL := meson
 LIBSOUP_CONF_OPT := \
 	$(CROSS_MESON_USR) \
+	-Dautobahn=disabled \
 	-Dbrotli=disabled \
-	-Dgnome=true \
+	-Ddoc_tests=false \
+	-Ddocs=disabled \
+	-Dfuzzing=disabled \
 	-Dgssapi=disabled \
-	-Dgtk_doc=false \
 	-Dinstalled_tests=false \
 	-Dintrospection=$(call ptx/endis, PTXCONF_LIBSOUP_INTROSPECTION)d \
 	-Dkrb5_config= \
 	-Dntlm=disabled \
 	-Dntlm_auth=ntlm_auth \
+	-Dpkcs11_tests=disabled \
 	-Dsysprof=disabled \
 	-Dtests=false \
 	-Dtls_check=false \
@@ -62,10 +65,10 @@ $(STATEDIR)/libsoup.targetinstall:
 	@$(call install_fixup, libsoup,AUTHOR,"Marc Kleine-Budde <mkl@pengutronix.de>")
 	@$(call install_fixup, libsoup,DESCRIPTION,missing)
 
-	@$(call install_lib, libsoup, 0, 0, 0644, libsoup-2.4)
+	@$(call install_lib, libsoup, 0, 0, 0644, libsoup-3.0)
 ifdef PTXCONF_LIBSOUP_INTROSPECTION
 	@$(call install_copy, libsoup, 0, 0, 0644, -, \
-		/usr/lib/girepository-1.0/Soup-2.4.typelib)
+		/usr/lib/girepository-1.0/Soup-3.0.typelib)
 endif
 
 	@$(call install_finish, libsoup)
-- 
2.30.2




^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [ptxdist] [APPLIED] libsoup: version bump 2.72.0 -> 3.2.0
  2022-10-04 14:45 ` [ptxdist] [PATCH 2/4] libsoup: version bump 2.72.0 -> 3.2.0 Bastian Krause
@ 2022-10-19  5:41   ` Michael Olbrich
  0 siblings, 0 replies; 9+ messages in thread
From: Michael Olbrich @ 2022-10-19  5:41 UTC (permalink / raw)
  To: ptxdist; +Cc: Bastian Krause

Thanks, applied as 2416a4ce1557ac70173c52e7894dd53fa01fb199.

Michael

[sent from post-receive hook]

On Wed, 19 Oct 2022 07:41:11 +0200, Bastian Krause <bst@pengutronix.de> wrote:
> Note that libsoup 3.x breaks previous ABI [1].
> 
> [1] https://libsoup.org/libsoup-3.0/migrating-from-libsoup-2.html
> 
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> Message-Id: <20221004144533.2269637-3-bst@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libsoup.in b/rules/libsoup.in
> index 42ee2b1d8ea8..788d7985d8df 100644
> --- a/rules/libsoup.in
> +++ b/rules/libsoup.in
> @@ -6,11 +6,8 @@ config LIBSOUP
>  	select HOST_GLIB
>  	select GLIB
>  	select SQLITE
> +	select LIBNGHTTP2
>  	select LIBPSL
> -	select LIBXML2
> -	select LIBXML2_OUTPUT
> -	select LIBXML2_SAX1
> -	select HOST_INTLTOOL
>  	select GOBJECT_INTROSPECTION	if LIBSOUP_INTROSPECTION
>  	prompt "libsoup"
>  	help
> diff --git a/rules/libsoup.make b/rules/libsoup.make
> index 74ae2f030b13..34b80ecee610 100644
> --- a/rules/libsoup.make
> +++ b/rules/libsoup.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBSOUP) += libsoup
>  #
>  # Paths and names
>  #
> -LIBSOUP_VERSION	:= 2.72.0
> -LIBSOUP_MD5	:= 859380b76b51fb55d720daea3c76c945
> +LIBSOUP_VERSION	:= 3.2.0
> +LIBSOUP_MD5	:= 34f1f15aa43f974dadf256aef2e89587
>  LIBSOUP		:= libsoup-$(LIBSOUP_VERSION)
>  LIBSOUP_SUFFIX	:= tar.xz
>  LIBSOUP_URL	:= $(call ptx/mirror, GNOME, libsoup/$(basename $(LIBSOUP_VERSION))/$(LIBSOUP).$(LIBSOUP_SUFFIX))
> @@ -35,15 +35,18 @@ LIBSOUP_LICENSE_FILES := \
>  LIBSOUP_CONF_TOOL := meson
>  LIBSOUP_CONF_OPT := \
>  	$(CROSS_MESON_USR) \
> +	-Dautobahn=disabled \
>  	-Dbrotli=disabled \
> -	-Dgnome=true \
> +	-Ddoc_tests=false \
> +	-Ddocs=disabled \
> +	-Dfuzzing=disabled \
>  	-Dgssapi=disabled \
> -	-Dgtk_doc=false \
>  	-Dinstalled_tests=false \
>  	-Dintrospection=$(call ptx/endis, PTXCONF_LIBSOUP_INTROSPECTION)d \
>  	-Dkrb5_config= \
>  	-Dntlm=disabled \
>  	-Dntlm_auth=ntlm_auth \
> +	-Dpkcs11_tests=disabled \
>  	-Dsysprof=disabled \
>  	-Dtests=false \
>  	-Dtls_check=false \
> @@ -62,10 +65,10 @@ $(STATEDIR)/libsoup.targetinstall:
>  	@$(call install_fixup, libsoup,AUTHOR,"Marc Kleine-Budde <mkl@pengutronix.de>")
>  	@$(call install_fixup, libsoup,DESCRIPTION,missing)
>  
> -	@$(call install_lib, libsoup, 0, 0, 0644, libsoup-2.4)
> +	@$(call install_lib, libsoup, 0, 0, 0644, libsoup-3.0)
>  ifdef PTXCONF_LIBSOUP_INTROSPECTION
>  	@$(call install_copy, libsoup, 0, 0, 0644, -, \
> -		/usr/lib/girepository-1.0/Soup-2.4.typelib)
> +		/usr/lib/girepository-1.0/Soup-3.0.typelib)
>  endif
>  
>  	@$(call install_finish, libsoup)



^ permalink raw reply	[flat|nested] 9+ messages in thread

* [ptxdist] [PATCH 3/4] wpewebkit: use libsoup3
  2022-10-04 14:45 [ptxdist] [PATCH 0/4] Switch to libsoup3 Bastian Krause
  2022-10-04 14:45 ` [ptxdist] [PATCH 1/4] libnghttp2: new package Bastian Krause
  2022-10-04 14:45 ` [ptxdist] [PATCH 2/4] libsoup: version bump 2.72.0 -> 3.2.0 Bastian Krause
@ 2022-10-04 14:45 ` Bastian Krause
  2022-10-19  5:41   ` [ptxdist] [APPLIED] " Michael Olbrich
  2022-10-04 14:45 ` [ptxdist] [PATCH 4/4] cog: " Bastian Krause
  3 siblings, 1 reply; 9+ messages in thread
From: Bastian Krause @ 2022-10-04 14:45 UTC (permalink / raw)
  To: ptxdist; +Cc: Bastian Krause

libsoup 3.0 is not API-compatible with 2.0, see [1]. When switching to
it, the libWPEWebKit version changes.

[1] https://libsoup.org/libsoup-3.0/migrating-from-libsoup-2.html

Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
 rules/wpewebkit.make | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rules/wpewebkit.make b/rules/wpewebkit.make
index 3819c5667..4421f33fb 100644
--- a/rules/wpewebkit.make
+++ b/rules/wpewebkit.make
@@ -69,7 +69,7 @@ WPEWEBKIT_CONF_OPT	:= \
 	-DUSE_JPEGXL=OFF \
 	-DUSE_LCMS=OFF \
 	-DUSE_OPENJPEG=OFF \
-	-DUSE_SOUP2=ON \
+	-DUSE_SOUP2=OFF \
 	-DUSE_THIN_ARCHIVES=ON \
 	-DUSE_WOFF2=OFF
 
@@ -105,10 +105,10 @@ $(STATEDIR)/wpewebkit.targetinstall:
 	@$(call install_fixup, wpewebkit,AUTHOR,"Steffen Trumtrar <s.trumtrar@pengutronix.de>")
 	@$(call install_fixup, wpewebkit,DESCRIPTION,missing)
 
-	@$(call install_lib, wpewebkit, 0, 0, 0644, libWPEWebKit-1.0)
+	@$(call install_lib, wpewebkit, 0, 0, 0644, libWPEWebKit-1.1)
 
-	@$(call install_tree, wpewebkit, 0, 0, -, /usr/libexec/wpe-webkit-1.0)
-	@$(call install_tree, wpewebkit, 0, 0, -, /usr/lib/wpe-webkit-1.0)
+	@$(call install_tree, wpewebkit, 0, 0, -, /usr/libexec/wpe-webkit-1.1)
+	@$(call install_tree, wpewebkit, 0, 0, -, /usr/lib/wpe-webkit-1.1)
 
 ifdef PTXCONF_WPEWEBKIT_QT
 	@$(call install_tree, wpewebkit, 0, 0, -, /usr/lib/qt5/qml/org/wpewebkit)
-- 
2.30.2




^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [ptxdist] [APPLIED] wpewebkit: use libsoup3
  2022-10-04 14:45 ` [ptxdist] [PATCH 3/4] wpewebkit: use libsoup3 Bastian Krause
@ 2022-10-19  5:41   ` Michael Olbrich
  0 siblings, 0 replies; 9+ messages in thread
From: Michael Olbrich @ 2022-10-19  5:41 UTC (permalink / raw)
  To: ptxdist; +Cc: Bastian Krause

Thanks, applied as 2320ed4b07ad4218e4a409f90aa6d274b76c271a.

Michael

[sent from post-receive hook]

On Wed, 19 Oct 2022 07:41:12 +0200, Bastian Krause <bst@pengutronix.de> wrote:
> libsoup 3.0 is not API-compatible with 2.0, see [1]. When switching to
> it, the libWPEWebKit version changes.
> 
> [1] https://libsoup.org/libsoup-3.0/migrating-from-libsoup-2.html
> 
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> Message-Id: <20221004144533.2269637-4-bst@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/wpewebkit.make b/rules/wpewebkit.make
> index 3819c5667240..4421f33fb1ee 100644
> --- a/rules/wpewebkit.make
> +++ b/rules/wpewebkit.make
> @@ -69,7 +69,7 @@ WPEWEBKIT_CONF_OPT	:= \
>  	-DUSE_JPEGXL=OFF \
>  	-DUSE_LCMS=OFF \
>  	-DUSE_OPENJPEG=OFF \
> -	-DUSE_SOUP2=ON \
> +	-DUSE_SOUP2=OFF \
>  	-DUSE_THIN_ARCHIVES=ON \
>  	-DUSE_WOFF2=OFF
>  
> @@ -105,10 +105,10 @@ $(STATEDIR)/wpewebkit.targetinstall:
>  	@$(call install_fixup, wpewebkit,AUTHOR,"Steffen Trumtrar <s.trumtrar@pengutronix.de>")
>  	@$(call install_fixup, wpewebkit,DESCRIPTION,missing)
>  
> -	@$(call install_lib, wpewebkit, 0, 0, 0644, libWPEWebKit-1.0)
> +	@$(call install_lib, wpewebkit, 0, 0, 0644, libWPEWebKit-1.1)
>  
> -	@$(call install_tree, wpewebkit, 0, 0, -, /usr/libexec/wpe-webkit-1.0)
> -	@$(call install_tree, wpewebkit, 0, 0, -, /usr/lib/wpe-webkit-1.0)
> +	@$(call install_tree, wpewebkit, 0, 0, -, /usr/libexec/wpe-webkit-1.1)
> +	@$(call install_tree, wpewebkit, 0, 0, -, /usr/lib/wpe-webkit-1.1)
>  
>  ifdef PTXCONF_WPEWEBKIT_QT
>  	@$(call install_tree, wpewebkit, 0, 0, -, /usr/lib/qt5/qml/org/wpewebkit)



^ permalink raw reply	[flat|nested] 9+ messages in thread

* [ptxdist] [PATCH 4/4] cog: use libsoup3
  2022-10-04 14:45 [ptxdist] [PATCH 0/4] Switch to libsoup3 Bastian Krause
                   ` (2 preceding siblings ...)
  2022-10-04 14:45 ` [ptxdist] [PATCH 3/4] wpewebkit: use libsoup3 Bastian Krause
@ 2022-10-04 14:45 ` Bastian Krause
  2022-10-19  5:41   ` [ptxdist] [APPLIED] " Michael Olbrich
  3 siblings, 1 reply; 9+ messages in thread
From: Bastian Krause @ 2022-10-04 14:45 UTC (permalink / raw)
  To: ptxdist; +Cc: Bastian Krause

Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
 rules/cog.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/cog.make b/rules/cog.make
index e8be1f709..2c0514a22 100644
--- a/rules/cog.make
+++ b/rules/cog.make
@@ -43,7 +43,7 @@ COG_CONF_OPT	:= \
 	-Dplatforms=wayland \
 	-Dplugin_path=/usr/lib/cog/modules \
 	-Dprograms=true \
-	-Dsoup2=enabled \
+	-Dsoup2=disabled \
 	-Dwayland_weston_content_protection=false \
 	-Dwayland_weston_direct_display=false
 
-- 
2.30.2




^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [ptxdist] [APPLIED] cog: use libsoup3
  2022-10-04 14:45 ` [ptxdist] [PATCH 4/4] cog: " Bastian Krause
@ 2022-10-19  5:41   ` Michael Olbrich
  0 siblings, 0 replies; 9+ messages in thread
From: Michael Olbrich @ 2022-10-19  5:41 UTC (permalink / raw)
  To: ptxdist; +Cc: Bastian Krause

Thanks, applied as 91d3bdbce434d01ad9e61e8814062603a077d389.

Michael

[sent from post-receive hook]

On Wed, 19 Oct 2022 07:41:13 +0200, Bastian Krause <bst@pengutronix.de> wrote:
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> Message-Id: <20221004144533.2269637-5-bst@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/cog.make b/rules/cog.make
> index e8be1f7097a4..2c0514a221ac 100644
> --- a/rules/cog.make
> +++ b/rules/cog.make
> @@ -43,7 +43,7 @@ COG_CONF_OPT	:= \
>  	-Dplatforms=wayland \
>  	-Dplugin_path=/usr/lib/cog/modules \
>  	-Dprograms=true \
> -	-Dsoup2=enabled \
> +	-Dsoup2=disabled \
>  	-Dwayland_weston_content_protection=false \
>  	-Dwayland_weston_direct_display=false
>  



^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2022-10-19  5:41 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-04 14:45 [ptxdist] [PATCH 0/4] Switch to libsoup3 Bastian Krause
2022-10-04 14:45 ` [ptxdist] [PATCH 1/4] libnghttp2: new package Bastian Krause
2022-10-19  5:41   ` [ptxdist] [APPLIED] " Michael Olbrich
2022-10-04 14:45 ` [ptxdist] [PATCH 2/4] libsoup: version bump 2.72.0 -> 3.2.0 Bastian Krause
2022-10-19  5:41   ` [ptxdist] [APPLIED] " Michael Olbrich
2022-10-04 14:45 ` [ptxdist] [PATCH 3/4] wpewebkit: use libsoup3 Bastian Krause
2022-10-19  5:41   ` [ptxdist] [APPLIED] " Michael Olbrich
2022-10-04 14:45 ` [ptxdist] [PATCH 4/4] cog: " Bastian Krause
2022-10-19  5:41   ` [ptxdist] [APPLIED] " Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox