* [ptxdist] [PATCH 2/5] wpebackend-fdo: add missing libxkbcommon dependency
2022-09-23 13:45 [ptxdist] [PATCH 1/5] libwpe: version bump 1.12.0 -> 1.14.0 Bastian Krause
@ 2022-09-23 13:45 ` Bastian Krause
2022-09-28 14:29 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-09-23 13:45 ` [ptxdist] [PATCH 3/5] wpebackend-fdo: version bump 1.12.0 -> 1.14.0 Bastian Krause
` (3 subsequent siblings)
4 siblings, 1 reply; 10+ messages in thread
From: Bastian Krause @ 2022-09-23 13:45 UTC (permalink / raw)
To: ptxdist; +Cc: Bastian Krause
Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
rules/wpebackend-fdo.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/rules/wpebackend-fdo.in b/rules/wpebackend-fdo.in
index 0b355bb68..dffadaf6f 100644
--- a/rules/wpebackend-fdo.in
+++ b/rules/wpebackend-fdo.in
@@ -6,6 +6,7 @@ config WPEBACKEND_FDO
select HOST_MESON
select LIBEPOXY
select LIBWPE
+ select LIBXKBCOMMON
select GLIB
select MESALIB
select MESALIB_EGL
--
2.30.2
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [ptxdist] [APPLIED] wpebackend-fdo: add missing libxkbcommon dependency
2022-09-23 13:45 ` [ptxdist] [PATCH 2/5] wpebackend-fdo: add missing libxkbcommon dependency Bastian Krause
@ 2022-09-28 14:29 ` Michael Olbrich
0 siblings, 0 replies; 10+ messages in thread
From: Michael Olbrich @ 2022-09-28 14:29 UTC (permalink / raw)
To: ptxdist; +Cc: Bastian Krause
Thanks, applied as ccd2df34574360df463ce83c10d91bcd2106db4f.
Michael
[sent from post-receive hook]
On Wed, 28 Sep 2022 16:29:14 +0200, Bastian Krause <bst@pengutronix.de> wrote:
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> Message-Id: <20220923134511.2586045-2-bst@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/wpebackend-fdo.in b/rules/wpebackend-fdo.in
> index 0b355bb68ef7..dffadaf6fc22 100644
> --- a/rules/wpebackend-fdo.in
> +++ b/rules/wpebackend-fdo.in
> @@ -6,6 +6,7 @@ config WPEBACKEND_FDO
> select HOST_MESON
> select LIBEPOXY
> select LIBWPE
> + select LIBXKBCOMMON
> select GLIB
> select MESALIB
> select MESALIB_EGL
^ permalink raw reply [flat|nested] 10+ messages in thread
* [ptxdist] [PATCH 3/5] wpebackend-fdo: version bump 1.12.0 -> 1.14.0
2022-09-23 13:45 [ptxdist] [PATCH 1/5] libwpe: version bump 1.12.0 -> 1.14.0 Bastian Krause
2022-09-23 13:45 ` [ptxdist] [PATCH 2/5] wpebackend-fdo: add missing libxkbcommon dependency Bastian Krause
@ 2022-09-23 13:45 ` Bastian Krause
2022-09-28 14:29 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-09-23 13:45 ` [ptxdist] [PATCH 4/5] cog: version bump 0.12.1 -> 0.14.1 Bastian Krause
` (2 subsequent siblings)
4 siblings, 1 reply; 10+ messages in thread
From: Bastian Krause @ 2022-09-23 13:45 UTC (permalink / raw)
To: ptxdist; +Cc: Bastian Krause
Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
rules/wpebackend-fdo.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/wpebackend-fdo.make b/rules/wpebackend-fdo.make
index 36864c34b..4981f8326 100644
--- a/rules/wpebackend-fdo.make
+++ b/rules/wpebackend-fdo.make
@@ -14,9 +14,9 @@ PACKAGES-$(PTXCONF_WPEBACKEND_FDO) += wpebackend-fdo
#
# Paths and names
#
-WPEBACKEND_FDO_VERSION := 1.12.0
+WPEBACKEND_FDO_VERSION := 1.14.0
WPEBACKEND_FDO_LIBRARY_VERSION := 1.0
-WPEBACKEND_FDO_MD5 := c43b34a4b4933bcd80068ae5776ee346
+WPEBACKEND_FDO_MD5 := ea62dfa9ecb366598a837d7446ed48ac
WPEBACKEND_FDO := wpebackend-fdo-$(WPEBACKEND_FDO_VERSION)
WPEBACKEND_FDO_SUFFIX := tar.xz
WPEBACKEND_FDO_URL := https://wpewebkit.org/releases/$(WPEBACKEND_FDO).$(WPEBACKEND_FDO_SUFFIX)
--
2.30.2
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [ptxdist] [APPLIED] wpebackend-fdo: version bump 1.12.0 -> 1.14.0
2022-09-23 13:45 ` [ptxdist] [PATCH 3/5] wpebackend-fdo: version bump 1.12.0 -> 1.14.0 Bastian Krause
@ 2022-09-28 14:29 ` Michael Olbrich
0 siblings, 0 replies; 10+ messages in thread
From: Michael Olbrich @ 2022-09-28 14:29 UTC (permalink / raw)
To: ptxdist; +Cc: Bastian Krause
Thanks, applied as 15af7737a06a16f360945f95e2e2e3c12a72a69e.
Michael
[sent from post-receive hook]
On Wed, 28 Sep 2022 16:29:15 +0200, Bastian Krause <bst@pengutronix.de> wrote:
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> Message-Id: <20220923134511.2586045-3-bst@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/wpebackend-fdo.make b/rules/wpebackend-fdo.make
> index 36864c34be9a..4981f8326964 100644
> --- a/rules/wpebackend-fdo.make
> +++ b/rules/wpebackend-fdo.make
> @@ -14,9 +14,9 @@ PACKAGES-$(PTXCONF_WPEBACKEND_FDO) += wpebackend-fdo
> #
> # Paths and names
> #
> -WPEBACKEND_FDO_VERSION := 1.12.0
> +WPEBACKEND_FDO_VERSION := 1.14.0
> WPEBACKEND_FDO_LIBRARY_VERSION := 1.0
> -WPEBACKEND_FDO_MD5 := c43b34a4b4933bcd80068ae5776ee346
> +WPEBACKEND_FDO_MD5 := ea62dfa9ecb366598a837d7446ed48ac
> WPEBACKEND_FDO := wpebackend-fdo-$(WPEBACKEND_FDO_VERSION)
> WPEBACKEND_FDO_SUFFIX := tar.xz
> WPEBACKEND_FDO_URL := https://wpewebkit.org/releases/$(WPEBACKEND_FDO).$(WPEBACKEND_FDO_SUFFIX)
^ permalink raw reply [flat|nested] 10+ messages in thread
* [ptxdist] [PATCH 4/5] cog: version bump 0.12.1 -> 0.14.1
2022-09-23 13:45 [ptxdist] [PATCH 1/5] libwpe: version bump 1.12.0 -> 1.14.0 Bastian Krause
2022-09-23 13:45 ` [ptxdist] [PATCH 2/5] wpebackend-fdo: add missing libxkbcommon dependency Bastian Krause
2022-09-23 13:45 ` [ptxdist] [PATCH 3/5] wpebackend-fdo: version bump 1.12.0 -> 1.14.0 Bastian Krause
@ 2022-09-23 13:45 ` Bastian Krause
2022-09-28 14:29 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-09-23 13:45 ` [ptxdist] [PATCH 5/5] wpewebkit: version bump 2.34.6 -> 2.38.0 Bastian Krause
2022-09-28 14:29 ` [ptxdist] [APPLIED] libwpe: version bump 1.12.0 -> 1.14.0 Michael Olbrich
4 siblings, 1 reply; 10+ messages in thread
From: Bastian Krause @ 2022-09-23 13:45 UTC (permalink / raw)
To: ptxdist; +Cc: Bastian Krause
Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
rules/cog.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/cog.make b/rules/cog.make
index 3185a0e9c..43c661344 100644
--- a/rules/cog.make
+++ b/rules/cog.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_COG) += cog
#
# Paths and names
#
-COG_VERSION := 0.12.1
-COG_MD5 := 25a80a5a8a52b8873933a128151b8928
+COG_VERSION := 0.14.1
+COG_MD5 := 69d72ac046a0fc485ea7b61b96e7e7fc
COG := cog-$(COG_VERSION)
COG_SUFFIX := tar.xz
COG_URL := https://wpewebkit.org/releases/$(COG).$(COG_SUFFIX)
--
2.30.2
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [ptxdist] [APPLIED] cog: version bump 0.12.1 -> 0.14.1
2022-09-23 13:45 ` [ptxdist] [PATCH 4/5] cog: version bump 0.12.1 -> 0.14.1 Bastian Krause
@ 2022-09-28 14:29 ` Michael Olbrich
0 siblings, 0 replies; 10+ messages in thread
From: Michael Olbrich @ 2022-09-28 14:29 UTC (permalink / raw)
To: ptxdist; +Cc: Bastian Krause
Thanks, applied as 8de492f6ca4a46dd22e8cf4017255a8f8e4b0db8.
Michael
[sent from post-receive hook]
On Wed, 28 Sep 2022 16:29:17 +0200, Bastian Krause <bst@pengutronix.de> wrote:
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> Message-Id: <20220923134511.2586045-4-bst@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/cog.make b/rules/cog.make
> index 3185a0e9cb1b..43c661344a69 100644
> --- a/rules/cog.make
> +++ b/rules/cog.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_COG) += cog
> #
> # Paths and names
> #
> -COG_VERSION := 0.12.1
> -COG_MD5 := 25a80a5a8a52b8873933a128151b8928
> +COG_VERSION := 0.14.1
> +COG_MD5 := 69d72ac046a0fc485ea7b61b96e7e7fc
> COG := cog-$(COG_VERSION)
> COG_SUFFIX := tar.xz
> COG_URL := https://wpewebkit.org/releases/$(COG).$(COG_SUFFIX)
^ permalink raw reply [flat|nested] 10+ messages in thread
* [ptxdist] [PATCH 5/5] wpewebkit: version bump 2.34.6 -> 2.38.0
2022-09-23 13:45 [ptxdist] [PATCH 1/5] libwpe: version bump 1.12.0 -> 1.14.0 Bastian Krause
` (2 preceding siblings ...)
2022-09-23 13:45 ` [ptxdist] [PATCH 4/5] cog: version bump 0.12.1 -> 0.14.1 Bastian Krause
@ 2022-09-23 13:45 ` Bastian Krause
2022-09-28 14:29 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-09-28 14:29 ` [ptxdist] [APPLIED] libwpe: version bump 1.12.0 -> 1.14.0 Michael Olbrich
4 siblings, 1 reply; 10+ messages in thread
From: Bastian Krause @ 2022-09-23 13:45 UTC (permalink / raw)
To: ptxdist; +Cc: Bastian Krause
Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
rules/wpewebkit.in | 16 +++++++++++++++-
rules/wpewebkit.make | 27 +++++++++++++++++++--------
2 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/rules/wpewebkit.in b/rules/wpewebkit.in
index 8c1f6c50e..3f11e921b 100644
--- a/rules/wpewebkit.in
+++ b/rules/wpewebkit.in
@@ -9,6 +9,7 @@ menuconfig WPEWEBKIT
select HOST_SYSTEM_PERL
select HOST_SYSTEM_PERL_JSON
select HOST_SYSTEM_RUBY
+ select ALSA_LIB if WPEWEBKIT_WEBRTC
select GLIB
select LIBWPE
select CAIRO
@@ -38,8 +39,10 @@ menuconfig WPEWEBKIT
select LIBEPOXY
select LIBGCRYPT
select LIBTASN1
+ select OPENSSL if WPEWEBKIT_WEBRTC
select GSTREAMER1 if WPEWEBKIT_VIDEO || WPEWEBKIT_AUDIO
select GST_PLUGINS_BASE1 if WPEWEBKIT_VIDEO || WPEWEBKIT_AUDIO
+ select GST_PLUGINS_BASE1_ALSA if WPEWEBKIT_WEBRTC
select GST_PLUGINS_BASE1_APP if WPEWEBKIT_VIDEO || WPEWEBKIT_AUDIO
select GST_PLUGINS_BASE1_AUDIOCONVERT if WPEWEBKIT_AUDIO
select GST_PLUGINS_BASE1_AUDIOMIXER if WPEWEBKIT_AUDIO
@@ -47,23 +50,29 @@ menuconfig WPEWEBKIT
select GST_PLUGINS_BASE1_EGL if WPEWEBKIT_VIDEO
select GST_PLUGINS_BASE1_GIO if WPEWEBKIT_VIDEO || WPEWEBKIT_AUDIO
select GST_PLUGINS_BASE1_GL if WPEWEBKIT_VIDEO
+ select GST_PLUGINS_BASE1_OPENGL if WPEWEBKIT_VIDEO
select GST_PLUGINS_BASE1_PLAYBACK if WPEWEBKIT_VIDEO || WPEWEBKIT_AUDIO
+ select GST_PLUGINS_BASE1_TYPEFIND if WPEWEBKIT_VIDEO || WPEWEBKIT_AUDIO
select GST_PLUGINS_BASE1_VIDEOCONVERT if WPEWEBKIT_VIDEO
+ select GST_PLUGINS_BASE1_VIDEORATE if WPEWEBKIT_WEBRTC
select GST_PLUGINS_BASE1_VOLUME if WPEWEBKIT_AUDIO
select GST_PLUGINS_GOOD1 if (WPEWEBKIT_VIDEO || WPEWEBKIT_AUDIO) && RUNTIME
select GST_PLUGINS_GOOD1_AUDIOFX if WPEWEBKIT_AUDIO
+ select GST_PLUGINS_GOOD1_AUDIOPARSERS if WPEWEBKIT_AUDIO
select GST_PLUGINS_GOOD1_AUTODETECT if WPEWEBKIT_AUDIO
+ select GST_PLUGINS_GOOD1_DEINTERLACE if WPEWEBKIT_VIDEO
select GST_PLUGINS_GOOD1_INTERLEAVE if WPEWEBKIT_AUDIO
select GST_PLUGINS_GOOD1_ISOMP4 if WPEWEBKIT_VIDEO || WPEWEBKIT_AUDIO
select GST_PLUGINS_GOOD1_MATROSKA if WPEWEBKIT_VIDEO || WPEWEBKIT_AUDIO
select GST_PLUGINS_GOOD1_VIDEOFILTER if WPEWEBKIT_VIDEO
- select GST_PLUGINS_BAD1 if (WPEWEBKIT_VIDEO || WPEWEBKIT_AUDIO) && RUNTIME
+ select GST_PLUGINS_BAD1 if WPEWEBKIT_VIDEO || WPEWEBKIT_AUDIO
# fdkaac is preferred but currently not available
select GST_PLUGINS_BAD1_FDKAAC if WPEWEBKIT_AUDIO && BROKEN
select GST_PLUGINS_BAD1_DEBUGUTILS if WPEWEBKIT_VIDEO
select GST_PLUGINS_BAD1_OPUS if WPEWEBKIT_AUDIO
select GST_PLUGINS_BAD1_SUBENC if WPEWEBKIT_VIDEO
select GST_PLUGINS_BAD1_VIDEOPARSERS if WPEWEBKIT_VIDEO
+ select GST_PLUGINS_BAD1_WEBRTC if WPEWEBKIT_WEBRTC
select WPEBACKEND_FDO
select QT5 if WPEWEBKIT_QT
select QT5_MODULE_QTDECLARATIVE if WPEWEBKIT_QT
@@ -91,6 +100,11 @@ config WPEWEBKIT_AUDIO
bool
prompt "audio support"
+config WPEWEBKIT_WEBRTC
+ bool
+ depends on WPEWEBKIT_AUDIO && WPEWEBKIT_VIDEO
+ prompt "WebRTC support"
+
config WPEWEBKIT_ENABLE_LOGGING
bool
prompt "enable logging support"
diff --git a/rules/wpewebkit.make b/rules/wpewebkit.make
index 837d4dcba..3819c5667 100644
--- a/rules/wpewebkit.make
+++ b/rules/wpewebkit.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WPEWEBKIT) += wpewebkit
#
# Paths and names
#
-WPEWEBKIT_VERSION := 2.34.6
-WPEWEBKIT_MD5 := c9705270b342474cca28cf51632ccbbe
+WPEWEBKIT_VERSION := 2.38.0
+WPEWEBKIT_MD5 := e0e6b98c86351c39e41da475afc50780
WPEWEBKIT := wpewebkit-$(WPEWEBKIT_VERSION)
WPEWEBKIT_SUFFIX := tar.xz
WPEWEBKIT_URL := https://wpewebkit.org/releases/$(WPEWEBKIT).$(WPEWEBKIT_SUFFIX)
@@ -39,12 +39,22 @@ WPEWEBKIT_CONF_OPT := \
-DDEBUG_FISSION=OFF \
-DENABLE_ACCESSIBILITY=OFF \
-DENABLE_BUBBLEWRAP_SANDBOX=OFF \
+ -DENABLE_DOCUMENTATION=OFF \
-DENABLE_ENCRYPTED_MEDIA=OFF \
- -DENABLE_GTKDOC=OFF\
+ -DENABLE_GAMEPAD=OFF \
+ -DENABLE_INTROSPECTION=OFF \
+ -DENABLE_JAVASCRIPTCORE=ON \
+ -DENABLE_JOURNALD_LOG=$(call ptx/onoff,PTXCONF_WPEWEBKIT_JOURNALD) \
-DENABLE_MEDIA_SOURCE=ON \
+ -DENABLE_MEDIA_STREAM=$(call ptx/onoff,PTXCONF_WPEWEBKIT_WEBRTC) \
+ -DENABLE_PDFJS=ON \
+ -DENABLE_WEB_RTC=$(call ptx/onoff,PTXCONF_WPEWEBKIT_WEBRTC) \
+ -DENABLE_WEBXR=OFF \
-DENABLE_VIDEO=$(call ptx/onoff,PTXCONF_WPEWEBKIT_VIDEO) \
+ -DENABLE_WEBCORE=ON \
-DENABLE_WEBDRIVER=$(call ptx/onoff,PTXCONF_WPEWEBKIT_WEBDRIVER) \
- -DENABLE_WEB_AUDIO=$(call ptx/onoff,PTXCONF_WPEWEBKIT_AUDIO) \ \
+ -DENABLE_WEBKIT=ON \
+ -DENABLE_WEB_AUDIO=$(call ptx/onoff,PTXCONF_WPEWEBKIT_AUDIO) \
-DENABLE_WEB_CRYPTO=ON \
-DENABLE_WPE_QT_API=$(call ptx/onoff,PTXCONF_WPEWEBKIT_QT) \
-DENABLE_XSLT=ON \
@@ -52,15 +62,16 @@ WPEWEBKIT_CONF_OPT := \
-DPORT=WPE \
-DSHOULD_INSTALL_JS_SHELL=OFF \
-DSHOW_BINDINGS_GENERATION_PROGRESS=ON \
- -DUSE_LD_GOLD=OFF \
+ -DUSE_64KB_PAGE_BLOCK=OFF \
-DUSE_APPLE_ICU=OFF \
+ -DUSE_AVIF=OFF \
+ -DUSE_GSTREAMER_GL=$(call ptx/onoff,PTXCONF_WPEWEBKIT_VIDEO) \
+ -DUSE_JPEGXL=OFF \
-DUSE_LCMS=OFF \
-DUSE_OPENJPEG=OFF \
-DUSE_SOUP2=ON \
- -DUSE_SYSTEMD=$(call ptx/onoff,PTXCONF_WPEWEBKIT_JOURNALD) \
-DUSE_THIN_ARCHIVES=ON \
- -DUSE_WOFF2=OFF \
- -DWTF_CPU_ARM64_CORTEXA53=OFF
+ -DUSE_WOFF2=OFF
WPEWEBKIT_SYSTEM_MALLOC := OFF
ifdef PTXCONF_WPEWEBKIT_QT
--
2.30.2
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [ptxdist] [APPLIED] wpewebkit: version bump 2.34.6 -> 2.38.0
2022-09-23 13:45 ` [ptxdist] [PATCH 5/5] wpewebkit: version bump 2.34.6 -> 2.38.0 Bastian Krause
@ 2022-09-28 14:29 ` Michael Olbrich
0 siblings, 0 replies; 10+ messages in thread
From: Michael Olbrich @ 2022-09-28 14:29 UTC (permalink / raw)
To: ptxdist; +Cc: Bastian Krause
Thanks, applied as 2b17dae362a4d98e4db74ce0e0bbaf9bc2444b22.
Michael
[sent from post-receive hook]
On Wed, 28 Sep 2022 16:29:18 +0200, Bastian Krause <bst@pengutronix.de> wrote:
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> Message-Id: <20220923134511.2586045-5-bst@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/wpewebkit.in b/rules/wpewebkit.in
> index 8c1f6c50ed34..3f11e921b526 100644
> --- a/rules/wpewebkit.in
> +++ b/rules/wpewebkit.in
> @@ -9,6 +9,7 @@ menuconfig WPEWEBKIT
> select HOST_SYSTEM_PERL
> select HOST_SYSTEM_PERL_JSON
> select HOST_SYSTEM_RUBY
> + select ALSA_LIB if WPEWEBKIT_WEBRTC
> select GLIB
> select LIBWPE
> select CAIRO
> @@ -38,8 +39,10 @@ menuconfig WPEWEBKIT
> select LIBEPOXY
> select LIBGCRYPT
> select LIBTASN1
> + select OPENSSL if WPEWEBKIT_WEBRTC
> select GSTREAMER1 if WPEWEBKIT_VIDEO || WPEWEBKIT_AUDIO
> select GST_PLUGINS_BASE1 if WPEWEBKIT_VIDEO || WPEWEBKIT_AUDIO
> + select GST_PLUGINS_BASE1_ALSA if WPEWEBKIT_WEBRTC
> select GST_PLUGINS_BASE1_APP if WPEWEBKIT_VIDEO || WPEWEBKIT_AUDIO
> select GST_PLUGINS_BASE1_AUDIOCONVERT if WPEWEBKIT_AUDIO
> select GST_PLUGINS_BASE1_AUDIOMIXER if WPEWEBKIT_AUDIO
> @@ -47,23 +50,29 @@ menuconfig WPEWEBKIT
> select GST_PLUGINS_BASE1_EGL if WPEWEBKIT_VIDEO
> select GST_PLUGINS_BASE1_GIO if WPEWEBKIT_VIDEO || WPEWEBKIT_AUDIO
> select GST_PLUGINS_BASE1_GL if WPEWEBKIT_VIDEO
> + select GST_PLUGINS_BASE1_OPENGL if WPEWEBKIT_VIDEO
> select GST_PLUGINS_BASE1_PLAYBACK if WPEWEBKIT_VIDEO || WPEWEBKIT_AUDIO
> + select GST_PLUGINS_BASE1_TYPEFIND if WPEWEBKIT_VIDEO || WPEWEBKIT_AUDIO
> select GST_PLUGINS_BASE1_VIDEOCONVERT if WPEWEBKIT_VIDEO
> + select GST_PLUGINS_BASE1_VIDEORATE if WPEWEBKIT_WEBRTC
> select GST_PLUGINS_BASE1_VOLUME if WPEWEBKIT_AUDIO
> select GST_PLUGINS_GOOD1 if (WPEWEBKIT_VIDEO || WPEWEBKIT_AUDIO) && RUNTIME
> select GST_PLUGINS_GOOD1_AUDIOFX if WPEWEBKIT_AUDIO
> + select GST_PLUGINS_GOOD1_AUDIOPARSERS if WPEWEBKIT_AUDIO
> select GST_PLUGINS_GOOD1_AUTODETECT if WPEWEBKIT_AUDIO
> + select GST_PLUGINS_GOOD1_DEINTERLACE if WPEWEBKIT_VIDEO
> select GST_PLUGINS_GOOD1_INTERLEAVE if WPEWEBKIT_AUDIO
> select GST_PLUGINS_GOOD1_ISOMP4 if WPEWEBKIT_VIDEO || WPEWEBKIT_AUDIO
> select GST_PLUGINS_GOOD1_MATROSKA if WPEWEBKIT_VIDEO || WPEWEBKIT_AUDIO
> select GST_PLUGINS_GOOD1_VIDEOFILTER if WPEWEBKIT_VIDEO
> - select GST_PLUGINS_BAD1 if (WPEWEBKIT_VIDEO || WPEWEBKIT_AUDIO) && RUNTIME
> + select GST_PLUGINS_BAD1 if WPEWEBKIT_VIDEO || WPEWEBKIT_AUDIO
> # fdkaac is preferred but currently not available
> select GST_PLUGINS_BAD1_FDKAAC if WPEWEBKIT_AUDIO && BROKEN
> select GST_PLUGINS_BAD1_DEBUGUTILS if WPEWEBKIT_VIDEO
> select GST_PLUGINS_BAD1_OPUS if WPEWEBKIT_AUDIO
> select GST_PLUGINS_BAD1_SUBENC if WPEWEBKIT_VIDEO
> select GST_PLUGINS_BAD1_VIDEOPARSERS if WPEWEBKIT_VIDEO
> + select GST_PLUGINS_BAD1_WEBRTC if WPEWEBKIT_WEBRTC
> select WPEBACKEND_FDO
> select QT5 if WPEWEBKIT_QT
> select QT5_MODULE_QTDECLARATIVE if WPEWEBKIT_QT
> @@ -91,6 +100,11 @@ config WPEWEBKIT_AUDIO
> bool
> prompt "audio support"
>
> +config WPEWEBKIT_WEBRTC
> + bool
> + depends on WPEWEBKIT_AUDIO && WPEWEBKIT_VIDEO
> + prompt "WebRTC support"
> +
> config WPEWEBKIT_ENABLE_LOGGING
> bool
> prompt "enable logging support"
> diff --git a/rules/wpewebkit.make b/rules/wpewebkit.make
> index 837d4dcba14e..3819c5667240 100644
> --- a/rules/wpewebkit.make
> +++ b/rules/wpewebkit.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WPEWEBKIT) += wpewebkit
> #
> # Paths and names
> #
> -WPEWEBKIT_VERSION := 2.34.6
> -WPEWEBKIT_MD5 := c9705270b342474cca28cf51632ccbbe
> +WPEWEBKIT_VERSION := 2.38.0
> +WPEWEBKIT_MD5 := e0e6b98c86351c39e41da475afc50780
> WPEWEBKIT := wpewebkit-$(WPEWEBKIT_VERSION)
> WPEWEBKIT_SUFFIX := tar.xz
> WPEWEBKIT_URL := https://wpewebkit.org/releases/$(WPEWEBKIT).$(WPEWEBKIT_SUFFIX)
> @@ -39,12 +39,22 @@ WPEWEBKIT_CONF_OPT := \
> -DDEBUG_FISSION=OFF \
> -DENABLE_ACCESSIBILITY=OFF \
> -DENABLE_BUBBLEWRAP_SANDBOX=OFF \
> + -DENABLE_DOCUMENTATION=OFF \
> -DENABLE_ENCRYPTED_MEDIA=OFF \
> - -DENABLE_GTKDOC=OFF\
> + -DENABLE_GAMEPAD=OFF \
> + -DENABLE_INTROSPECTION=OFF \
> + -DENABLE_JAVASCRIPTCORE=ON \
> + -DENABLE_JOURNALD_LOG=$(call ptx/onoff,PTXCONF_WPEWEBKIT_JOURNALD) \
> -DENABLE_MEDIA_SOURCE=ON \
> + -DENABLE_MEDIA_STREAM=$(call ptx/onoff,PTXCONF_WPEWEBKIT_WEBRTC) \
> + -DENABLE_PDFJS=ON \
> + -DENABLE_WEB_RTC=$(call ptx/onoff,PTXCONF_WPEWEBKIT_WEBRTC) \
> + -DENABLE_WEBXR=OFF \
> -DENABLE_VIDEO=$(call ptx/onoff,PTXCONF_WPEWEBKIT_VIDEO) \
> + -DENABLE_WEBCORE=ON \
> -DENABLE_WEBDRIVER=$(call ptx/onoff,PTXCONF_WPEWEBKIT_WEBDRIVER) \
> - -DENABLE_WEB_AUDIO=$(call ptx/onoff,PTXCONF_WPEWEBKIT_AUDIO) \ \
> + -DENABLE_WEBKIT=ON \
> + -DENABLE_WEB_AUDIO=$(call ptx/onoff,PTXCONF_WPEWEBKIT_AUDIO) \
> -DENABLE_WEB_CRYPTO=ON \
> -DENABLE_WPE_QT_API=$(call ptx/onoff,PTXCONF_WPEWEBKIT_QT) \
> -DENABLE_XSLT=ON \
> @@ -52,15 +62,16 @@ WPEWEBKIT_CONF_OPT := \
> -DPORT=WPE \
> -DSHOULD_INSTALL_JS_SHELL=OFF \
> -DSHOW_BINDINGS_GENERATION_PROGRESS=ON \
> - -DUSE_LD_GOLD=OFF \
> + -DUSE_64KB_PAGE_BLOCK=OFF \
> -DUSE_APPLE_ICU=OFF \
> + -DUSE_AVIF=OFF \
> + -DUSE_GSTREAMER_GL=$(call ptx/onoff,PTXCONF_WPEWEBKIT_VIDEO) \
> + -DUSE_JPEGXL=OFF \
> -DUSE_LCMS=OFF \
> -DUSE_OPENJPEG=OFF \
> -DUSE_SOUP2=ON \
> - -DUSE_SYSTEMD=$(call ptx/onoff,PTXCONF_WPEWEBKIT_JOURNALD) \
> -DUSE_THIN_ARCHIVES=ON \
> - -DUSE_WOFF2=OFF \
> - -DWTF_CPU_ARM64_CORTEXA53=OFF
> + -DUSE_WOFF2=OFF
>
> WPEWEBKIT_SYSTEM_MALLOC := OFF
> ifdef PTXCONF_WPEWEBKIT_QT
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [ptxdist] [APPLIED] libwpe: version bump 1.12.0 -> 1.14.0
2022-09-23 13:45 [ptxdist] [PATCH 1/5] libwpe: version bump 1.12.0 -> 1.14.0 Bastian Krause
` (3 preceding siblings ...)
2022-09-23 13:45 ` [ptxdist] [PATCH 5/5] wpewebkit: version bump 2.34.6 -> 2.38.0 Bastian Krause
@ 2022-09-28 14:29 ` Michael Olbrich
4 siblings, 0 replies; 10+ messages in thread
From: Michael Olbrich @ 2022-09-28 14:29 UTC (permalink / raw)
To: ptxdist; +Cc: Bastian Krause
Thanks, applied as 4be61f6e599874fabee835d144da11084e3b4f6e.
Michael
[sent from post-receive hook]
On Wed, 28 Sep 2022 16:29:13 +0200, Bastian Krause <bst@pengutronix.de> wrote:
> libxkbcommon support is now optional, but there is no point in adding a
> prompt for ptxdist, because the wpebackend-fdo package requires it
> unconditionally.
>
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> Message-Id: <20220923134511.2586045-1-bst@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/libwpe.make b/rules/libwpe.make
> index ae77a739e96a..799d4df61532 100644
> --- a/rules/libwpe.make
> +++ b/rules/libwpe.make
> @@ -14,9 +14,9 @@ PACKAGES-$(PTXCONF_LIBWPE) += libwpe
> #
> # Paths and names
> #
> -LIBWPE_VERSION := 1.12.0
> +LIBWPE_VERSION := 1.14.0
> LIBWPE_LIBRARY_VERSION := 1.0
> -LIBWPE_MD5 := 5a3f11789535d826370ba465ea141393
> +LIBWPE_MD5 := f9737912975f979f9e4e01eec174a271
> LIBWPE := libwpe-$(LIBWPE_VERSION)
> LIBWPE_SUFFIX := tar.xz
> LIBWPE_URL := https://wpewebkit.org/releases/$(LIBWPE).$(LIBWPE_SUFFIX)
> @@ -36,7 +36,8 @@ LIBWPE_CONF_TOOL := meson
> LIBWPE_CONF_OPT := \
> $(CROSS_MESON_USR) \
> -Dbuild-docs=false \
> - -Ddefault-backend=
> + -Ddefault-backend= \
> + -Denable-xkb=true
>
> # ----------------------------------------------------------------------------
> # Target-Install
^ permalink raw reply [flat|nested] 10+ messages in thread