[opencv] Remove ffmpeg from dependencies -- it is not currently possible to use an external ffmpeg with opencv.

Add features for cuda and vtk.
This commit is contained in:
Robert Schumacher 2017-11-01 07:08:10 -07:00
parent eba3e2d405
commit 5bfb7dd74c
2 changed files with 47 additions and 12 deletions

View File

@ -1,5 +1,19 @@
Source: opencv Source: opencv
Version: 3.3.1-2 Version: 3.3.1-3
# Optional: Add in vtk to build with VTK and cuda to build with CUDA
Build-Depends: zlib, libpng, libjpeg-turbo, tiff, protobuf (windows) Build-Depends: zlib, libpng, libjpeg-turbo, tiff, protobuf (windows)
Description: computer vision library Description: computer vision library
Feature: ffmpeg
Description: prebuilt ffmpeg support for opencv
Feature: vtk
Build-Depends: vtk
Description: vtk support for opencv
Feature: cuda
Build-Depends: cuda
Description: CUDA support for opencv
Feature: sfm
Build-Depends: eigen3, glog, gflags
Description: opencv_sfm module

View File

@ -32,6 +32,26 @@ vcpkg_apply_patches(
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_WITH_STATIC_CRT) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_WITH_STATIC_CRT)
set(WITH_FFMPEG OFF)
if("ffmpeg" IN_LIST FEATURES)
set(WITH_FFMPEG ON)
endif()
set(WITH_CUDA OFF)
if("cuda" IN_LIST FEATURES)
set(WITH_CUDA ON)
endif()
set(WITH_VTK OFF)
if("vtk" IN_LIST FEATURES)
set(WITH_VTK ON)
endif()
set(BUILD_opencv_sfm OFF)
if("sfm" IN_LIST FEATURES)
set(BUILD_opencv_sfm ON)
endif()
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
OPTIONS OPTIONS
@ -42,10 +62,6 @@ vcpkg_configure_cmake(
-DBUILD_JPEG=OFF -DBUILD_JPEG=OFF
-DBUILD_PNG=OFF -DBUILD_PNG=OFF
-DCMAKE_DISABLE_FIND_PACKAGE_JNI=ON -DCMAKE_DISABLE_FIND_PACKAGE_JNI=ON
-DBUILD_opencv_python2=OFF
-DBUILD_opencv_python3=OFF
-DBUILD_opencv_flann=ON
-DBUILD_opencv_apps=OFF
-DBUILD_DOCS=OFF -DBUILD_DOCS=OFF
-DBUILD_EXAMPLES=OFF -DBUILD_EXAMPLES=OFF
-DENABLE_PYLINT=OFF -DENABLE_PYLINT=OFF
@ -54,23 +70,28 @@ vcpkg_configure_cmake(
-DBUILD_TESTS=OFF -DBUILD_TESTS=OFF
-DBUILD_WITH_DEBUG_INFO=ON -DBUILD_WITH_DEBUG_INFO=ON
-DOpenCV_DISABLE_ARCH_PATH=ON -DOpenCV_DISABLE_ARCH_PATH=ON
-DWITH_FFMPEG=ON
-DINSTALL_FORCE_UNIX_PATHS=ON -DINSTALL_FORCE_UNIX_PATHS=ON
-DOPENCV_CONFIG_INSTALL_PATH=share/opencv -DOPENCV_CONFIG_INSTALL_PATH=share/opencv
-DOPENCV_OTHER_INSTALL_PATH=share/opencv -DOPENCV_OTHER_INSTALL_PATH=share/opencv
-DINSTALL_LICENSE=OFF -DINSTALL_LICENSE=OFF
# Optional: change to ON to build with CUDA
-DWITH_CUDA=OFF
-DWITH_CUBLAS=OFF -DWITH_CUBLAS=OFF
-DWITH_OPENCLAMDBLAS=OFF -DWITH_OPENCLAMDBLAS=OFF
-DWITH_LAPACK=OFF -DWITH_LAPACK=OFF
-DBUILD_opencv_dnn=ON
-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules -DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules
-DBUILD_PROTOBUF=OFF -DBUILD_PROTOBUF=OFF
-DUPDATE_PROTO_FILES=ON -DUPDATE_PROTO_FILES=ON
-DPROTOBUF_UPDATE_FILES=ON -DPROTOBUF_UPDATE_FILES=ON
# Optional: change to ON to build with VTK
-DWITH_VTK=OFF -DBUILD_opencv_dnn=ON
-DBUILD_opencv_python2=OFF
-DBUILD_opencv_python3=OFF
-DBUILD_opencv_flann=ON
-DBUILD_opencv_apps=OFF
-DBUILD_opencv_sfm=${BUILD_opencv_sfm}
-DWITH_FFMPEG=${WITH_FFMPEG}
-DWITH_CUDA=${WITH_CUDA}
-DWITH_VTK=${WITH_VTK}
OPTIONS_DEBUG OPTIONS_DEBUG
-DINSTALL_HEADERS=OFF -DINSTALL_HEADERS=OFF
-DINSTALL_OTHER=OFF -DINSTALL_OTHER=OFF