From 57af033a28f806f2f1b792575f8ae52f9485d1ba Mon Sep 17 00:00:00 2001 From: Alan Jeffrey Date: Mon, 25 Nov 2019 10:09:57 -0600 Subject: [PATCH] Require gstreamer 1.16 in mach --- python/servo/bootstrap.py | 2 +- python/servo/command_base.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/python/servo/bootstrap.py b/python/servo/bootstrap.py index f65284073e9..e191798cac5 100644 --- a/python/servo/bootstrap.py +++ b/python/servo/bootstrap.py @@ -49,7 +49,7 @@ def install_trusty_deps(force): def check_gstreamer_lib(): - return subprocess.call(["pkg-config", "--atleast-version=1.14", "gstreamer-1.0"], + return subprocess.call(["pkg-config", "--atleast-version=1.16", "gstreamer-1.0"], stdout=PIPE, stderr=PIPE) == 0 diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 5a8818333a9..e6b3ec7908b 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -583,10 +583,10 @@ class CommandBase(object): return True else: raise Exception("Your system's gstreamer libraries are out of date \ -(we need at least 1.12). Please run ./mach bootstrap-gstreamer") +(we need at least 1.16). Please run ./mach bootstrap-gstreamer") else: raise Exception("Your system's gstreamer libraries are out of date \ -(we need at least 1.12). If you're unable to \ +(we need at least 1.16). If you're unable to \ install them, let us know by filing a bug!") return False @@ -679,7 +679,7 @@ install them, let us know by filing a bug!") # we append in the reverse order so that system gstreamer libraries # do not get precedence extra_path = [libpath] + extra_path - extra_lib = [libpath] + extra_path + extra_lib = [libpath] + extra_lib append_to_path_env(path.join(libpath, "pkgconfig"), env, "PKG_CONFIG_PATH") if sys.platform == "linux2":