aboutsummaryrefslogtreecommitdiffstats
path: root/components/servo
diff options
context:
space:
mode:
authorMukilan Thiyagarajan <me@mukilan.in>2023-04-29 19:41:41 +0200
committerMukilan Thiyagarajan <me@mukilan.in>2023-05-12 00:14:38 +0530
commit8cfb19a8fba80a809af028223dd3a58d38123d02 (patch)
treeef051de063464259172ea52acfbf0a1d67dceb18 /components/servo
parent425b0fe641e16083507c459041ff5dd19256ed7c (diff)
downloadservo-8cfb19a8fba80a809af028223dd3a58d38123d02.tar.gz
servo-8cfb19a8fba80a809af028223dd3a58d38123d02.zip
Consume official GStreamer binaries on MacOS
This PR re-enables support for the gstreamer mediastack in macOS by consuming the official binary '.pkg' files from gstreamer.freedesktop.org To maintain symmetry with other platforms, the '.pkg' files are uploaded to servo-build-deps and fetched from there using the new script 'etc/install_macos_gstreamer.sh'. Unlike the Homebrew version, the official GStreamer is distributed as a 'relocatable' framework i.e the dylibs all have @rpath-relative install names and also link to other dylibs using @rpath relative path. To address this difference the 'servo' binary needs to be patched with 'install_name_tool' to add an LC_RPATH command that sets the relative paths that the dynamic linker should search when trying to satify dependencies. In Servo's case, this will be a path relative to the 'servo' binary itself i.e '@executable_path/lib/' The additional 'lib' is due to a flaw in the gstreamer packaging where the install names of some of the dylibs have the prefix '@rpath/lib' and some of them just have '@rpath'. This PR also fixes a couple of issues present in the `mach build` process on MacOS: 1. `mach build` process was not copying transitive dependencies of servo binary but only the first level dylibs 2. `mach build` process didn't patch the links to dylibs in servo binary (and dependencies). This meant though (some) dylibs were copied to local path, the binary still loaded the dylibs from system GStreamer installation i.e homebrew instead of the copieds dylibs The build and runtime dependencies in etc/homebrew/Brewfile and etc/homebrew/Brewfile-build have also been removed in This PR. Signed-off-by: Mukilan Thiyagarajan <me@mukilan.in>
Diffstat (limited to 'components/servo')
-rw-r--r--components/servo/lib.rs5
1 files changed, 5 insertions, 0 deletions
diff --git a/components/servo/lib.rs b/components/servo/lib.rs
index 131a53e656c..65b84721006 100644
--- a/components/servo/lib.rs
+++ b/components/servo/lib.rs
@@ -177,6 +177,11 @@ mod media_platform {
} else {
let mut plugin_dir = std::env::current_exe().unwrap();
plugin_dir.pop();
+
+ if cfg!(target_os = "macos") {
+ plugin_dir.push("lib");
+ }
+
plugin_dir
};