Changeset 260641 in webkit

Timestamp:

Apr 24, 2020 7:22:10 AM (4 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK][WPE] White-list more GStreamer environment variables in webkitpy
​https://bugs.webkit.org/show_bug.cgi?id=210854
<rdar://problem/62238305>

Patch by Philippe Normand <​pnormand@igalia.com> on 2020-04-24
Reviewed by Carlos Alberto Lopez Perez.

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):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/port/gtk.py (modified) (1 diff)
• Scripts/webkitpy/port/wpe.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-04-24  Philippe Normand  <pnormand@igalia.com>
+
+        [GTK][WPE] White-list more GStreamer environment variables in webkitpy
+        https://bugs.webkit.org/show_bug.cgi?id=210854
+        <rdar://problem/62238305>
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        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  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Tools/Scripts/webkitpy/port/gtk.py

@@ -125 +125 @@
         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',
+                             'PLUGIN_PATH_1_0'):
+            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

trunk/Tools/Scripts/webkitpy/port/wpe.py

@@ -80 +80 @@
         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',
+                             'PLUGIN_PATH_1_0'):
+            self._copy_value_from_environ_if_set(environment, 'GST_%s' % gst_variable)
         return environment