diff options
| author | Martin Robinson <mrobinson@igalia.com> | 2024-01-07 22:25:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-07 21:25:22 +0000 |
| commit | 79a0f76d26d43c7f6e38a60fbe2ec6bed1510543 (patch) | |
| tree | 4974b179edfafe9f22b93b5831f6ce7638cb99c3 /python/servo/platform/base.py | |
| parent | d0ce48db06c121028e723ad3375186ab0fb961da (diff) | |
| download | servo-79a0f76d26d43c7f6e38a60fbe2ec6bed1510543.tar.gz servo-79a0f76d26d43c7f6e38a60fbe2ec6bed1510543.zip | |
Fix the build on Ubuntu 20.04 (#31019)
Ubuntu 20.04 doesn't have a new enough version of GStreamer, so
automatically disable media when running on that platform.
This also cleans up the media detection a bit, putting the result in a
`enable-media` variable and moving some of the logic into the build
scripts themselves rather than the platform module.
Diffstat (limited to 'python/servo/platform/base.py')
| -rw-r--r-- | python/servo/platform/base.py | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/python/servo/platform/base.py b/python/servo/platform/base.py index 39d7ae5f293..1024ab6c28f 100644 --- a/python/servo/platform/base.py +++ b/python/servo/platform/base.py @@ -26,11 +26,6 @@ class Base: def set_gstreamer_environment_variables_if_necessary( self, env: Dict[str, str], cross_compilation_target: Optional[str], check_installation=True ): - # Environment variables are not needed when cross-compiling on any platform other - # than Windows. GStreamer for Android is handled elsewhere. - if cross_compilation_target and (not self.is_windows or "android" in cross_compilation_target): - return - # We may not need to update environment variables if GStreamer is installed # for the system on Linux. gstreamer_root = self.gstreamer_root(cross_compilation_target) @@ -52,14 +47,6 @@ class Base: ) env["GST_PLUGIN_SYSTEM_PATH"] = os.path.join(gstreamer_root, "lib", "gstreamer-1.0") - # If we are not cross-compiling GStreamer must be installed for the system. In - # the cross-compilation case, we might be picking it up from another directory. - if check_installation and not self.is_gstreamer_installed(cross_compilation_target): - raise FileNotFoundError( - "GStreamer libraries not found (>= version 1.18)." - "Please see installation instructions in README.md" - ) - def gstreamer_root(self, _cross_compilation_target: Optional[str]) -> Optional[str]: raise NotImplementedError("Do not know how to get GStreamer path for platform.") |