Skip to content

Q
qgroundcontrol
Commit a35f16d9 authored by Daniel Agar's avatar Daniel Agar Committed by GitHub
Browse files
Options

move gstreamer dependency to s3 (#3521)

parent 97abff09
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
.appveyor.yml
View file @ a35f16d9
...@@ -29,7 +29,7 @@ install: ...@@ -29,7 +29,7 @@ install:
Write-Host "Installing GStreamer..." -ForegroundColor Cyan Write-Host "Installing GStreamer..." -ForegroundColor Cyan
$msiPath = "$($env:USERPROFILE)\gstreamer-1.0-x86-1.8.1.msi" $msiPath = "$($env:USERPROFILE)\gstreamer-1.0-x86-1.8.1.msi"
Write-Host "Downloading..." Write-Host "Downloading..."
(New-Object Net.WebClient).DownloadFile('https://gstreamer.freedesktop.org/data/pkg/windows/1.8.1/gstreamer-1.0-x86-1.8.1.msi', $msiPath) (New-Object Net.WebClient).DownloadFile('https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-x86-1.8.1.msi', $msiPath)
Write-Host "Installing..." Write-Host "Installing..."
cmd /c start /wait msiexec /package $msiPath /passive cmd /c start /wait msiexec /package $msiPath /passive
Write-Host "Installed" -ForegroundColor Green Write-Host "Installed" -ForegroundColor Green
...@@ -37,7 +37,7 @@ install: ...@@ -37,7 +37,7 @@ install:
Write-Host "Installing GStreamer dev..." -ForegroundColor Cyan Write-Host "Installing GStreamer dev..." -ForegroundColor Cyan
$msiPath = "$($env:USERPROFILE)\gstreamer-1.0-devel-x86-1.8.1.msi" $msiPath = "$($env:USERPROFILE)\gstreamer-1.0-devel-x86-1.8.1.msi"
Write-Host "Downloading..." Write-Host "Downloading..."
(New-Object Net.WebClient).DownloadFile('https://gstreamer.freedesktop.org/data/pkg/windows/1.8.1/gstreamer-1.0-devel-x86-1.8.1.msi', $msiPath) (New-Object Net.WebClient).DownloadFile('https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-devel-x86-1.8.1.msi', $msiPath)
Write-Host "Installing..." Write-Host "Installing..."
cmd /c start /wait msiexec /package $msiPath /passive cmd /c start /wait msiexec /package $msiPath /passive
Write-Host "Installed" -ForegroundColor Green Write-Host "Installed" -ForegroundColor Green
......
.travis.yml
View file @ a35f16d9
...@@ -105,8 +105,8 @@ install: ...@@ -105,8 +105,8 @@ install:
; ;
fi fi
- if [[ "${TRAVIS_OS_NAME}" = "osx" && "${SPEC}" != "ios" ]]; then - 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 https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/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 && wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/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-devel-1.5.2-x86_64.pkg -target / &&
sudo installer -verboseR -pkg gstreamer-1.0-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 && wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.5.1-mac-clang.tar.bz2 &&
......
Markdown is supported
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