From bb04b28405b7189de880c203445889225d716e7a Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Fri, 12 Aug 2016 10:15:42 -0700 Subject: [PATCH 1/3] Fix xcopy problem Seems to work differently on appveyor build --- src/VideoStreaming/VideoStreaming.pri | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/VideoStreaming/VideoStreaming.pri b/src/VideoStreaming/VideoStreaming.pri index 51b8d4b..1b967c8 100644 --- a/src/VideoStreaming/VideoStreaming.pri +++ b/src/VideoStreaming/VideoStreaming.pri @@ -69,7 +69,8 @@ LinuxBuild { QMAKE_POST_LINK += xcopy \"$$GST_ROOT_WIN\\bin\*.\" \"$$DESTDIR_WIN\" /S/Y $$escape_expand(\\n) # Copy GStreamer plugins - QMAKE_POST_LINK += $$escape_expand(\\n) xcopy \"$$GST_ROOT_WIN\\lib\\gstreamer-1.0\\*.dll\" \"$$DESTDIR_WIN\\gstreamer-plugins\\\" /S/Y $$escape_expand(\\n) + QMAKE_POST_LINK += $$escape_expand(\\n) xcopy \"$$GST_ROOT_WIN\\lib\\gstreamer-1.0\\*.dll\" \"$$DESTDIR_WIN\\gstreamer-plugins\\\" /Y $$escape_expand(\\n) + QMAKE_POST_LINK += $$escape_expand(\\n) xcopy \"$$GST_ROOT_WIN\\lib\\gstreamer-1.0\\validate\\*.dll\" \"$$DESTDIR_WIN\\gstreamer-plugins\\validate\\\" /Y $$escape_expand(\\n) } } else:AndroidBuild { #- gstreamer assumed to be installed in $$PWD/../../android/gstreamer-1.0-android-armv7-1.5.2 From 4e759e8b80a55ecf69c7dcdeb7b6b437bc3d1c6f Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Fri, 12 Aug 2016 10:42:05 -0700 Subject: [PATCH 2/3] Use GStreamer 1.5.2 --- .appveyor.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 6aa9039..64537e8 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -27,17 +27,17 @@ install: Write-Host "Installed" -ForegroundColor Green - ps: | 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.5.2.msi" Write-Host "Downloading..." - (New-Object Net.WebClient).DownloadFile('https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/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.5.2.msi', $msiPath) Write-Host "Installing..." cmd /c start /wait msiexec /package $msiPath /passive Write-Host "Installed" -ForegroundColor Green - ps: | 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.5.2.msi" Write-Host "Downloading..." - (New-Object Net.WebClient).DownloadFile('https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/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.5.2.msi', $msiPath) Write-Host "Installing..." cmd /c start /wait msiexec /package $msiPath /passive Write-Host "Installed" -ForegroundColor Green From 3c97a2fab1dec58def1e6dc59d2eb3a2a5b5eda7 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Fri, 12 Aug 2016 11:18:47 -0700 Subject: [PATCH 3/3] Full install of gstreamer --- .appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 64537e8..686ad36 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -31,7 +31,7 @@ install: Write-Host "Downloading..." (New-Object Net.WebClient).DownloadFile('https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-x86-1.5.2.msi', $msiPath) Write-Host "Installing..." - cmd /c start /wait msiexec /package $msiPath /passive + cmd /c start /wait msiexec /package $msiPath /passive ADDLOCAL=ALL Write-Host "Installed" -ForegroundColor Green - ps: | Write-Host "Installing GStreamer dev..." -ForegroundColor Cyan @@ -39,7 +39,7 @@ install: Write-Host "Downloading..." (New-Object Net.WebClient).DownloadFile('https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-devel-x86-1.5.2.msi', $msiPath) Write-Host "Installing..." - cmd /c start /wait msiexec /package $msiPath /passive + cmd /c start /wait msiexec /package $msiPath /passive ADDLOCAL=ALL Write-Host "Installed" -ForegroundColor Green build_script: