From b0a2ff18c9f2c9131aed131f5bf0d97c0e23da8e Mon Sep 17 00:00:00 2001 From: cyy Date: Fri, 23 Nov 2018 10:27:17 +0800 Subject: add nonfree as feature for opencv --- ports/opencv/portfile.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake index 966c914b0..36564a0a6 100644 --- a/ports/opencv/portfile.cmake +++ b/ports/opencv/portfile.cmake @@ -207,6 +207,11 @@ if("eigen" IN_LIST FEATURES) set(WITH_EIGEN ON) endif() +set(OPENCV_ENABLE_NONFREE OFF) +if("nonfree" IN_LIST FEATURES) + set(OPENCV_ENABLE_NONFREE ON) +endif() + if(BUILD_opencv_contrib) vcpkg_from_github( OUT_SOURCE_PATH CONTRIB_SOURCE_PATH @@ -273,6 +278,7 @@ vcpkg_configure_cmake( # ENABLE -DENABLE_CXX11=ON -DENABLE_PYLINT=OFF + -DOPENCV_ENABLE_NONFREE=${OPENCV_ENABLE_NONFREE} # INSTALL -DINSTALL_FORCE_UNIX_PATHS=ON -DINSTALL_LICENSE=OFF -- cgit v1.2.3 From 3d7f31224ef0b22c7357cf05d526fdb2b3cfdb3d Mon Sep 17 00:00:00 2001 From: Griffin Downs Date: Tue, 5 Mar 2019 09:08:05 -0800 Subject: Add nonfree feature; Update version str --- ports/opencv/CONTROL | 5 ++++- ports/opencv/portfile.cmake | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL index 03328915d..88ade6e28 100644 --- a/ports/opencv/CONTROL +++ b/ports/opencv/CONTROL @@ -1,5 +1,5 @@ Source: opencv -Version: 3.4.3-6 +Version: 3.4.3-7 Build-Depends: zlib Description: computer vision library Default-Features: opengl, jpeg, png, tiff, eigen, flann @@ -80,3 +80,6 @@ Description: JPEG 2000 support for opencv Feature: eigen Build-Depends: eigen3 Description: Eigen support for opencv + +Feature: nonfree +Description: allow nonfree and unredistributable libraries diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake index 5bafe84ba..7c6594e1b 100644 --- a/ports/opencv/portfile.cmake +++ b/ports/opencv/portfile.cmake @@ -283,7 +283,7 @@ vcpkg_configure_cmake( # ENABLE -DENABLE_CXX11=ON -DENABLE_PYLINT=OFF - -DOPENCV_ENABLE_NONFREE=${OPENCV_ENABLE_NONFREE} + -DOPENCV_ENABLE_NONFREE=${OPENCV_ENABLE_NONFREE} # INSTALL -DINSTALL_FORCE_UNIX_PATHS=ON -DINSTALL_LICENSE=OFF -- cgit v1.2.3