Skip to content
Snippets Groups Projects
Commit 1ef654c2 authored by Don Gagne's avatar Don Gagne
Browse files

Merge pull request #3146 from DonLakeFlyer/GStreamerOSX 

Add GStreamer to OS X builds
parents dede81b1 796171bd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 0 deletions
.travis.yml
+ 3
− 0
View file @ 1ef654c2
...@@ -25,6 +25,7 @@ matrix: ...@@ -25,6 +25,7 @@ matrix:
- os: osx - os: osx
osx_image: xcode7 osx_image: xcode7
env: SPEC=macx-clang CONFIG=installer SHADOW_BUILD_DIR=/tmp/build_macos_install env: SPEC=macx-clang CONFIG=installer SHADOW_BUILD_DIR=/tmp/build_macos_install
sudo: required
- os: osx - os: osx
osx_image: xcode7 osx_image: xcode7
env: SPEC=ios SHADOW_BUILD_DIR=/tmp/build_ios env: SPEC=ios SHADOW_BUILD_DIR=/tmp/build_ios
...@@ -103,6 +104,8 @@ install: ...@@ -103,6 +104,8 @@ install:
- if [[ "${TRAVIS_OS_NAME}" = "osx" && "${SPEC}" != "ios" ]]; then - if [[ "${TRAVIS_OS_NAME}" = "osx" && "${SPEC}" != "ios" ]]; then
wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.5.1-mac-clang.tar.bz2 && wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.5.1-mac-clang.tar.bz2 &&
tar jxf Qt5.5.1-mac-clang.tar.bz2 -C /tmp && tar jxf Qt5.5.1-mac-clang.tar.bz2 -C /tmp &&
wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/osx-gstreamer.tar.bz2 &&
sudo tar jxf osx-gstreamer.tar.bz2 -C /Library/Frameworks &&
export QT_DIR=Qt5.5-mac-clang/5.5/clang_64 && export QT_DIR=Qt5.5-mac-clang/5.5/clang_64 &&
export PATH=/tmp/$QT_DIR/bin:$PATH && export PATH=/tmp/$QT_DIR/bin:$PATH &&
export QT_QPA_PLATFORM_PLUGIN_PATH=/tmp/$QT_DIR/plugins && export QT_QPA_PLATFORM_PLUGIN_PATH=/tmp/$QT_DIR/plugins &&
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment