git: c582239e8a2b - main - graphics/opencv: add makefile options
Tobias C. Berner
tcberner at FreeBSD.org
Sun Jul 18 13:54:05 UTC 2021
The branch main has been updated by tcberner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=c582239e8a2b795fc0a7f51a3463cee9998cfab8
commit c582239e8a2b795fc0a7f51a3463cee9998cfab8
Author: Tobias C. Berner <tcberner at FreeBSD.org>
AuthorDate: 2021-07-18 12:13:52 +0000
Commit: Tobias C. Berner <tcberner at FreeBSD.org>
CommitDate: 2021-07-18 13:52:58 +0000
graphics/opencv: add makefile options
Bring back lot of the options that were available in the old port.
Reported by: Ivan Rozhuk <rozhuk.im at gmail.com>
Original by: alt2600 at icloud.com
VVD <vvd at unislabs.com>
PR: 253110
PR: 255446
---
graphics/opencv/Makefile | 194 ++++++++++++++++-----
.../files/patch-cmake_OpenCVFindLibsGrfmt.cmake | 14 ++
.../patch-modules_imgcodecs_src_grfmt__png.cpp | 11 ++
graphics/opencv/pkg-plist | 139 ++++++++-------
4 files changed, 248 insertions(+), 110 deletions(-)
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index be0b5c5a3ebc..c95dab416273 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -1,5 +1,6 @@
PORTNAME= opencv
DISTVERSION= 4.5.3
+PORTREVISION= 1
CATEGORIES= graphics
MAINTAINER= tcberner at FreeBSD.org
@@ -8,24 +9,13 @@ COMMENT= Open Source Computer Vision library
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers \
- opencl>=0:devel/opencl
-RUN_DEPENDS= opencl>=0:devel/opencl
-LIB_DEPENDS= \
- libOpenEXR.so:graphics/openexr \
- libavcodec.so:multimedia/ffmpeg \
- libfreetype.so:print/freetype2 \
+LIB_DEPENDS= libfreetype.so:print/freetype2 \
libgflags.so:devel/gflags \
libglog.so:devel/glog \
- libgphoto2.so:graphics/libgphoto2 \
libharfbuzz.so:print/harfbuzz \
- libhdf5.so:science/hdf5 \
- libopenblas.so:math/openblas \
- libpng.so:graphics/png \
- libtiff.so:graphics/tiff \
- libwebp.so:graphics/webp
+ libhdf5.so:science/hdf5
-USES= cmake compiler:c++14-lang eigen:3 jpeg localbase:ldflags pkgconfig python:3.6+,build
+USES= cmake compiler:c++14-lang localbase:ldflags pkgconfig
USE_GITHUB= yes
GH_ACCOUNT= WeChatCV:wechat
GH_PROJECT= opencv_contrib:contrib \
@@ -42,54 +32,164 @@ GH_TAGNAME= v0.1.1f:ade \
8afa57abc8229d611c4937165d20e2a2d9fc5a12:face \
a56b6ac6f030c312b2dce17430eef13aed9af274:ippicv
-CMAKE_ON= WITH_EIGEN \
- WITH_GDAL \
- WITH_GDCM \
- WITH_GPHOTO2 \
- WITH_JASPER \
- WITH_JPEG \
- WITH_OPENCL \
- WITH_OPENEXR \
- WITH_OPENGL \
- WITH_PNG \
- WITH_TIFF \
- WITH_VULKAN \
- WITH_WEBP \
- OPENCV_GENERATE_PKGCONFIG \
- OPENCV_ENABLE_NONFREE
-# Disabled during tbb migration: not oneTBB-compatible
-# WITH_TBB
+CMAKE_ON= OPENCV_GENERATE_PKGCONFIG
CMAKE_OFF= OPENCV_GENERATE_SETUPVARS \
BUILD_opencv_python2 \
BUILD_TESTS
-CMAKE_ARGS= -DOPENCV_EXTRA_MODULES_PATH="${WRKSRC}/contrib/modules" \
- -DOPENCV_PYTHON3_INSTALL_PATH=${PYTHON_SITELIBDIR} \
- -DVULKAN_INCLUDE_DIRS=${LOCALBASE}/include
-LDFLAGS+= -lglog
+CMAKE_ARGS= -DOPENCV_EXTRA_MODULES_PATH="${WRKSRC}/contrib/modules"
DATADIR= ${PREFIX}/share/${PORTNAME}4
PLIST_SUB= SHLIB_VER=${DISTVERSION}
-OPTIONS_DEFINE= HARDENING PYTHON JAVA LTO
-OPTIONS_DEFAULT= PYTHON
+OPTIONS_DEFINE= EIGEN GDAL GDCM HARDENING JAVA LTO OPENCL PATENTED PROTOBUF PYTHON TBB VTK
+
+OPTIONS_GROUP= IMAGE VIDEO
+OPTIONS_GROUP_IMAGE= GPHOTO2 JPEG OPENEXR PNG TIFF
+OPTIONS_GROUP_VIDEO= DC1394 FFMPEG GSTREAMER V4L VULKAN WEBP XINE
+
+OPTIONS_SINGLE= BLAS
+OPTIONS_SINGLE_BLAS= ATLAS OPENBLAS NOBLAS
+
+OPTIONS_RADIO= JPEG2K
+OPTIONS_RADIO_JPEG2K= JASPER OPENJPEG
+
+OPTIONS_DEFAULT= EIGEN GDAL GDCM OPENCL PROTOBUF PYTHON \
+ DC1394 GSTREAMER V4L VULKAN WEBP \
+ GPHOTO2 JPEG OPENEXR PNG TIFF \
+ OPENBLAS \
+ OPENJPEG
OPTIONS_SUB= yes
+# Normal options (EIGEN GDAL GDCM HARDENING JAVA LTO OPENCL PATENTED PROTOBUF PYTHON TBB VTK)
+EIGEN_DESC= Add Eigen v3 Support, builds sfm modules
+EIGEN_CMAKE_BOOL= WITH_EIGEN
+EIGEN_USES= eigen:3
+
+GDAL_DESC= Add Geospatial Data Abstraction Library Support
+GDAL_CMAKE_BOOL= WITH_GDAL
+GDAL_LIB_DEPENDS= libgdal.so:graphics/gdal
+
+GDCM_DESC= Add Open source DICOM library Support
+GDCM_CMAKE_BOOL= WITH_GDCM
+GDCM_LIB_DEPENDS= libgdcmMSFF.so:devel/gdcm
+
+HARDENING_DESC= Enables Build Hardening
HARDENING_CMAKE_BOOL= ENABLE_BUILD_HARDENING
-HARDENING_DESC= Enable hardening of the resulting binaries
-JAVA_CMAKE_BOOL= BUILD_JAVA
+JAVA_DESC= Enable Java Support
JAVA_BUILD_DEPENDS= ant:devel/apache-ant
+JAVA_CMAKE_BOOL= BUILD_opencv_java BUILD_opencv_java_bindings_generator BUILD_JAVA
JAVA_MAKE_ENV= JAVACMD=${JAVA}
JAVA_USE= JAVA=yes
-JAVA_VARS= JAVA_BUILD=yes
+LTO_DESC= Enables Link Time Optimizations
+LTO_CMAKE_BOOL= ENABLE_THIN_LTO
+
+OPENCL_DESC= Add OpenCL Support
+OPENCL_CMAKE_BOOL= WITH_OPENCL
+OPENCL_BUILD_DEPENDS= opencl>=0:devel/opencl
+OPENCL_RUN_DEPENDS= opencl>=0:devel/opencl
+
+PATENTED_DESC= Enable patented 2d feature detection USE AT OWN RISK
+PATENTED_CMAKE_BOOL= OPENCV_ENABLE_NONFREE
+
+PROTOBUF_DESC= Enable protobuf support, builds dnn modules
+PROTOBUF_CMAKE_BOOL= WITH_PROTOBUF
+PROTOBUF_LIB_DEPENDS= libprotobuf.so:devel/protobuf
+
+PYTHON_DESC= Enable Python Support 3.6 or greater
PYTHON_BUILD_DEPENDS= ${PYNUMPY}
PYTHON_RUN_DEPENDS= ${PYNUMPY}
PYTHON_USES= python:3.6+
PYTHON_CMAKE_BOOL= BUILD_opencv_python3
+PYTHON_CMAKE_ON= -DOPENCV_PYTHON3_INSTALL_PATH=${PYTHON_SITELIBDIR}
-LTO_CMAKE_BOOL= ENABLE_THIN_LTO
+TBB_DESC= Add Intel Threading Building Blocks Support
+TBB_CMAKE_BOOL= WITH_TBB
+TBB_LIB_DEPENDS= libtbb.so:devel/tbb
+
+VTK_DESC= Include VTK library support (build opencv_viz module)
+VTK_CMAKE_BOOL= WITH_VTK
+VTK_LIB_DEPENDS= libvtkCommonCore-9.0.so:math/vtk9
+###
+
+# IMAGE group options (GPHOTO2 JPEG OPENEXR PNG TIFF)
+GPHOTO2_DESC= Add Gphoto2 Support
+GPHOTO2_CMAKE_BOOL= WITH_GPHOTO2
+GPHOTO2_LIB_DEPENDS= libgphoto2.so:graphics/libgphoto2
+
+JPEG_DESC= Add LibJpeg Support
+JPEG_CMAKE_BOOL= WITH_JPEG
+JPEG_USES= jpeg
+
+OPENEXR_DESC= Add OpenEXR Support
+OPENEXR_CMAKE_BOOL= WITH_OPENEXR
+OPENEXR_LIB_DEPENDS= libOpenEXR.so:graphics/openexr
+
+PNG_DESC= Add LibPNG Support
+PNG_CMAKE_BOOL= WITH_PNG
+PNG_LIB_DEPENDS= libpng16.so:graphics/png
+
+TIFF_DESC= Add LibTIFF Support
+TIFF_CMAKE_BOOL= WITH_TIFF
+TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff
+###
+
+# VIDEO group options (DC1394 FFMPEG GSTREAMER V4L VULKAN WEBP XINE)
+DC1394_DESC= IEEE 1394 camera support
+DC1394_CMAKE_BOOL= WITH_1394
+DC1394_LIB_DEPENDS= libdc1394.so:multimedia/libdc1394
+
+FFMPEG_DESC= Link with ffmpeg, circular dependancy possible
+FFMPEG_CMAKE_BOOL= WITH_FFMPEG
+FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg
+
+GSTREAMER_DESC= Add GSTREAMER Support
+GSTREAMER_CMAKE_BOOL= WITH_GSTREAMER
+GSTREAMER_USE= GSTREAMER1=yes
+
+V4L_DESC= Enable support for Video for Linux
+V4L_CMAKE_BOOL= WITH_V4L WITH_LIBV4L
+V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
+V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l
+
+VULKAN_DESC= Add Vulkan Support
+VULKAN_CMAKE_BOOL= WITH_VULKAN
+VULKAN_CMAKE_ON= -DVULKAN_INCLUDE_DIRS=${LOCALBASE}/include
+VULKAN_BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers
+
+WEBP_DESC= Add Webp Support
+WEBP_CMAKE_BOOL= WITH_WEBP
+WEBP_LIB_DEPENDS= libwebp.so:graphics/webp
+
+XINE_DESC= Add Xine Support
+XINE_CMAKE_BOOL= WITH_XINE
+XINE_LIB_DEPENDS= libxine.so:multimedia/libxine
+###
+
+# BLAS group options (ATLAS OPENBLAS NOBLAS)
+ATLAS_DESC= ATLAS blas implementation with lapacke
+ATLAS_USES= blaslapack:atlas
+ATLAS_LIB_DEPENDS= liblapacke.so:math/lapacke
+
+OPENBLAS_DESC= OpenBLAS blas implementation with lapacke
+OPENBLAS_USES= blaslapack:openblas
+OPENBLAS_LIB_DEPENDS= liblapacke.so:math/lapacke
+
+NOBLAS_DESC= Disable support for lapack/blas
+NOBLAS_CMAKE_BOOL_OFF= WITH_LAPACK
+###
+
+# JPEG2K group options (JASPER OPENJPEG)
+JASPER_DESC= Add Jasper Support for JPEG2000
+JASPER_CMAKE_BOOL= WITH_JASPER
+JASPER_LIB_DEPENDS= libjasper.so:graphics/jasper
+
+OPENJPEG_DESC= Add OpenJPEG Support for JPEG2000, OpenCV preferred
+OPENJPEG_CMAKE_BOOL= WITH_OPENJPEG
+OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg
+###
_IPPICV_i386= ippicv/ippicv_2020_lnx_ia32_20191018_general.tgz
_IPPICV_amd64= ippicv/ippicv_2020_lnx_intel64_20191018_general.tgz
@@ -102,18 +202,22 @@ post-extract:
${MV} ${WRKSRC_ade} ${BUILD_WRKSRC}/3rdparty/ade
# Handle prefetched xfeatures2d
${MKDIR} ${BUILD_WRKSRC}/downloads/xfeatures2d
- cp ${WRKSRC_extra_mod_3rdparty_boost_descr}/* ${BUILD_WRKSRC}/downloads/xfeatures2d
- cp ${WRKSRC_extra_mod_3rdparty_vgg}/* ${BUILD_WRKSRC}/downloads/xfeatures2d
+ ${CP} ${WRKSRC_extra_mod_3rdparty_boost_descr}/* ${BUILD_WRKSRC}/downloads/xfeatures2d
+ ${CP} ${WRKSRC_extra_mod_3rdparty_vgg}/* ${BUILD_WRKSRC}/downloads/xfeatures2d
# Handle prefetched wechat
${MKDIR} ${BUILD_WRKSRC}/downloads/wechat_qrcode
- cp ${WRKSRC_wechat}/* ${BUILD_WRKSRC}/downloads/wechat_qrcode/
+ ${CP} ${WRKSRC_wechat}/* ${BUILD_WRKSRC}/downloads/wechat_qrcode/
# Handle Face
${MKDIR} ${BUILD_WRKSRC}/share/opencv4/testdata/cv/face
- cp ${WRKSRC_face}/* ${BUILD_WRKSRC}/share/opencv4/testdata/cv/face
+ ${CP} ${WRKSRC_face}/* ${BUILD_WRKSRC}/share/opencv4/testdata/cv/face
# Handle ippicv
.if defined(_IPPICV_${ARCH})
${MKDIR} ${BUILD_WRKSRC}/3rdparty/ippicv
(cd ${BUILD_WRKSRC}/3rdparty/ippicv && ${EXTRACT_CMD} -xf ${WRKSRC_ippicv}/${_IPPICV_${ARCH}})
.endif
+post-patch:
+ ${REINPLACE_CMD} -e 's|/usr/lib/atlas-base|${LOCALBASE}/lib|g' ${WRKSRC}/cmake/OpenCVFindAtlas.cmake
+ ${REINPLACE_CMD} -e 's|/usr/include/atlas|${LOCALBASE}/include|g' ${WRKSRC}/cmake/OpenCVFindAtlas.cmake
+
.include <bsd.port.mk>
diff --git a/graphics/opencv/files/patch-cmake_OpenCVFindLibsGrfmt.cmake b/graphics/opencv/files/patch-cmake_OpenCVFindLibsGrfmt.cmake
new file mode 100644
index 000000000000..9caf5aaf55e3
--- /dev/null
+++ b/graphics/opencv/files/patch-cmake_OpenCVFindLibsGrfmt.cmake
@@ -0,0 +1,14 @@
+--- cmake/OpenCVFindLibsGrfmt.cmake.orig 2021-07-18 11:13:32 UTC
++++ cmake/OpenCVFindLibsGrfmt.cmake
+@@ -228,9 +228,9 @@ if(WITH_PNG)
+ include(FindPNG)
+ if(PNG_FOUND)
+ include(CheckIncludeFile)
+- check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H)
++ check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng16/png.h" HAVE_LIBPNG_PNG_H)
+ if(HAVE_LIBPNG_PNG_H)
+- ocv_parse_header("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" PNG_VERSION_LINES PNG_LIBPNG_VER_MAJOR PNG_LIBPNG_VER_MINOR PNG_LIBPNG_VER_RELEASE)
++ ocv_parse_header("${PNG_PNG_INCLUDE_DIR}/libpng16/png.h" PNG_VERSION_LINES PNG_LIBPNG_VER_MAJOR PNG_LIBPNG_VER_MINOR PNG_LIBPNG_VER_RELEASE)
+ else()
+ ocv_parse_header("${PNG_PNG_INCLUDE_DIR}/png.h" PNG_VERSION_LINES PNG_LIBPNG_VER_MAJOR PNG_LIBPNG_VER_MINOR PNG_LIBPNG_VER_RELEASE)
+ endif()
diff --git a/graphics/opencv/files/patch-modules_imgcodecs_src_grfmt__png.cpp b/graphics/opencv/files/patch-modules_imgcodecs_src_grfmt__png.cpp
new file mode 100644
index 000000000000..1ded70237237
--- /dev/null
+++ b/graphics/opencv/files/patch-modules_imgcodecs_src_grfmt__png.cpp
@@ -0,0 +1,11 @@
+--- modules/imgcodecs/src/grfmt_png.cpp.orig 2021-07-18 11:13:32 UTC
++++ modules/imgcodecs/src/grfmt_png.cpp
+@@ -59,7 +59,7 @@
+ #endif
+
+ #ifdef HAVE_LIBPNG_PNG_H
+-#include <libpng/png.h>
++#include <libpng16/png.h>
+ #else
+ #include <png.h>
+ #endif
diff --git a/graphics/opencv/pkg-plist b/graphics/opencv/pkg-plist
index 61bcc7208f5e..f77932ada3c1 100644
--- a/graphics/opencv/pkg-plist
+++ b/graphics/opencv/pkg-plist
@@ -1,14 +1,14 @@
bin/opencv_annotation
bin/opencv_interactive-calibration
-bin/opencv_model_diagnostics
+%%PROTOBUF%%bin/opencv_model_diagnostics
bin/opencv_version
bin/opencv_visualisation
bin/opencv_waldboost_detector
-include/opencv4/opencv2/alphamat.hpp
+%%EIGEN%%include/opencv4/opencv2/alphamat.hpp
include/opencv4/opencv2/aruco.hpp
include/opencv4/opencv2/aruco/charuco.hpp
include/opencv4/opencv2/aruco/dictionary.hpp
-include/opencv4/opencv2/barcode.hpp
+%%PROTOBUF%%include/opencv4/opencv2/barcode.hpp
include/opencv4/opencv2/bgsegm.hpp
include/opencv4/opencv2/bioinspired.hpp
include/opencv4/opencv2/bioinspired/bioinspired.hpp
@@ -149,7 +149,7 @@ include/opencv4/opencv2/core/utils/trace.hpp
include/opencv4/opencv2/core/va_intel.hpp
include/opencv4/opencv2/core/version.hpp
include/opencv4/opencv2/core/vsx_utils.hpp
-include/opencv4/opencv2/core_detect.hpp
+%%PROTOBUF%%include/opencv4/opencv2/core_detect.hpp
include/opencv4/opencv2/cvconfig.h
include/opencv4/opencv2/datasets/ar_hmdb.hpp
include/opencv4/opencv2/datasets/ar_sports.hpp
@@ -183,17 +183,17 @@ include/opencv4/opencv2/datasets/tr_svt.hpp
include/opencv4/opencv2/datasets/track_alov.hpp
include/opencv4/opencv2/datasets/track_vot.hpp
include/opencv4/opencv2/datasets/util.hpp
-include/opencv4/opencv2/dnn.hpp
-include/opencv4/opencv2/dnn/all_layers.hpp
-include/opencv4/opencv2/dnn/dict.hpp
-include/opencv4/opencv2/dnn/dnn.hpp
-include/opencv4/opencv2/dnn/dnn.inl.hpp
-include/opencv4/opencv2/dnn/layer.details.hpp
-include/opencv4/opencv2/dnn/layer.hpp
-include/opencv4/opencv2/dnn/shape_utils.hpp
-include/opencv4/opencv2/dnn/utils/inference_engine.hpp
-include/opencv4/opencv2/dnn/version.hpp
-include/opencv4/opencv2/dnn_superres.hpp
+%%PROTOBUF%%include/opencv4/opencv2/dnn.hpp
+%%PROTOBUF%%include/opencv4/opencv2/dnn/all_layers.hpp
+%%PROTOBUF%%include/opencv4/opencv2/dnn/dict.hpp
+%%PROTOBUF%%include/opencv4/opencv2/dnn/dnn.hpp
+%%PROTOBUF%%include/opencv4/opencv2/dnn/dnn.inl.hpp
+%%PROTOBUF%%include/opencv4/opencv2/dnn/layer.details.hpp
+%%PROTOBUF%%include/opencv4/opencv2/dnn/layer.hpp
+%%PROTOBUF%%include/opencv4/opencv2/dnn/shape_utils.hpp
+%%PROTOBUF%%include/opencv4/opencv2/dnn/utils/inference_engine.hpp
+%%PROTOBUF%%include/opencv4/opencv2/dnn/version.hpp
+%%PROTOBUF%%include/opencv4/opencv2/dnn_superres.hpp
include/opencv4/opencv2/dpm.hpp
include/opencv4/opencv2/face.hpp
include/opencv4/opencv2/face/bif.hpp
@@ -364,10 +364,10 @@ include/opencv4/opencv2/imgproc/types_c.h
include/opencv4/opencv2/intensity_transform.hpp
include/opencv4/opencv2/line_descriptor.hpp
include/opencv4/opencv2/line_descriptor/descriptor.hpp
-include/opencv4/opencv2/mcc.hpp
-include/opencv4/opencv2/mcc/ccm.hpp
-include/opencv4/opencv2/mcc/checker_detector.hpp
-include/opencv4/opencv2/mcc/checker_model.hpp
+%%PROTOBUF%%include/opencv4/opencv2/mcc.hpp
+%%PROTOBUF%%include/opencv4/opencv2/mcc/ccm.hpp
+%%PROTOBUF%%include/opencv4/opencv2/mcc/checker_detector.hpp
+%%PROTOBUF%%include/opencv4/opencv2/mcc/checker_model.hpp
include/opencv4/opencv2/ml.hpp
include/opencv4/opencv2/ml/ml.hpp
include/opencv4/opencv2/ml/ml.inl.hpp
@@ -422,16 +422,16 @@ include/opencv4/opencv2/rgbd/volume.hpp
include/opencv4/opencv2/saliency.hpp
include/opencv4/opencv2/saliency/saliencyBaseClasses.hpp
include/opencv4/opencv2/saliency/saliencySpecializedClasses.hpp
-include/opencv4/opencv2/sfm.hpp
-include/opencv4/opencv2/sfm/conditioning.hpp
-include/opencv4/opencv2/sfm/fundamental.hpp
-include/opencv4/opencv2/sfm/io.hpp
-include/opencv4/opencv2/sfm/numeric.hpp
-include/opencv4/opencv2/sfm/projection.hpp
-include/opencv4/opencv2/sfm/reconstruct.hpp
-include/opencv4/opencv2/sfm/robust.hpp
-include/opencv4/opencv2/sfm/simple_pipeline.hpp
-include/opencv4/opencv2/sfm/triangulation.hpp
+%%EIGEN%%include/opencv4/opencv2/sfm.hpp
+%%EIGEN%%include/opencv4/opencv2/sfm/conditioning.hpp
+%%EIGEN%%include/opencv4/opencv2/sfm/fundamental.hpp
+%%EIGEN%%include/opencv4/opencv2/sfm/io.hpp
+%%EIGEN%%include/opencv4/opencv2/sfm/numeric.hpp
+%%EIGEN%%include/opencv4/opencv2/sfm/projection.hpp
+%%EIGEN%%include/opencv4/opencv2/sfm/reconstruct.hpp
+%%EIGEN%%include/opencv4/opencv2/sfm/robust.hpp
+%%EIGEN%%include/opencv4/opencv2/sfm/simple_pipeline.hpp
+%%EIGEN%%include/opencv4/opencv2/sfm/triangulation.hpp
include/opencv4/opencv2/shape.hpp
include/opencv4/opencv2/shape/emdL1.hpp
include/opencv4/opencv2/shape/hist_cost.hpp
@@ -468,11 +468,11 @@ include/opencv4/opencv2/surface_matching/pose_3d.hpp
include/opencv4/opencv2/surface_matching/ppf_helpers.hpp
include/opencv4/opencv2/surface_matching/ppf_match_3d.hpp
include/opencv4/opencv2/surface_matching/t_hash_int.hpp
-include/opencv4/opencv2/text.hpp
-include/opencv4/opencv2/text/erfilter.hpp
-include/opencv4/opencv2/text/ocr.hpp
-include/opencv4/opencv2/text/swt_text_detection.hpp
-include/opencv4/opencv2/text/textDetector.hpp
+%%PROTOBUF%%include/opencv4/opencv2/text.hpp
+%%PROTOBUF%%include/opencv4/opencv2/text/erfilter.hpp
+%%PROTOBUF%%include/opencv4/opencv2/text/ocr.hpp
+%%PROTOBUF%%include/opencv4/opencv2/text/swt_text_detection.hpp
+%%PROTOBUF%%include/opencv4/opencv2/text/textDetector.hpp
include/opencv4/opencv2/tracking.hpp
include/opencv4/opencv2/tracking/feature.hpp
include/opencv4/opencv2/tracking/kalman_filters.hpp
@@ -509,7 +509,13 @@ include/opencv4/opencv2/videostab/outlier_rejection.hpp
include/opencv4/opencv2/videostab/ring_buffer.hpp
include/opencv4/opencv2/videostab/stabilizer.hpp
include/opencv4/opencv2/videostab/wobble_suppression.hpp
-include/opencv4/opencv2/wechat_qrcode.hpp
+%%VTK%%include/opencv4/opencv2/viz.hpp
+%%VTK%%include/opencv4/opencv2/viz/types.hpp
+%%VTK%%include/opencv4/opencv2/viz/viz3d.hpp
+%%VTK%%include/opencv4/opencv2/viz/vizcore.hpp
+%%VTK%%include/opencv4/opencv2/viz/widget_accessor.hpp
+%%VTK%%include/opencv4/opencv2/viz/widgets.hpp
+%%PROTOBUF%%include/opencv4/opencv2/wechat_qrcode.hpp
include/opencv4/opencv2/xfeatures2d.hpp
include/opencv4/opencv2/xfeatures2d/cuda.hpp
include/opencv4/opencv2/xfeatures2d/nonfree.hpp
@@ -545,22 +551,19 @@ include/opencv4/opencv2/xphoto/inpainting.hpp
include/opencv4/opencv2/xphoto/oilpainting.hpp
include/opencv4/opencv2/xphoto/tonemap.hpp
include/opencv4/opencv2/xphoto/white_balance.hpp
-lib/libopencv_wechat_qrcode.so
-lib/libopencv_wechat_qrcode.so.%%SHLIB_VER%%
-lib/libopencv_wechat_qrcode.so.4.5
lib/cmake/opencv4/OpenCVConfig-version.cmake
lib/cmake/opencv4/OpenCVConfig.cmake
lib/cmake/opencv4/OpenCVModules-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/opencv4/OpenCVModules.cmake
-lib/libopencv_alphamat.so
-lib/libopencv_alphamat.so.4.5
-lib/libopencv_alphamat.so.%%SHLIB_VER%%
+%%EIGEN%%lib/libopencv_alphamat.so
+%%EIGEN%%lib/libopencv_alphamat.so.4.5
+%%EIGEN%%lib/libopencv_alphamat.so.%%SHLIB_VER%%
lib/libopencv_aruco.so
lib/libopencv_aruco.so.4.5
lib/libopencv_aruco.so.%%SHLIB_VER%%
-lib/libopencv_barcode.so
-lib/libopencv_barcode.so.4.5
-lib/libopencv_barcode.so.%%SHLIB_VER%%
+%%PROTOBUF%%lib/libopencv_barcode.so
+%%PROTOBUF%%lib/libopencv_barcode.so.4.5
+%%PROTOBUF%%lib/libopencv_barcode.so.%%SHLIB_VER%%
lib/libopencv_bgsegm.so
lib/libopencv_bgsegm.so.4.5
lib/libopencv_bgsegm.so.%%SHLIB_VER%%
@@ -579,15 +582,15 @@ lib/libopencv_core.so.%%SHLIB_VER%%
lib/libopencv_datasets.so
lib/libopencv_datasets.so.4.5
lib/libopencv_datasets.so.%%SHLIB_VER%%
-lib/libopencv_dnn.so
-lib/libopencv_dnn.so.4.5
-lib/libopencv_dnn.so.%%SHLIB_VER%%
-lib/libopencv_dnn_objdetect.so
-lib/libopencv_dnn_objdetect.so.4.5
-lib/libopencv_dnn_objdetect.so.%%SHLIB_VER%%
-lib/libopencv_dnn_superres.so
-lib/libopencv_dnn_superres.so.4.5
-lib/libopencv_dnn_superres.so.%%SHLIB_VER%%
+%%PROTOBUF%%lib/libopencv_dnn.so
+%%PROTOBUF%%lib/libopencv_dnn.so.4.5
+%%PROTOBUF%%lib/libopencv_dnn.so.%%SHLIB_VER%%
+%%PROTOBUF%%lib/libopencv_dnn_objdetect.so
+%%PROTOBUF%%lib/libopencv_dnn_objdetect.so.4.5
+%%PROTOBUF%%lib/libopencv_dnn_objdetect.so.%%SHLIB_VER%%
+%%PROTOBUF%%lib/libopencv_dnn_superres.so
+%%PROTOBUF%%lib/libopencv_dnn_superres.so.4.5
+%%PROTOBUF%%lib/libopencv_dnn_superres.so.%%SHLIB_VER%%
lib/libopencv_dpm.so
lib/libopencv_dpm.so.4.5
lib/libopencv_dpm.so.%%SHLIB_VER%%
@@ -633,9 +636,9 @@ lib/libopencv_intensity_transform.so.%%SHLIB_VER%%
lib/libopencv_line_descriptor.so
lib/libopencv_line_descriptor.so.4.5
lib/libopencv_line_descriptor.so.%%SHLIB_VER%%
-lib/libopencv_mcc.so
-lib/libopencv_mcc.so.4.5
-lib/libopencv_mcc.so.%%SHLIB_VER%%
+%%PROTOBUF%%lib/libopencv_mcc.so
+%%PROTOBUF%%lib/libopencv_mcc.so.4.5
+%%PROTOBUF%%lib/libopencv_mcc.so.%%SHLIB_VER%%
lib/libopencv_ml.so
lib/libopencv_ml.so.4.5
lib/libopencv_ml.so.%%SHLIB_VER%%
@@ -669,9 +672,9 @@ lib/libopencv_rgbd.so.%%SHLIB_VER%%
lib/libopencv_saliency.so
lib/libopencv_saliency.so.4.5
lib/libopencv_saliency.so.%%SHLIB_VER%%
-lib/libopencv_sfm.so
-lib/libopencv_sfm.so.4.5
-lib/libopencv_sfm.so.%%SHLIB_VER%%
+%%EIGEN%%lib/libopencv_sfm.so
+%%EIGEN%%lib/libopencv_sfm.so.4.5
+%%EIGEN%%lib/libopencv_sfm.so.%%SHLIB_VER%%
lib/libopencv_shape.so
lib/libopencv_shape.so.4.5
lib/libopencv_shape.so.%%SHLIB_VER%%
@@ -690,9 +693,9 @@ lib/libopencv_superres.so.%%SHLIB_VER%%
lib/libopencv_surface_matching.so
lib/libopencv_surface_matching.so.4.5
lib/libopencv_surface_matching.so.%%SHLIB_VER%%
-lib/libopencv_text.so
-lib/libopencv_text.so.4.5
-lib/libopencv_text.so.%%SHLIB_VER%%
+%%PROTOBUF%%lib/libopencv_text.so
+%%PROTOBUF%%lib/libopencv_text.so.4.5
+%%PROTOBUF%%lib/libopencv_text.so.%%SHLIB_VER%%
lib/libopencv_tracking.so
lib/libopencv_tracking.so.4.5
lib/libopencv_tracking.so.%%SHLIB_VER%%
@@ -705,6 +708,12 @@ lib/libopencv_videoio.so.%%SHLIB_VER%%
lib/libopencv_videostab.so
lib/libopencv_videostab.so.4.5
lib/libopencv_videostab.so.%%SHLIB_VER%%
+%%VTK%%lib/libopencv_viz.so
+%%VTK%%lib/libopencv_viz.so.4.5
+%%VTK%%lib/libopencv_viz.so.%%SHLIB_VER%%
+%%PROTOBUF%%lib/libopencv_wechat_qrcode.so
+%%PROTOBUF%%lib/libopencv_wechat_qrcode.so.%%SHLIB_VER%%
+%%PROTOBUF%%lib/libopencv_wechat_qrcode.so.4.5
lib/libopencv_xfeatures2d.so
lib/libopencv_xfeatures2d.so.4.5
lib/libopencv_xfeatures2d.so.%%SHLIB_VER%%
@@ -717,9 +726,9 @@ lib/libopencv_xobjdetect.so.%%SHLIB_VER%%
lib/libopencv_xphoto.so
lib/libopencv_xphoto.so.4.5
lib/libopencv_xphoto.so.%%SHLIB_VER%%
-lib/opencv4/3rdparty/libcorrespondence.a
-lib/opencv4/3rdparty/libmultiview.a
-lib/opencv4/3rdparty/libnumeric.a
+%%EIGEN%%lib/opencv4/3rdparty/libcorrespondence.a
+%%EIGEN%%lib/opencv4/3rdparty/libmultiview.a
+%%EIGEN%%lib/opencv4/3rdparty/libnumeric.a
libdata/pkgconfig/opencv4.pc
%%DATADIR%%/haarcascades/haarcascade_eye.xml
%%DATADIR%%/haarcascades/haarcascade_eye_tree_eyeglasses.xml
More information about the dev-commits-ports-all
mailing list