[ptxdist] [PATCH v3 1/3] libwpe: version bump 1.6.0 -> 1.8.0

[ptxdist] [PATCH v3 1/3] libwpe: version bump 1.6.0 -> 1.8.0

[Bastian Krause]

Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
No changes since v1/v2.
---
 rules/libwpe.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/libwpe.make b/rules/libwpe.make
index 552a55dc9..5c6fb9054 100644
--- a/rules/libwpe.make
+++ b/rules/libwpe.make
@@ -14,9 +14,9 @@ PACKAGES-$(PTXCONF_LIBWPE) += libwpe
 #
 # Paths and names
 #
-LIBWPE_VERSION		:= 1.6.0
+LIBWPE_VERSION		:= 1.8.0
 LIBWPE_LIBRARY_VERSION	:= 1.0
-LIBWPE_MD5		:= 6e8a2c279dcc3617db5ec7ac4c03d628
+LIBWPE_MD5		:= 328ea59dd8dee9107a49353536d00844
 LIBWPE			:= libwpe-$(LIBWPE_VERSION)
 LIBWPE_SUFFIX		:= tar.xz
 LIBWPE_URL		:= https://wpewebkit.org/releases/$(LIBWPE).$(LIBWPE_SUFFIX)
-- 
2.28.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH v3 2/3] wpebackend-fdo: version bump 1.6.1 -> 1.8.0

[Bastian Krause]

libepoxy is required since v1.7.1 for EGL operations.

Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
No changes since v1/v2.
---
 rules/wpebackend-fdo.in   | 1 +
 rules/wpebackend-fdo.make | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rules/wpebackend-fdo.in b/rules/wpebackend-fdo.in
index 4efb763a5..423e8a0e1 100644
--- a/rules/wpebackend-fdo.in
+++ b/rules/wpebackend-fdo.in
@@ -5,6 +5,7 @@ config WPEBACKEND_FDO
 	prompt "wpebackend-fdo"
 	select HOST_CMAKE
 	select HOST_NINJA
+	select LIBEPOXY
 	select LIBWPE
 	select GLIB
 	select MESALIB
diff --git a/rules/wpebackend-fdo.make b/rules/wpebackend-fdo.make
index 5266f8c2c..db8fe030a 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.6.1
+WPEBACKEND_FDO_VERSION		:= 1.8.0
 WPEBACKEND_FDO_LIBRARY_VERSION	:= 1.0
-WPEBACKEND_FDO_MD5		:= ea6c2a13e6c2423f2c2b0b31fcf9567b
+WPEBACKEND_FDO_MD5		:= 6df96f80ff34c02d56f32a7a153a62c0
 WPEBACKEND_FDO			:= wpebackend-fdo-$(WPEBACKEND_FDO_VERSION)
 WPEBACKEND_FDO_SUFFIX		:= tar.xz
 WPEBACKEND_FDO_URL		:= https://wpewebkit.org/releases/$(WPEBACKEND_FDO).$(WPEBACKEND_FDO_SUFFIX)
@@ -36,8 +36,7 @@ WPEBACKEND_FDO_CONF_TOOL	:= cmake
 WPEBACKEND_FDO_CONF_OPT	:= \
 	$(CROSS_CMAKE_USR) \
 	-G Ninja \
-	-DBUILD_DOCS=OFF \
-	-DEXPORTABLE_EGL=ON
+	-DBUILD_DOCS=OFF
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.28.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH v3 3/3] wpewebkit: version bump 2.28.4 -> 2.30.1

[Bastian Krause]

ENABLE_ACCELERATED_2D_CANVAS=ON is broken on 2.30.1. It defaults to off
and does not really improve performance on embedded devices
(paraphrasing the wpewebkit maintainers). There was even discussion to
turn it into a private option [1]. So turn it off.

wpewebkit depends on gstreamer for audio/video playback and more.
The required plugin packages are already selected, but not all plugins
used in Source/WebCore/platform/{audio,graphics,mediastream}/.
Fix that.

While at it, distinguish video/audio plugins and turn
GST_PLUGINS_GOOD1/GST_PLUGINS_BAD1 into runtime dependencies.
Enable/disable the corresponding CMake options ENABLE_VIDEO and
ENABLE_WEB_AUDIO accordingly.

The included patch is needed to make builds with ENABLE_VIDEO=OFF work.

[1] https://bugs.webkit.org/show_bug.cgi?id=148473

Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
Changes since v2:
- add patch to make builds with ENABLE_VIDEO=OFF work.
Changes since v1:
- introduce WPEWEBKIT_VIDEO, WPEWEBKIT_AUDIO
- select gst-plugins depending on WPEWEBKIT_VIDEO, WPEWEBKIT_AUDIO
- set ENABLE_VIDEO, ENABLE_WEB_AUDIO according to WPEWEBKIT_VIDEO,
  WPEWEBKIT_AUDIO
- turn GST_PLUGINS_GOOD1, GST_PLUGINS_BAD1 into runtime dependencies
- add missing GST_PLUGINS_BAD1_FDKAAC select
---
 ...tedBundle-guard-setGenericCueAPIEnab.patch | 37 ++++++++++++++
 patches/wpewebkit-2.30.1/series               |  4 ++
 rules/wpewebkit.in                            | 51 +++++++++++++++----
 rules/wpewebkit.make                          | 13 +++--
 4 files changed, 91 insertions(+), 14 deletions(-)
 create mode 100644 patches/wpewebkit-2.30.1/0001-WebProcess-InjectedBundle-guard-setGenericCueAPIEnab.patch
 create mode 100644 patches/wpewebkit-2.30.1/series

diff --git a/patches/wpewebkit-2.30.1/0001-WebProcess-InjectedBundle-guard-setGenericCueAPIEnab.patch b/patches/wpewebkit-2.30.1/0001-WebProcess-InjectedBundle-guard-setGenericCueAPIEnab.patch
new file mode 100644
index 000000000..43d26b9d4
--- /dev/null
+++ b/patches/wpewebkit-2.30.1/0001-WebProcess-InjectedBundle-guard-setGenericCueAPIEnab.patch
@@ -0,0 +1,37 @@
+From: Bastian Krause <bst@pengutronix.de>
+Date: Thu, 22 Oct 2020 10:16:49 +0200
+Subject: [PATCH] WebProcess: InjectedBundle: guard setGenericCueAPIEnabled
+ usage
+
+The declaration in WebCore::Settings is guarded by..
+
+  #if ENABLE(VIDEO) .. #endif
+
+Also guard its use here.
+
+This allows building with ENABLE_VIDEO=OFF.
+
+Signed-off-by: Bastian Krause <bst@pengutronix.de>
+---
+ Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp b/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp
+index 61326f2e5731..d7776997aa08 100644
+--- a/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp
++++ b/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp
+@@ -236,12 +236,14 @@ void InjectedBundle::overrideBoolPreferenceForTestRunner(WebPageGroupProxy* page
+         RuntimeEnabledFeatures::sharedFeatures().setWebRTCMDNSICECandidatesEnabled(enabled);
+ #endif
+ 
++#if ENABLE(VIDEO)
+     if (preference == "WebKitGenericCueAPIEnabled") {
+         WebPreferencesStore::overrideBoolValueForKey(WebPreferencesKey::genericCueAPIEnabledKey(), enabled);
+         for (auto* page : pages)
+             page->settings().setGenericCueAPIEnabled(enabled);
+         return;
+     }
++#endif
+ 
+ #if ENABLE(GPU_PROCESS)
+     if (preference == "WebKitUseGPUProcessForMedia" || preference == "WebKitCaptureAudioInGPUProcessEnabledKey") {
diff --git a/patches/wpewebkit-2.30.1/series b/patches/wpewebkit-2.30.1/series
new file mode 100644
index 000000000..449999d76
--- /dev/null
+++ b/patches/wpewebkit-2.30.1/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-WebProcess-InjectedBundle-guard-setGenericCueAPIEnab.patch
+# 0e61edb54925f4a5191d0a42856fa1b3  - git-ptx-patches magic
diff --git a/rules/wpewebkit.in b/rules/wpewebkit.in
index d91758406..085eb1c73 100644
--- a/rules/wpewebkit.in
+++ b/rules/wpewebkit.in
@@ -37,16 +37,35 @@ menuconfig WPEWEBKIT
 	select MESALIB_GLES2
 	select LIBEPOXY
 	select LIBGCRYPT
-	select GSTREAMER1
-	select GST_PLUGINS_BASE1
-	select GST_PLUGINS_BASE1_APP
-	select GST_PLUGINS_BASE1_GL
-	select GST_PLUGINS_BASE1_EGL
-	select GST_PLUGINS_GOOD1
-	select GST_PLUGINS_BAD1
+	select GSTREAMER1			if WPEWEBKIT_VIDEO || WPEWEBKIT_AUDIO
+	select GST_PLUGINS_BASE1		if WPEWEBKIT_VIDEO || WPEWEBKIT_AUDIO
+	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
+	select GST_PLUGINS_BASE1_AUDIORESAMPLE	if WPEWEBKIT_AUDIO
+	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_PLAYBACK	if WPEWEBKIT_VIDEO || WPEWEBKIT_AUDIO
+	select GST_PLUGINS_BASE1_VIDEOCONVERT	if WPEWEBKIT_VIDEO
+	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_AUTODETECT	if WPEWEBKIT_AUDIO
+	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_FDKAAC		if WPEWEBKIT_AUDIO
+	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 WPEBACKEND_FDO
-	select QT5			if WPEWEBKIT_QT
-	select QT5_MODULE_QTDECLARATIVE	if WPEWEBKIT_QT
+	select QT5				if WPEWEBKIT_QT
+	select QT5_MODULE_QTDECLARATIVE		if WPEWEBKIT_QT
+	select SYSTEMD				if WPEWEBKIT_JOURNALD
 	help
 	  WebPlatformForEmbedded port for the WebKit cross-platform web browser engine.
 
@@ -56,4 +75,18 @@ config WPEWEBKIT_QT
 	bool
 	prompt "Qt API"
 
+config WPEWEBKIT_JOURNALD
+	bool
+	depends on INITMETHOD_SYSTEMD
+	default y
+	prompt "journald support"
+
+config WPEWEBKIT_VIDEO
+	bool
+	prompt "video support"
+
+config WPEWEBKIT_AUDIO
+	bool
+	prompt "audio support"
+
 endif
diff --git a/rules/wpewebkit.make b/rules/wpewebkit.make
index c0007d777..2b8f8cd8b 100644
--- a/rules/wpewebkit.make
+++ b/rules/wpewebkit.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WPEWEBKIT) += wpewebkit
 #
 # Paths and names
 #
-WPEWEBKIT_VERSION	:= 2.28.4
-WPEWEBKIT_MD5		:= 6ab041f6ebdb2e053981de5980c864e7
+WPEWEBKIT_VERSION	:= 2.30.1
+WPEWEBKIT_MD5		:= 251228a6e2917eff90a3eb6e9a7e920d
 WPEWEBKIT		:= wpewebkit-$(WPEWEBKIT_VERSION)
 WPEWEBKIT_SUFFIX	:= tar.xz
 WPEWEBKIT_URL		:= https://wpewebkit.org/releases/$(WPEWEBKIT).$(WPEWEBKIT_SUFFIX)
@@ -35,25 +35,28 @@ WPEWEBKIT_CONF_OPT	:= \
 	$(CROSS_CMAKE_USR) \
 	-G Ninja \
 	-DCMAKE_BUILD_TYPE=Release \
+	-DANALYZERS=OFF \
 	-DDEBUG_FISSION=OFF \
-	-DENABLE_ACCELERATED_2D_CANVAS=ON \
+	-DENABLE_ACCELERATED_2D_CANVAS=OFF \
 	-DENABLE_ACCESSIBILITY=OFF \
 	-DENABLE_BUBBLEWRAP_SANDBOX=OFF \
 	-DENABLE_ENCRYPTED_MEDIA=OFF \
 	-DENABLE_GTKDOC=OFF\
 	-DENABLE_MEDIA_SOURCE=ON \
 	-DENABLE_SHAREABLE_RESOURCE=ON \
-	-DENABLE_VIDEO=ON \
+	-DENABLE_VIDEO=$(call ptx/onoff,PTXCONF_WPEWEBKIT_VIDEO) \
 	-DENABLE_WEBDRIVER=ON \
-	-DENABLE_WEB_AUDIO=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 \
+	-DGCC_OFFLINEASM_SOURCE_MAP=OFF \
 	-DPORT=WPE \
 	-DSHOULD_INSTALL_JS_SHELL=OFF \
 	-DSHOW_BINDINGS_GENERATION_PROGRESS=ON \
 	-DUSE_LD_GOLD=OFF \
 	-DUSE_OPENJPEG=OFF \
+	-DUSE_SYSTEMD=$(call ptx/onoff,PTXCONF_WPEWEBKIT_JOURNALD) \
 	-DUSE_THIN_ARCHIVES=ON \
 	-DUSE_WOFF2=OFF \
 	-DWTF_CPU_ARM64_CORTEXA53=OFF
-- 
2.28.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] libwpe: version bump 1.6.0 -> 1.8.0

[Michael Olbrich]

Thanks, applied as d234dab707827a79f82cc8987102ecba64a8bf92.

Michael

[sent from post-receive hook]

On Fri, 30 Oct 2020 13:02:34 +0100, Bastian Krause <bst@pengutronix.de> wrote:
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> Message-Id: <20201022082500.20644-1-bst@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libwpe.make b/rules/libwpe.make
> index 552a55dc9fcc..5c6fb9054ab5 100644
> --- a/rules/libwpe.make
> +++ b/rules/libwpe.make
> @@ -14,9 +14,9 @@ PACKAGES-$(PTXCONF_LIBWPE) += libwpe
>  #
>  # Paths and names
>  #
> -LIBWPE_VERSION		:= 1.6.0
> +LIBWPE_VERSION		:= 1.8.0
>  LIBWPE_LIBRARY_VERSION	:= 1.0
> -LIBWPE_MD5		:= 6e8a2c279dcc3617db5ec7ac4c03d628
> +LIBWPE_MD5		:= 328ea59dd8dee9107a49353536d00844
>  LIBWPE			:= libwpe-$(LIBWPE_VERSION)
>  LIBWPE_SUFFIX		:= tar.xz
>  LIBWPE_URL		:= https://wpewebkit.org/releases/$(LIBWPE).$(LIBWPE_SUFFIX)

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] wpebackend-fdo: version bump 1.6.1 -> 1.8.0

[Michael Olbrich]

Thanks, applied as 60493a3d29c91a50634808d9b65d2e60c9cca644.

Michael

[sent from post-receive hook]

On Fri, 30 Oct 2020 13:02:35 +0100, Bastian Krause <bst@pengutronix.de> wrote:
> libepoxy is required since v1.7.1 for EGL operations.
> 
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> Message-Id: <20201022082500.20644-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 4efb763a54d3..423e8a0e1e57 100644
> --- a/rules/wpebackend-fdo.in
> +++ b/rules/wpebackend-fdo.in
> @@ -5,6 +5,7 @@ config WPEBACKEND_FDO
>  	prompt "wpebackend-fdo"
>  	select HOST_CMAKE
>  	select HOST_NINJA
> +	select LIBEPOXY
>  	select LIBWPE
>  	select GLIB
>  	select MESALIB
> diff --git a/rules/wpebackend-fdo.make b/rules/wpebackend-fdo.make
> index 5266f8c2cac7..db8fe030af2a 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.6.1
> +WPEBACKEND_FDO_VERSION		:= 1.8.0
>  WPEBACKEND_FDO_LIBRARY_VERSION	:= 1.0
> -WPEBACKEND_FDO_MD5		:= ea6c2a13e6c2423f2c2b0b31fcf9567b
> +WPEBACKEND_FDO_MD5		:= 6df96f80ff34c02d56f32a7a153a62c0
>  WPEBACKEND_FDO			:= wpebackend-fdo-$(WPEBACKEND_FDO_VERSION)
>  WPEBACKEND_FDO_SUFFIX		:= tar.xz
>  WPEBACKEND_FDO_URL		:= https://wpewebkit.org/releases/$(WPEBACKEND_FDO).$(WPEBACKEND_FDO_SUFFIX)
> @@ -36,8 +36,7 @@ WPEBACKEND_FDO_CONF_TOOL	:= cmake
>  WPEBACKEND_FDO_CONF_OPT	:= \
>  	$(CROSS_CMAKE_USR) \
>  	-G Ninja \
> -	-DBUILD_DOCS=OFF \
> -	-DEXPORTABLE_EGL=ON
> +	-DBUILD_DOCS=OFF
>  
>  # ----------------------------------------------------------------------------
>  # Target-Install

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] wpewebkit: version bump 2.28.4 -> 2.30.1

[Michael Olbrich]

Thanks, applied as 5c04893e34df2e878eab2d034dc6d7ecb91ebe18.

Michael

[sent from post-receive hook]

On Fri, 30 Oct 2020 13:02:36 +0100, Bastian Krause <bst@pengutronix.de> wrote:
> ENABLE_ACCELERATED_2D_CANVAS=ON is broken on 2.30.1. It defaults to off
> and does not really improve performance on embedded devices
> (paraphrasing the wpewebkit maintainers). There was even discussion to
> turn it into a private option [1]. So turn it off.
> 
> wpewebkit depends on gstreamer for audio/video playback and more.
> The required plugin packages are already selected, but not all plugins
> used in Source/WebCore/platform/{audio,graphics,mediastream}/.
> Fix that.
> 
> While at it, distinguish video/audio plugins and turn
> GST_PLUGINS_GOOD1/GST_PLUGINS_BAD1 into runtime dependencies.
> Enable/disable the corresponding CMake options ENABLE_VIDEO and
> ENABLE_WEB_AUDIO accordingly.
> 
> The included patch is needed to make builds with ENABLE_VIDEO=OFF work.
> 
> [1] https://bugs.webkit.org/show_bug.cgi?id=148473
> 
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> Message-Id: <20201022082500.20644-3-bst@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/wpewebkit-2.30.1/0001-WebProcess-InjectedBundle-guard-setGenericCueAPIEnab.patch b/patches/wpewebkit-2.30.1/0001-WebProcess-InjectedBundle-guard-setGenericCueAPIEnab.patch
> new file mode 100644
> index 000000000000..43d26b9d464a
> --- /dev/null
> +++ b/patches/wpewebkit-2.30.1/0001-WebProcess-InjectedBundle-guard-setGenericCueAPIEnab.patch
> @@ -0,0 +1,37 @@
> +From: Bastian Krause <bst@pengutronix.de>
> +Date: Thu, 22 Oct 2020 10:16:49 +0200
> +Subject: [PATCH] WebProcess: InjectedBundle: guard setGenericCueAPIEnabled
> + usage
> +
> +The declaration in WebCore::Settings is guarded by..
> +
> +  #if ENABLE(VIDEO) .. #endif
> +
> +Also guard its use here.
> +
> +This allows building with ENABLE_VIDEO=OFF.
> +
> +Signed-off-by: Bastian Krause <bst@pengutronix.de>
> +---
> + Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp | 2 ++
> + 1 file changed, 2 insertions(+)
> +
> +diff --git a/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp b/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp
> +index 61326f2e5731..d7776997aa08 100644
> +--- a/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp
> ++++ b/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp
> +@@ -236,12 +236,14 @@ void InjectedBundle::overrideBoolPreferenceForTestRunner(WebPageGroupProxy* page
> +         RuntimeEnabledFeatures::sharedFeatures().setWebRTCMDNSICECandidatesEnabled(enabled);
> + #endif
> + 
> ++#if ENABLE(VIDEO)
> +     if (preference == "WebKitGenericCueAPIEnabled") {
> +         WebPreferencesStore::overrideBoolValueForKey(WebPreferencesKey::genericCueAPIEnabledKey(), enabled);
> +         for (auto* page : pages)
> +             page->settings().setGenericCueAPIEnabled(enabled);
> +         return;
> +     }
> ++#endif
> + 
> + #if ENABLE(GPU_PROCESS)
> +     if (preference == "WebKitUseGPUProcessForMedia" || preference == "WebKitCaptureAudioInGPUProcessEnabledKey") {
> diff --git a/patches/wpewebkit-2.30.1/series b/patches/wpewebkit-2.30.1/series
> new file mode 100644
> index 000000000000..449999d76e31
> --- /dev/null
> +++ b/patches/wpewebkit-2.30.1/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-WebProcess-InjectedBundle-guard-setGenericCueAPIEnab.patch
> +# 0e61edb54925f4a5191d0a42856fa1b3  - git-ptx-patches magic
> diff --git a/rules/wpewebkit.in b/rules/wpewebkit.in
> index d9175840616a..f123f4dad343 100644
> --- a/rules/wpewebkit.in
> +++ b/rules/wpewebkit.in
> @@ -37,16 +37,36 @@ menuconfig WPEWEBKIT
>  	select MESALIB_GLES2
>  	select LIBEPOXY
>  	select LIBGCRYPT
> -	select GSTREAMER1
> -	select GST_PLUGINS_BASE1
> -	select GST_PLUGINS_BASE1_APP
> -	select GST_PLUGINS_BASE1_GL
> -	select GST_PLUGINS_BASE1_EGL
> -	select GST_PLUGINS_GOOD1
> -	select GST_PLUGINS_BAD1
> +	select GSTREAMER1			if WPEWEBKIT_VIDEO || WPEWEBKIT_AUDIO
> +	select GST_PLUGINS_BASE1		if WPEWEBKIT_VIDEO || WPEWEBKIT_AUDIO
> +	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
> +	select GST_PLUGINS_BASE1_AUDIORESAMPLE	if WPEWEBKIT_AUDIO
> +	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_PLAYBACK	if WPEWEBKIT_VIDEO || WPEWEBKIT_AUDIO
> +	select GST_PLUGINS_BASE1_VIDEOCONVERT	if WPEWEBKIT_VIDEO
> +	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_AUTODETECT	if WPEWEBKIT_AUDIO
> +	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
> +	# 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 WPEBACKEND_FDO
> -	select QT5			if WPEWEBKIT_QT
> -	select QT5_MODULE_QTDECLARATIVE	if WPEWEBKIT_QT
> +	select QT5				if WPEWEBKIT_QT
> +	select QT5_MODULE_QTDECLARATIVE		if WPEWEBKIT_QT
> +	select SYSTEMD				if WPEWEBKIT_JOURNALD
>  	help
>  	  WebPlatformForEmbedded port for the WebKit cross-platform web browser engine.
>  
> @@ -56,4 +76,18 @@ config WPEWEBKIT_QT
>  	bool
>  	prompt "Qt API"
>  
> +config WPEWEBKIT_JOURNALD
> +	bool
> +	depends on INITMETHOD_SYSTEMD
> +	default y
> +	prompt "journald support"
> +
> +config WPEWEBKIT_VIDEO
> +	bool
> +	prompt "video support"
> +
> +config WPEWEBKIT_AUDIO
> +	bool
> +	prompt "audio support"
> +
>  endif
> diff --git a/rules/wpewebkit.make b/rules/wpewebkit.make
> index c0007d7774f3..2b8f8cd8b78d 100644
> --- a/rules/wpewebkit.make
> +++ b/rules/wpewebkit.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WPEWEBKIT) += wpewebkit
>  #
>  # Paths and names
>  #
> -WPEWEBKIT_VERSION	:= 2.28.4
> -WPEWEBKIT_MD5		:= 6ab041f6ebdb2e053981de5980c864e7
> +WPEWEBKIT_VERSION	:= 2.30.1
> +WPEWEBKIT_MD5		:= 251228a6e2917eff90a3eb6e9a7e920d
>  WPEWEBKIT		:= wpewebkit-$(WPEWEBKIT_VERSION)
>  WPEWEBKIT_SUFFIX	:= tar.xz
>  WPEWEBKIT_URL		:= https://wpewebkit.org/releases/$(WPEWEBKIT).$(WPEWEBKIT_SUFFIX)
> @@ -35,25 +35,28 @@ WPEWEBKIT_CONF_OPT	:= \
>  	$(CROSS_CMAKE_USR) \
>  	-G Ninja \
>  	-DCMAKE_BUILD_TYPE=Release \
> +	-DANALYZERS=OFF \
>  	-DDEBUG_FISSION=OFF \
> -	-DENABLE_ACCELERATED_2D_CANVAS=ON \
> +	-DENABLE_ACCELERATED_2D_CANVAS=OFF \
>  	-DENABLE_ACCESSIBILITY=OFF \
>  	-DENABLE_BUBBLEWRAP_SANDBOX=OFF \
>  	-DENABLE_ENCRYPTED_MEDIA=OFF \
>  	-DENABLE_GTKDOC=OFF\
>  	-DENABLE_MEDIA_SOURCE=ON \
>  	-DENABLE_SHAREABLE_RESOURCE=ON \
> -	-DENABLE_VIDEO=ON \
> +	-DENABLE_VIDEO=$(call ptx/onoff,PTXCONF_WPEWEBKIT_VIDEO) \
>  	-DENABLE_WEBDRIVER=ON \
> -	-DENABLE_WEB_AUDIO=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 \
> +	-DGCC_OFFLINEASM_SOURCE_MAP=OFF \
>  	-DPORT=WPE \
>  	-DSHOULD_INSTALL_JS_SHELL=OFF \
>  	-DSHOW_BINDINGS_GENERATION_PROGRESS=ON \
>  	-DUSE_LD_GOLD=OFF \
>  	-DUSE_OPENJPEG=OFF \
> +	-DUSE_SYSTEMD=$(call ptx/onoff,PTXCONF_WPEWEBKIT_JOURNALD) \
>  	-DUSE_THIN_ARCHIVES=ON \
>  	-DUSE_WOFF2=OFF \
>  	-DWTF_CPU_ARM64_CORTEXA53=OFF

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de