diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-09-22 19:42:01 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-09-22 20:52:07 -0700 |
| commit | b9f2d7b618a95af12131513214629f82449468c8 (patch) | |
| tree | 91e19ab3122ad27fcc1efe85ebcdc474f966766e | |
| parent | e79c36cb8d533f7e4675ea3b970ac0a935e5904c (diff) | |
| download | vcpkg-b9f2d7b618a95af12131513214629f82449468c8.tar.gz vcpkg-b9f2d7b618a95af12131513214629f82449468c8.zip | |
[opencv] Remove protobuf dependency for UWP
| -rw-r--r-- | ports/opencv/002-fix-uwp.patch | 13 | ||||
| -rw-r--r-- | ports/opencv/CONTROL | 4 |
2 files changed, 2 insertions, 15 deletions
diff --git a/ports/opencv/002-fix-uwp.patch b/ports/opencv/002-fix-uwp.patch index d684141f5..22d006862 100644 --- a/ports/opencv/002-fix-uwp.patch +++ b/ports/opencv/002-fix-uwp.patch @@ -24,16 +24,3 @@ index c8242dd..97edd14 100644 # removing APPCONTAINER from modules to run from console # in case of usual starting of WinRT test apps output is missing # so starting of console version w/o APPCONTAINER is required to get test results -diff --git a/modules/highgui/src/window.cpp b/modules/highgui/src/window.cpp -index 9306f8e..69a814e 100644 ---- a/modules/highgui/src/window.cpp -+++ b/modules/highgui/src/window.cpp -@@ -209,7 +209,7 @@ int cv::waitKeyEx(int delay) - int cv::waitKey(int delay) - { - int code = waitKeyEx(delay); --#ifndef HAVE_WINRT -+#ifndef WINRT - static int use_legacy = -1; - if (use_legacy < 0) - { diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL index 0a4c327cc..8130ef3b4 100644 --- a/ports/opencv/CONTROL +++ b/ports/opencv/CONTROL @@ -1,5 +1,5 @@ Source: opencv -Version: 3.3.0-2 +Version: 3.3.0-3 # Optional: Add in vtk to build with VTK and cuda to build with CUDA -Build-Depends: zlib, libpng, libjpeg-turbo, tiff, protobuf, ffmpeg +Build-Depends: zlib, libpng, libjpeg-turbo, tiff, protobuf (windows), ffmpeg Description: computer vision library |