diff --git a/README.md b/README.md index 14dc466d699..5ced598003c 100644 --- a/README.md +++ b/README.md @@ -51,19 +51,18 @@ Please select your operating system: * [Android](#cross-compilation-for-android) #### macOS -#### On macOS (homebrew) +##### On macOS (homebrew) ``` sh -brew install automake autoconf@2.13 pkg-config python cmake yasm llvm -brew install gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav gst-rtsp-server --with-orc --with-libogg --with-opus --with-pango --with-theora --with-libvorbis +brew bundle install --file=etc/taskcluster/macos/Brewfile pip install virtualenv ``` -#### On macOS (MacPorts) +##### On macOS (MacPorts) ``` sh sudo port install python27 py27-virtualenv cmake yasm llvm ``` -#### On macOS >= 10.11 (El Capitan), you also have to install OpenSSL +##### On macOS >= 10.11 (El Capitan), you also have to install OpenSSL ``` sh brew install openssl diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py index fd2c5ea6e1f..745fed517a9 100644 --- a/etc/taskcluster/decision_task.py +++ b/etc/taskcluster/decision_task.py @@ -373,13 +373,10 @@ def macos_build_task(name): .with_script(""" mkdir -p "$HOME/homebrew" export PATH="$HOME/homebrew/bin:$PATH" - which homebrew || 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" - time brew install automake autoconf@2.13 pkg-config cmake yasm llvm - time brew install gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad \ - gst-libav gst-rtsp-server \ - --with-orc --with-libogg --with-opus --with-pango --with-theora --with-libvorbis + time brew bundle install --no-upgrade --file=etc/taskcluster/macos/Brewfile export OPENSSL_INCLUDE_DIR="$(brew --prefix openssl)/include" export OPENSSL_LIB_DIR="$(brew --prefix openssl)/lib" """) diff --git a/etc/taskcluster/macos/Brewfile b/etc/taskcluster/macos/Brewfile new file mode 100644 index 00000000000..d8609f8e7f6 --- /dev/null +++ b/etc/taskcluster/macos/Brewfile @@ -0,0 +1,15 @@ +brew "autoconf@2.13" +brew "automake" +brew "cmake" +brew "openssl" +brew "pkg-config" +brew "gstreamer" +brew "gst-plugins-base", args: ["with-orc", "with-libogg", "with-opus", "with-theora", "with-libvorbis", "with-pango"] +brew "gst-libav" +brew "gst-plugins-bad" +brew "gst-plugins-good" +brew "gst-rtsp-server" +brew "htop" +brew "llvm" +brew "openssl@1.1" +brew "yasm"