Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-03 05:23:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

Require gstreamer 1.16 in mach

Browse source
This commit is contained in:
Alan Jeffrey 2019-11-25 10:09:57 -06:00
parent 69acec137d
commit 57af033a28
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
python/servo/bootstrap.py
View file

@ -49,7 +49,7 @@ def install_trusty_deps(force):
def check_gstreamer_lib(): 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 stdout=PIPE, stderr=PIPE) == 0

6
python/servo/command_base.py
View file

@ -583,10 +583,10 @@ class CommandBase(object):
return True return True
else: else:
raise Exception("Your system's gstreamer libraries are out of date \ 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: else:
raise Exception("Your system's gstreamer libraries are out of date \ 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!") install them, let us know by filing a bug!")
return False 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 # we append in the reverse order so that system gstreamer libraries
# do not get precedence # do not get precedence
extra_path = [libpath] + extra_path 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") append_to_path_env(path.join(libpath, "pkgconfig"), env, "PKG_CONFIG_PATH")
if sys.platform == "linux2": if sys.platform == "linux2":