Browse Source

Merge pull request #3477 from DonLakeFlyer/OSXGStreamerInstall

Install gstreamer on OSX travis
QGC4.4
Don Gagne 9 years ago
parent
commit
21978bb469
  1. 7
      .travis.yml

7
.travis.yml

@ -23,6 +23,7 @@ matrix: @@ -23,6 +23,7 @@ matrix:
- os: osx
osx_image: xcode7
env: SPEC=macx-clang CONFIG=debug QT_FATAL_WARNINGS=1
sudo: required
- os: osx
osx_image: xcode7
env: SPEC=macx-clang CONFIG=installer
@ -81,8 +82,6 @@ before_install: @@ -81,8 +82,6 @@ before_install:
;
fi
- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
wget http://gstreamer.freedesktop.org/data/pkg/osx/1.5.2/gstreamer-1.0-devel-1.5.2-x86_64.pkg &&
wget http://gstreamer.freedesktop.org/data/pkg/osx/1.5.2/gstreamer-1.0-1.5.2-x86_64.pkg &&
mkdir -p ~/Library/Preferences/QtProject/ &&
cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/Library/Preferences/QtProject/
;
@ -106,6 +105,10 @@ install: @@ -106,6 +105,10 @@ install:
;
fi
- if [[ "${TRAVIS_OS_NAME}" = "osx" && "${SPEC}" != "ios" ]]; then
wget http://gstreamer.freedesktop.org/data/pkg/osx/1.5.2/gstreamer-1.0-devel-1.5.2-x86_64.pkg &&
wget http://gstreamer.freedesktop.org/data/pkg/osx/1.5.2/gstreamer-1.0-1.5.2-x86_64.pkg &&
sudo installer -verboseR -pkg gstreamer-1.0-devel-1.5.2-x86_64.pkg -target / &&
sudo installer -verboseR -pkg gstreamer-1.0-1.5.2-x86_64.pkg -target / &&
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 &&
wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/osx-gstreamer.tar.bz2 &&

Loading…
Cancel
Save