diff options
author | Martin Robinson <mrobinson@igalia.com> | 2024-01-05 09:01:58 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-05 08:01:58 +0000 |
commit | 7fa4ea9740edccc93672d8cc428f6e9d4575a036 (patch) | |
tree | c45393c502ba740128e94991bf923dfc7cc95432 /python/servo/platform/windows.py | |
parent | c219204084b8f8a747ebd37ec75472c1b7e97411 (diff) | |
download | servo-7fa4ea9740edccc93672d8cc428f6e9d4575a036.tar.gz servo-7fa4ea9740edccc93672d8cc428f6e9d4575a036.zip |
Upgrade media / GStreamer / GLib (#30750)
- Upgrade the version of GStreamer for Windows
This upgrades the Windows build to use the most recent version of
GStreamer. This is necessary to upgrade our GStreamer dependency.
- Stop shipping GStreamer binaries on Linux
The binary bundle of GStreamer that we package is not used to compile --
only to run layout tests. It's too old for the APIs that we are using
(as evidenced by needed 1.18 for WebRTC) and nowadays Linux
distributions carry a new version so it's unecessary for our build
machines. No longer using this binary bundle will allow us to upgrade
our GStreamer dependency -- which now has stricter checks that we
are using at least version 1.18.
- Upgrade media to use newer versions of GStreamer / GLib dependencies
Diffstat (limited to 'python/servo/platform/windows.py')
-rw-r--r-- | python/servo/platform/windows.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/python/servo/platform/windows.py b/python/servo/platform/windows.py index 904e5a73067..028f4a167cc 100644 --- a/python/servo/platform/windows.py +++ b/python/servo/platform/windows.py @@ -23,8 +23,8 @@ DEPENDENCIES = { } URL_BASE = "https://github.com/servo/servo-build-deps/releases/download/msvc-deps/" -GSTREAMER_URL = f"{URL_BASE}/gstreamer-1.0-msvc-x86_64-1.16.0.msi" -GSTREAMER_DEVEL_URL = f"{URL_BASE}/gstreamer-1.0-devel-msvc-x86_64-1.16.0.msi" +GSTREAMER_URL = f"{URL_BASE}/gstreamer-1.0-msvc-x86_64-1.22.8.msi" +GSTREAMER_DEVEL_URL = f"{URL_BASE}/gstreamer-1.0-devel-msvc-x86_64-1.22.8.msi" DEPENDENCIES_DIR = os.path.join(util.get_target_dir(), "dependencies") @@ -118,19 +118,19 @@ class Windows(Base): # The bootstraped version of GStreamer always takes precedance of the installed vesion. prepackaged_root = os.path.join( - DEPENDENCIES_DIR, "gstreamer", "1.0", gst_arch_name + DEPENDENCIES_DIR, "gstreamer", "1.0", f"msvc_{gst_arch_name}" ) if os.path.exists(os.path.join(prepackaged_root, "bin", "ffi-7.dll")): return prepackaged_root # 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}") + root_from_env = os.environ.get(f"GSTREAMER_1_0_ROOT_MSVC_{gst_arch_name}") 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. - default_root = os.path.join("C:\\gstreamer\\1.0", gst_arch_name) + default_root = os.path.join("C:\\gstreamer\\1.0", f"msvc_{gst_arch_name}") if os.path.exists(os.path.join(default_root, "bin", "ffi-7.dll")): return default_root |