Install gstreamer libraries for WPT runner tasks on mac.

This commit is contained in:
Josh Matthews 2019-05-13 12:29:21 -04:00
parent 1b8429f9ce
commit dd18ad29ac
3 changed files with 24 additions and 14 deletions

View file

@ -485,7 +485,10 @@ def update_wpt():
.with_max_run_time_minutes(5 * 60) .with_max_run_time_minutes(5 * 60)
) )
return ( return (
with_homebrew(update_task, "etc/taskcluster/macos/Brewfile-wpt") with_homebrew(update_task, [
"etc/taskcluster/macos/Brewfile-wpt",
"etc/taskcluster/macos/Brewfile-gstreamer",
])
.with_repo() .with_repo()
.with_curl_artifact_script(build_task, "target.tar.gz") .with_curl_artifact_script(build_task, "target.tar.gz")
.with_script(""" .with_script("""
@ -515,7 +518,8 @@ def macos_wpt():
.find_or_create("build.macos_x64_release." + CONFIG.git_sha) .find_or_create("build.macos_x64_release." + CONFIG.git_sha)
) )
def macos_run_task(name): def macos_run_task(name):
return macos_task(name).with_python2() task = macos_task(name).with_python2()
return with_homebrew(task, ["etc/taskcluster/macos/Brewfile-gstreamer"])
wpt_chunks("macOS x64", macos_run_task, build_task, repo_dir="repo", wpt_chunks("macOS x64", macos_run_task, build_task, repo_dir="repo",
total_chunks=6, processes=4, chunks=[1,2,3]) total_chunks=6, processes=4, chunks=[1,2,3])
@ -730,15 +734,18 @@ def windows_build_task(name, package=True, arch="x86_64"):
return task return task
def with_homebrew(task, brewfile): def with_homebrew(task, brewfiles):
return task.with_script(""" task = task.with_script("""
mkdir -p "$HOME/homebrew" mkdir -p "$HOME/homebrew"
export PATH="$HOME/homebrew/bin:$PATH" export PATH="$HOME/homebrew/bin:$PATH"
which brew || curl -L https://github.com/Homebrew/brew/tarball/master \ which brew || curl -L https://github.com/Homebrew/brew/tarball/master \
| tar xz --strip 1 -C "$HOME/homebrew" | tar xz --strip 1 -C "$HOME/homebrew"
""")
time brew bundle install --no-upgrade --file={brewfile} for brewfile in brewfiles:
""".format(brewfile=brewfile)) task = task.with_script("""
time brew bundle install --no-upgrade --file={brewfile}
""".format(brewfile=brewfile))
return task
def macos_build_task(name): def macos_build_task(name):
@ -752,7 +759,10 @@ def macos_build_task(name):
.with_rustup() .with_rustup()
) )
return ( return (
with_homebrew(build_task, "etc/taskcluster/macos/Brewfile") with_homebrew(build_task, [
"etc/taskcluster/macos/Brewfile",
"etc/taskcluster/macos/Brewfile-gstreamer",
])
.with_script(""" .with_script("""
export OPENSSL_INCLUDE_DIR="$(brew --prefix openssl)/include" export OPENSSL_INCLUDE_DIR="$(brew --prefix openssl)/include"
export OPENSSL_LIB_DIR="$(brew --prefix openssl)/lib" export OPENSSL_LIB_DIR="$(brew --prefix openssl)/lib"

View file

@ -3,12 +3,6 @@ brew "automake"
brew "cmake" brew "cmake"
brew "openssl" brew "openssl"
brew "pkg-config" brew "pkg-config"
brew "gstreamer"
brew "gst-plugins-base"
brew "gst-libav"
brew "gst-plugins-bad"
brew "gst-plugins-good"
brew "gst-rtsp-server"
brew "llvm" brew "llvm"
brew "yasm" brew "yasm"

View file

@ -0,0 +1,6 @@
brew "gstreamer"
brew "gst-plugins-base"
brew "gst-libav"
brew "gst-plugins-bad"
brew "gst-plugins-good"
brew "gst-rtsp-server"