Skip to content

Commit

Permalink
Add .servobuild configuration for the choice of media stack
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonSapin committed Jul 6, 2020
1 parent 637c6c0 commit 1a8c5fe
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
13 changes: 8 additions & 5 deletions python/servo/command_base.py
Expand Up @@ -304,6 +304,7 @@ def resolverelative(category, key):
self.config["build"].setdefault("debug-assertions", False)
self.config["build"].setdefault("debug-mozjs", False)
self.config["build"].setdefault("layout-2020", False)
self.config["build"].setdefault("media-stack", "auto")
self.config["build"].setdefault("ccache", "")
self.config["build"].setdefault("rustflags", "")
self.config["build"].setdefault("incremental", None)
Expand Down Expand Up @@ -856,11 +857,13 @@ def pick_target_triple(self, target, android, magicleap):

# A guess about which platforms should use the gstreamer media stack
def pick_media_stack(self, media_stack, target):
if not(media_stack):
if (
not(target)
or ("armv7" in target and "android" in target)
or ("x86_64" in target)
if not media_stack:
if self.config["build"]["media-stack"] != "auto":
media_stack = self.config["build"]["media-stack"]
elif (
not target
or ("armv7" in target and "android" in target)
or "x86_64" in target
):
media_stack = "gstreamer"
else:
Expand Down
3 changes: 3 additions & 0 deletions servobuild.example
Expand Up @@ -46,6 +46,9 @@ dom-backtrace = false
# Default to the “2020” implementation of CSS layout instead of the “2013” one.
layout-2020 = false

# Pick a media stack based on the target. Other values are "gstreamer" and "dummy"
media-stack = "auto"

# Set to the path to your ccache binary to enable caching of compiler outputs
#ccache = "/usr/local/bin/ccache"

Expand Down

0 comments on commit 1a8c5fe

Please sign in to comment.