Attachment 370717 Details for Bug 198285 – Patch

[patch] Patch

wkgtk-no-wpe.diff (text/plain), 3.05 KB, created by Carlos Garcia Campos on 2019-05-28 01:30:50 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Garcia Campos

Created: 2019-05-28 01:30:50 PDT

Size: 3.05 KB

patch

obsolete

>diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/config.json b/Tools/BuildSlaveSupport/build.webkit.org-config/config.json
>index 24749b09340..1f4a41f779c 100644
>--- a/Tools/BuildSlaveSupport/build.webkit.org-config/config.json
>+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/config.json
>@@ -272,13 +272,13 @@
>                     {
>                       "name": "GTK Linux 64-bit Release Debian Stable (Build)", "type": "Build", "builddir": "gtk-linux-64-release-debian",
>                       "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
>-                      "additionalArguments": ["--no-experimental-features", "--no-media-source"],
>+                      "additionalArguments": ["--no-experimental-features", "--no-media-source", "--no-wpe-renderer"],
>                       "slavenames": ["gtk-linux-slave-10"]
>                     },
>                     {
>                       "name": "GTK Linux 64-bit Release Ubuntu LTS (Build)", "type": "Build", "builddir": "gtk-linux-64-release-ubuntu",
>                       "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
>-                      "additionalArguments": ["--no-experimental-features", "--no-media-source"],
>+                      "additionalArguments": ["--no-experimental-features", "--no-media-source", "--no-wpe-renderer"],
>                       "slavenames": ["gtk-linux-slave-11"]
>                     },
>                     {
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index e30999c33b9..aa90c88c1fe 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-05-28  Carlos Garcia Campos  <cgarcia@igalia.com>
>+
>+        [GTK] Build without WPE renderer in debian and ubuntu bots
>+        https://bugs.webkit.org/show_bug.cgi?id=198285
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        There aren't wpe packages in those distros, so we need to build with wpe renderer disabled.
>+
>+        * BuildSlaveSupport/build.webkit.org-config/config.json: Pass --no-wpe-renderer to build-webkit for debian and
>+        ubuntu bots.
>+        * Scripts/webkitperl/FeatureList.pm: Add --[no-]wpe-renderer command line option.
>+
> 2019-05-27  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         [GTK] Use WPEBackend-fdo for accelerating compositing in Wayland instead of the nested compositor
>diff --git a/Tools/Scripts/webkitperl/FeatureList.pm b/Tools/Scripts/webkitperl/FeatureList.pm
>index 4e027ea1f1c..2bee09fa839 100644
>--- a/Tools/Scripts/webkitperl/FeatureList.pm
>+++ b/Tools/Scripts/webkitperl/FeatureList.pm
>@@ -180,6 +180,7 @@ my (
>     $webglSupport,
>     $webgpuSupport,
>     $wirelessPlaybackTargetSupport,
>+    $wpeRendererSupport,
>     $xsltSupport,
> );
> 
>@@ -578,6 +579,9 @@ my @features = (
> 
>     { option => "system-malloc", desc => "Toggle system allocator instead of bmalloc",
>       define => "USE_SYSTEM_MALLOC", value => \$systemMallocSupport },
>+
>+    { option => "wpe-renderer", desc => "Toggle WPE renderer support in GTK port",
>+      define => "USE_WPE_RENDERER", value => \$wpeRendererSupport },
> );
> 
> sub getFeatureOptionList()

Actions: View | Formatted Diff | Diff

Attachments on bug 198285: 370717