From 0d7c9545feb7b018ef32be417b08b29822326d0c Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Sat, 3 Sep 2016 14:11:47 -0400 Subject: [PATCH 1/2] pull proper gstreamer xcopy from master --- 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 7363c9d58187c5469a37c3b09d0715568116fdf9 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Sat, 3 Sep 2016 14:36:24 -0400 Subject: [PATCH 2/2] appveyor gstreamer version from master --- .appveyor.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 6aa9039..686ad36 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -27,19 +27,19 @@ 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 + cmd /c start /wait msiexec /package $msiPath /passive ADDLOCAL=ALL 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 + cmd /c start /wait msiexec /package $msiPath /passive ADDLOCAL=ALL Write-Host "Installed" -ForegroundColor Green build_script: