Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-02 20:20:14 +01:00
Code Issues Projects Releases Packages Wiki Activity

mach bootstrap should also bootstrap GStreamer on Windows (#30018)

Browse source 
Fixes #30007.
This commit is contained in:
Martin Robinson 2023-07-21 16:50:09 +02:00 • committed by GitHub
parent 5f2c6c09cd
commit 605bf52334
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
python/servo/platform/windows.py
View file

@ -83,6 +83,7 @@ class Windows(Base):
print("Could not run chocolatey. Follow manual build setup instructions.") print("Could not run chocolatey. Follow manual build setup instructions.")
raise e raise e
installed_something |= self._platform_bootstrap_gstreamer(force)
return installed_something return installed_something
def passive_bootstrap(self) -> bool: 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 installed version of GStreamer often sets an environment variable pointing to
# the install location. # the install location.
root_from_env = os.environ.get(f"GSTREAMER_1_0_ROOT_{gst_arch_name}") 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 return root_from_env
# If all else fails, look for an installation in the default install directory. # If all else fails, look for an installation in the default install directory.