Title: [260562] trunk/Tools
- Revision
- 260562
- Author
- [email protected]
- Date
- 2020-04-23 02:17:44 -0700 (Thu, 23 Apr 2020)
Log Message
[GTK][WPE] White-list more GStreamer environment variables in webkitpy
https://bugs.webkit.org/show_bug.cgi?id=210854
Reviewed by Adrian Perez de Castro.
Extra variables need to be white-listed when the webkitpy tooling
runs inside a gst-build environment, those variables are needed so
that uninstalled GStreamer plugins are correctly picked up.
Additionally we now correctly white-list the
WEBKIT_GST_USE_PLAYBIN3 env var. USE_PLAYBIN3 shouldn't be used
anymore.
* Scripts/webkitpy/port/gtk.py:
(GtkPort.setup_environ_for_server):
* Scripts/webkitpy/port/wpe.py:
(WPEPort.setup_environ_for_server):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (260561 => 260562)
--- trunk/Tools/ChangeLog 2020-04-23 08:59:31 UTC (rev 260561)
+++ trunk/Tools/ChangeLog 2020-04-23 09:17:44 UTC (rev 260562)
@@ -1,3 +1,23 @@
+2020-04-23 Philippe Normand <[email protected]>
+
+ [GTK][WPE] White-list more GStreamer environment variables in webkitpy
+ https://bugs.webkit.org/show_bug.cgi?id=210854
+
+ Reviewed by Adrian Perez de Castro.
+
+ Extra variables need to be white-listed when the webkitpy tooling
+ runs inside a gst-build environment, those variables are needed so
+ that uninstalled GStreamer plugins are correctly picked up.
+
+ Additionally we now correctly white-list the
+ WEBKIT_GST_USE_PLAYBIN3 env var. USE_PLAYBIN3 shouldn't be used
+ anymore.
+
+ * Scripts/webkitpy/port/gtk.py:
+ (GtkPort.setup_environ_for_server):
+ * Scripts/webkitpy/port/wpe.py:
+ (WPEPort.setup_environ_for_server):
+
2020-04-23 Diego Pino Garcia <[email protected]>
[Flatpak SDK] Install dependencies step needs configuration as argument
Modified: trunk/Tools/Scripts/webkitpy/port/gtk.py (260561 => 260562)
--- trunk/Tools/Scripts/webkitpy/port/gtk.py 2020-04-23 08:59:31 UTC (rev 260561)
+++ trunk/Tools/Scripts/webkitpy/port/gtk.py 2020-04-23 09:17:44 UTC (rev 260562)
@@ -124,11 +124,10 @@
self._copy_value_from_environ_if_set(environment, 'WEBKIT_OUTPUTDIR')
self._copy_value_from_environ_if_set(environment, 'WEBKIT_JHBUILD')
self._copy_value_from_environ_if_set(environment, 'WEBKIT_TOP_LEVEL')
- self._copy_value_from_environ_if_set(environment, 'USE_PLAYBIN3')
- self._copy_value_from_environ_if_set(environment, 'GST_DEBUG')
- self._copy_value_from_environ_if_set(environment, 'GST_DEBUG_DUMP_DOT_DIR')
- self._copy_value_from_environ_if_set(environment, 'GST_DEBUG_FILE')
- self._copy_value_from_environ_if_set(environment, 'GST_DEBUG_NO_COLOR')
+ self._copy_value_from_environ_if_set(environment, 'WEBKIT_GST_USE_PLAYBIN3')
+ for gst_variable in ('DEBUG', 'DEBUG_DUMP_DOT_DIR', 'DEBUG_FILE', 'DEBUG_NO_COLOR',
+ 'PLUGIN_SCANNER', 'PLUGIN_PATH', 'PLUGIN_SYSTEM_PATH', 'REGISTRY'):
+ self._copy_value_from_environ_if_set(environment, 'GST_%s' % gst_variable)
# Configure the software libgl renderer if jhbuild ready and we test inside a virtualized window system
if self._driver_class() in [XvfbDriver, WestonDriver] and (self._should_use_jhbuild() or self._is_flatpak()):
Modified: trunk/Tools/Scripts/webkitpy/port/wpe.py (260561 => 260562)
--- trunk/Tools/Scripts/webkitpy/port/wpe.py 2020-04-23 08:59:31 UTC (rev 260561)
+++ trunk/Tools/Scripts/webkitpy/port/wpe.py 2020-04-23 09:17:44 UTC (rev 260562)
@@ -79,13 +79,12 @@
self._copy_value_from_environ_if_set(environment, 'WEBKIT_OUTPUTDIR')
self._copy_value_from_environ_if_set(environment, 'WEBKIT_JHBUILD')
self._copy_value_from_environ_if_set(environment, 'WEBKIT_TOP_LEVEL')
- self._copy_value_from_environ_if_set(environment, 'USE_PLAYBIN3')
- self._copy_value_from_environ_if_set(environment, 'GST_DEBUG')
- self._copy_value_from_environ_if_set(environment, 'GST_DEBUG_DUMP_DOT_DIR')
- self._copy_value_from_environ_if_set(environment, 'GST_DEBUG_FILE')
- self._copy_value_from_environ_if_set(environment, 'GST_DEBUG_NO_COLOR')
self._copy_value_from_environ_if_set(environment, 'LIBGL_ALWAYS_SOFTWARE')
self._copy_value_from_environ_if_set(environment, 'XR_RUNTIME_JSON')
+ self._copy_value_from_environ_if_set(environment, 'WEBKIT_GST_USE_PLAYBIN3')
+ for gst_variable in ('DEBUG', 'DEBUG_DUMP_DOT_DIR', 'DEBUG_FILE', 'DEBUG_NO_COLOR',
+ 'PLUGIN_SCANNER', 'PLUGIN_PATH', 'PLUGIN_SYSTEM_PATH', 'REGISTRY'):
+ self._copy_value_from_environ_if_set(environment, 'GST_%s' % gst_variable)
return environment
def show_results_html_file(self, results_filename):
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
