From: Michael Olbrich <mol@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Bastian Krause <bst@pengutronix.de>
Subject: Re: [ptxdist] [APPLIED] wpewebkit: version bump 2.30.2 -> 2.30.4
Date: Fri, 15 Jan 2021 12:18:15 +0100 [thread overview]
Message-ID: <E1l0N7P-00C3JN-Lj@dude03.red.stw.pengutronix.de> (raw)
In-Reply-To: <20210113115507.32594-1-bst@pengutronix.de>
Thanks, applied as e1d719fde73090e31b15adb4646ce93bb3dd61c5.
Michael
[sent from post-receive hook]
On Fri, 15 Jan 2021 12:18:15 +0100, Bastian Krause <bst@pengutronix.de> wrote:
> Building with video support disabled is fixed upstream.
>
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> Message-Id: <20210113115507.32594-1-bst@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/wpewebkit-2.30.2/0001-WebProcess-InjectedBundle-guard-setGenericCueAPIEnab.patch b/patches/wpewebkit-2.30.2/0001-WebProcess-InjectedBundle-guard-setGenericCueAPIEnab.patch
> deleted file mode 100644
> index 43d26b9d464a..000000000000
> --- a/patches/wpewebkit-2.30.2/0001-WebProcess-InjectedBundle-guard-setGenericCueAPIEnab.patch
> +++ /dev/null
> @@ -1,37 +0,0 @@
> -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.2/series b/patches/wpewebkit-2.30.2/series
> deleted file mode 100644
> index 449999d76e31..000000000000
> --- a/patches/wpewebkit-2.30.2/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# 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.make b/rules/wpewebkit.make
> index 07e93049dfda..031b06418cc4 100644
> --- a/rules/wpewebkit.make
> +++ b/rules/wpewebkit.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WPEWEBKIT) += wpewebkit
> #
> # Paths and names
> #
> -WPEWEBKIT_VERSION := 2.30.2
> -WPEWEBKIT_MD5 := 5b0fed3333b53dbb36e572935fd54a7b
> +WPEWEBKIT_VERSION := 2.30.4
> +WPEWEBKIT_MD5 := d423a01ffb5be44e6ad59b2cfb9d6eb3
> WPEWEBKIT := wpewebkit-$(WPEWEBKIT_VERSION)
> WPEWEBKIT_SUFFIX := tar.xz
> WPEWEBKIT_URL := https://wpewebkit.org/releases/$(WPEWEBKIT).$(WPEWEBKIT_SUFFIX)
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
prev parent reply other threads:[~2021-01-15 11:18 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-13 11:55 [ptxdist] [PATCH] " Bastian Krause
2021-01-15 11:18 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1l0N7P-00C3JN-Lj@dude03.red.stw.pengutronix.de \
--to=mol@pengutronix.de \
--cc=bst@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox