From 605bf5233490cbd92aa5d3db78ee4182a7a70d34 Mon Sep 17 00:00:00 2001 From: Martin Robinson Date: Fri, 21 Jul 2023 16:50:09 +0200 Subject: [PATCH] `mach bootstrap` should also bootstrap GStreamer on Windows (#30018) Fixes #30007. --- python/servo/platform/windows.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python/servo/platform/windows.py b/python/servo/platform/windows.py index 063170a2555..ddd283db72d 100644 --- a/python/servo/platform/windows.py +++ b/python/servo/platform/windows.py @@ -83,6 +83,7 @@ class Windows(Base): print("Could not run chocolatey. Follow manual build setup instructions.") raise e + installed_something |= self._platform_bootstrap_gstreamer(force) return installed_something def passive_bootstrap(self) -> bool: @@ -127,7 +128,7 @@ class Windows(Base): # The installed version of GStreamer often sets an environment variable pointing to # the install location. root_from_env = os.environ.get(f"GSTREAMER_1_0_ROOT_{gst_arch_name}") - if root_from_env: + if root_from_env and os.path.exists(os.path.join(root_from_env, "bin", "ffi-7.dll")): return root_from_env # If all else fails, look for an installation in the default install directory.