diff options
author | Martin Robinson <mrobinson@igalia.com> | 2023-07-21 16:50:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-21 14:50:09 +0000 |
commit | 605bf5233490cbd92aa5d3db78ee4182a7a70d34 (patch) | |
tree | 9341e2a7be24a61ebd500edd07dea65432cfbcec /python/servo/platform/windows.py | |
parent | 5f2c6c09cdbb1ec554d8a240c25d3867a3668a64 (diff) | |
download | servo-605bf5233490cbd92aa5d3db78ee4182a7a70d34.tar.gz servo-605bf5233490cbd92aa5d3db78ee4182a7a70d34.zip |
`mach bootstrap` should also bootstrap GStreamer on Windows (#30018)
Fixes #30007.
Diffstat (limited to 'python/servo/platform/windows.py')
-rw-r--r-- | python/servo/platform/windows.py | 3 |
1 files changed, 2 insertions, 1 deletions
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. |