aboutsummaryrefslogtreecommitdiffstats
path: root/python/servo/platform
diff options
context:
space:
mode:
authorMartin Robinson <mrobinson@igalia.com>2023-08-01 13:11:46 +0200
committerGitHub <noreply@github.com>2023-08-01 11:11:46 +0000
commit6f4f237fbd3ce6029b9e9b5be4c268630ab247df (patch)
treea413737493f2c4e348f0cd41a1a6ef5ef3bd2c83 /python/servo/platform
parente153bcb40b9b4a63cb8e14de7f2452140cab67b8 (diff)
downloadservo-6f4f237fbd3ce6029b9e9b5be4c268630ab247df.tar.gz
servo-6f4f237fbd3ce6029b9e9b5be4c268630ab247df.zip
Remove lzma path workaround for MacOS (#30053)
Now that the new version of GStreamer fixes this issue, we can remove the workarounds for this problem as well as all of the homebrew bootstrapping logic.
Diffstat (limited to 'python/servo/platform')
-rw-r--r--python/servo/platform/macos.py18
1 files changed, 3 insertions, 15 deletions
diff --git a/python/servo/platform/macos.py b/python/servo/platform/macos.py
index 00f9ad185ed..1bcb88cab54 100644
--- a/python/servo/platform/macos.py
+++ b/python/servo/platform/macos.py
@@ -16,8 +16,8 @@ from .. import util
from .base import Base
URL_BASE = "https://github.com/servo/servo-build-deps/releases/download/macOS"
-GSTREAMER_URL = f"{URL_BASE}/gstreamer-1.0-1.22.2-universal.pkg"
-GSTREAMER_DEVEL_URL = f"{URL_BASE}/gstreamer-1.0-devel-1.22.2-universal.pkg"
+GSTREAMER_URL = f"{URL_BASE}/gstreamer-1.0-1.22.3-universal.pkg"
+GSTREAMER_DEVEL_URL = f"{URL_BASE}/gstreamer-1.0-devel-1.22.3-universal.pkg"
GSTREAMER_ROOT = "/Library/Frameworks/GStreamer.framework/Versions/1.0"
@@ -55,19 +55,7 @@ class MacOS(Base):
return True
def _platform_bootstrap(self, _force: bool) -> bool:
- installed_something = False
- try:
- brewfile = os.path.join(util.SERVO_ROOT, "etc", "homebrew", "Brewfile")
- output = subprocess.check_output(
- ['brew', 'bundle', 'install', "--file", brewfile]
- ).decode("utf-8")
- print(output)
- installed_something = "Installing" in output
- except subprocess.CalledProcessError as e:
- print("Could not run homebrew. Is it installed?")
- raise e
- installed_something |= self._platform_bootstrap_gstreamer(False)
- return installed_something
+ return self._platform_bootstrap_gstreamer(False)
def _platform_bootstrap_gstreamer(self, force: bool) -> bool:
if not force and self.is_gstreamer_installed(cross_compilation_target=None):