Skip to contentSkip to conversation

package/wpewebkit: fix compile without video support

PATCH New Peter Seiderer 3 participants 9 messages Nov 10, 2020 – Nov 20, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/wpewebkit: fix compile without video support

Fixes:

- https://bugs.busybox.net/show_bug.cgi?id=13306

      .../wpewebkit-2.30.2/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp:242:30: error: ?class WebCore::Settings? has no member named ?setGenericCueAPIEnabled?; did you mean ?setBeaconAPIEnabled??
                   page->settings().setGenericCueAPIEnabled(enabled);
                                    ^~~~~~~~~~~~~~~~~~~~~~~
                                    setBeaconAPIEnabled
---
 ...tedBundle-fix-compile-without-video-.patch | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 package/wpewebkit/0002-WebProcess-InjectedBundle-fix-compile-without-video-.patch
package/wpewebkit/0002-WebProcess-InjectedBundle-fix-compile-without-video-.patch new file +42 -0
new file mode 100644
index 0000000000..e684c4e3e7
@@ -0,0 +1,42 @@
+From 1ca7dea56db25969844699bc82fe7c78cb3d2eda Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <[email protected]>
+Date: Tue, 10 Nov 2020 23:06:45 +0100
+Subject: [PATCH] WebProcess/InjectedBundle: fix compile without video support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes:
+
+  .../wpewebkit-2.30.2/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp:242:30: error: ?class WebCore::Settings? has no member named ?setGenericCueAPIEnabled?; did you mean ?setBeaconAPIEnabled??
+               page->settings().setGenericCueAPIEnabled(enabled);
+                                ^~~~~~~~~~~~~~~~~~~~~~~
+                                setBeaconAPIEnabled
+
+Signed-off-by: Peter Seiderer <[email protected]>
+---
+ 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 61326f2e..d7776997 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") {
+-- 
+2.29.2
+
Signature · 1 line
2.29.2
#1 lore raw

PATCH 1/1 package/wpewebkit: fix compile without video support

Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Seiderer <[email protected]> writes:

Fixes:
- https://bugs.busybox.net/show_bug.cgi?id=13306

.../wpewebkit-2.30.2/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp:242:30: error: ?class WebCore::Settings? has no member named ?setGenericCueAPIEnabled?; did you mean ?setBeaconAPIEnabled??

 page-> settings().setGenericCueAPIEnabled(enabled);
                                    ^~~~~~~~~~~~~~~~~~~~~~~
                                    setBeaconAPIEnabled

Committed, thanks. Don't forget to submit the patch upstream.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 package/wpewebkit: fix compile without video support

Hello Peter,

Quoted 5 lines · Peter Korsgaard
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Seiderer <[email protected]> writes:

Fixes:
- https://bugs.busybox.net/show_bug.cgi?id=13306

Quoted 9 lines
Quoted 6 lines

.../wpewebkit-2.30.2/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp:242:30: error: ?class WebCore::Settings? has no member named ?setGenericCueAPIEnabled?; did you mean ?setBeaconAPIEnabled??

 page-> settings().setGenericCueAPIEnabled(enabled);
                                    ^~~~~~~~~~~~~~~~~~~~~~~
                                    setBeaconAPIEnabled  

Committed, thanks. Don't forget to submit the patch upstream.

Patch seems upstream already superseded by [1] 'Remove remaining alternative preference setting mechanisms from LayoutTests' (removing the code)...

Regards,
Peter

[1] https://trac.webkit.org/changeset?reponame=webkit&new=269236%40trunk%2FSource%2FWebKit%2FWebProcess%2FInjectedBundle%2FInjectedBundle.cpp&old=269111%40trunk%2FSource%2FWebKit%2FWebProcess%2FInjectedBundle%2FInjectedBundle.cpp

#3 lore raw

PATCH 1/1 package/wpewebkit: fix compile without video support

Hello there!

Quoted 14 lines · On Thu, 12 Nov 2020 22:37:34 +0100 Peter Seiderer <[email protected]> wrote:

Hello Peter,

Quoted 10 lines · Peter Korsgaard
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Seiderer <[email protected]> writes:

Fixes:
- https://bugs.busybox.net/show_bug.cgi?id=13306

.../wpewebkit-2.30.2/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp:242:30: error: ?class WebCore::Settings? has no member named ?setGenericCueAPIEnabled?; did you mean ?setBeaconAPIEnabled??

 page-> settings().setGenericCueAPIEnabled(enabled);
                                    ^~~~~~~~~~~~~~~~~~~~~~~
                                    setBeaconAPIEnabled  
Quoted 7 lines
Quoted 4 lines
Quoted 1 line

Committed, thanks. Don't forget to submit the patch upstream.

Patch seems upstream already superseded by [1] 'Remove remaining alternative preference setting mechanisms from LayoutTests' (removing the code)...

I looked a bit into backporting this patch (and a few dependent ones) into the stable release branch and it got complicated quickly. I think that it may be better to have the fix that just uses the ENABLE(VIDEO) guards merged in the release branch.

I have just created an issue in WebKit's Bugzilla:

https://bugs.webkit.org/show_bug.cgi?id=218921

and I will have a fix done which will be included in version 2.30.3, which is to be released soon and will also include security fixes. Maybe we would prefer to wait until that version is released and update Buildroot to it before ending the release candidate period. WDYT?

?Adri?n

Quoted 1 line

[1] https://trac.webkit.org/changeset?reponame=webkit&new=269236%40trunk%2FSource%2FWebKit%2FWebProcess%2FInjectedBundle%2FInjectedBundle.cpp&old=269111%40trunk%2FSource%2FWebKit%2FWebProcess%2FInjectedBundle%2FInjectedBundle.cpp

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20201113/5521474b/attachment.asc>

#4 lore raw

PATCH 1/1 package/wpewebkit: fix compile without video support

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Adrian" == Adrian Perez de Castro <[email protected]> writes:

Hi,

Quoted 11 lines
Quoted 2 lines

Patch seems upstream already superseded by [1] 'Remove remaining alternative preference setting mechanisms from LayoutTests' (removing the code)...

I looked a bit into backporting this patch (and a few dependent ones) into the stable release branch and it got complicated quickly. I think that it may be better to have the fix that just uses the ENABLE(VIDEO) guards merged in the release branch.

I have just created an issue in WebKit's Bugzilla:

https://bugs.webkit.org/show_bug.cgi?id=218921

Thanks!

Quoted 4 lines

and I will have a fix done which will be included in version 2.30.3, which is to be released soon and will also include security fixes. Maybe we would prefer to wait until that version is released and update Buildroot to it before ending the release candidate period. WDYT?

I normally only cut the final release at the very end of the month / early December, so if "soon" is before that, it should be fine.

Signature · 1 line
Bye, Peter Korsgaard
#5 lore raw

PATCH 1/1 package/wpewebkit: fix compile without video support

Hi Peter,

Quoted 18 lines · On Sat, 14 Nov 2020 09:09:04 +0100 Peter Korsgaard <[email protected]> wrote:
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Adrian" == Adrian Perez de Castro <[email protected]> writes:

Hi,

Quoted 11 lines
Quoted 2 lines

Patch seems upstream already superseded by [1] 'Remove remaining alternative preference setting mechanisms from LayoutTests' (removing the code)...

I looked a bit into backporting this patch (and a few dependent ones) into the stable release branch and it got complicated quickly. I think that it may be better to have the fix that just uses the ENABLE(VIDEO) guards merged in the release branch.

I have just created an issue in WebKit's Bugzilla:

https://bugs.webkit.org/show_bug.cgi?id=218921

Thanks!

Quoted 7 lines
Quoted 4 lines

and I will have a fix done which will be included in version 2.30.3, which is to be released soon and will also include security fixes. Maybe we would prefer to wait until that version is released and update Buildroot to it before ending the release candidate period. WDYT?

I normally only cut the final release at the very end of the month / early December, so if "soon" is before that, it should be fine.

The person in charge of the WebKitGTK releases and myself (for WPE WebKit) have been talking about when to make the new releases happen, and it's likely that we will put out the tarballs and an accompanying WSA by Friday 20th. If, for some reason, that cannot happen in the end, I will add submit this patch to be included in the Buildroot release instead of the version bump.

Cheers,
?Adri?n
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20201114/4f1e40d9/attachment.asc>

#6 lore raw

PATCH 1/1 package/wpewebkit: fix compile without video support

Quoted 18 lines · On Sat, 14 Nov 2020 16:27:30 +0200 Adrian Perez de Castro <[email protected]>…

Hi Peter,

Quoted 15 lines · On Sat, 14 Nov 2020 09:09:04 +0100 Peter Korsgaard <[email protected]> wrote:
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Adrian" == Adrian Perez de Castro <[email protected]> writes:

Hi,

Quoted 11 lines
Quoted 2 lines

Patch seems upstream already superseded by [1] 'Remove remaining alternative preference setting mechanisms from LayoutTests' (removing the code)...

I looked a bit into backporting this patch (and a few dependent ones) into the stable release branch and it got complicated quickly. I think that it may be better to have the fix that just uses the ENABLE(VIDEO) guards merged in the release branch.

I have just created an issue in WebKit's Bugzilla:

https://bugs.webkit.org/show_bug.cgi?id=218921

The patch is now in the 2.30 release branch \o/

Quoted 7 lines
Quoted 7 lines

Thanks!

Quoted 4 lines

and I will have a fix done which will be included in version 2.30.3, which is to be released soon and will also include security fixes. Maybe we would prefer to wait until that version is released and update Buildroot to it before ending the release candidate period. WDYT?

Quoted 8 lines
Quoted 2 lines

I normally only cut the final release at the very end of the month / early December, so if "soon" is before that, it should be fine.

The person in charge of the WebKitGTK releases and myself (for WPE WebKit) have been talking about when to make the new releases happen, and it's likely that we will put out the tarballs and an accompanying WSA by Friday 20th. If, for some reason, that cannot happen in the end, I will add submit this patch to be included in the Buildroot release instead of the version bump.

Confirmed, we will have new releases of WebKitGTK and WPE WebKit by the end of this week. I'll submit patches to update the Buildroot packages as soon as the releases are out.

Cheers,
?Adri?n
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20201116/5444ab8e/attachment.asc>

#7 lore raw

PATCH 1/1 package/wpewebkit: fix compile without video support

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Adrian" == Adrian Perez de Castro <[email protected]> writes:

Hi,

Quoted 9 lines
Quoted 5 lines

The person in charge of the WebKitGTK releases and myself (for WPE WebKit) have been talking about when to make the new releases happen, and it's likely that we will put out the tarballs and an accompanying WSA by Friday 20th. If, for some reason, that cannot happen in the end, I will add submit this patch to be included in the Buildroot release instead of the version bump.

Confirmed, we will have new releases of WebKitGTK and WPE WebKit by the end of this week. I'll submit patches to update the Buildroot packages as soon as the releases are out.

Great, thanks!

Signature · 1 line
Bye, Peter Korsgaard
#8 lore raw

PATCH 1/1 package/wpewebkit: fix compile without video support

Quoted 10 lines · On Mon, 16 Nov 2020 13:04:09 +0100 Peter Korsgaard <[email protected]> wrote:
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Adrian" == Adrian Perez de Castro <[email protected]> writes:

Hi,

Quoted 5 lines
Quoted 5 lines

The person in charge of the WebKitGTK releases and myself (for WPE WebKit) have been talking about when to make the new releases happen, and it's likely that we will put out the tarballs and an accompanying WSA by Friday 20th. If, for some reason, that cannot happen in the end, I will add submit this patch to be included in the Buildroot release instead of the version bump.

Quoted 5 lines
Quoted 3 lines

Confirmed, we will have new releases of WebKitGTK and WPE WebKit by the end of this week. I'll submit patches to update the Buildroot packages as soon as the releases are out.

Great, thanks!

Done, here's the patches to update both WebKitGTK and WPE WebKit to 2.30.3:

https://patchwork.ozlabs.org/project/buildroot/patch/20201120161937.222193-1-aperez at igalia.com/
https://patchwork.ozlabs.org/project/buildroot/patch/20201120161918.222066-1-aperez at igalia.com/

There will be a security advisory covering these releases, but it is still going to take a day or two to have it online.

Cheers,
?Adri?n
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20201120/8324a0be/attachment.asc>