View | Details | Raw Unified | Return to bug 253110 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-46 / +171 lines)
Lines 1-8 Link Here
1
# $FreeBSD: head/graphics/opencv/Makefile 565123 2021-02-13 11:08:29Z mandree $
1
# $FreeBSD: head/graphics/opencv/Makefile 563430 2021-01-30 18:08:56Z tcberner $
2
2
3
PORTNAME=	opencv
3
PORTNAME=	opencv
4
DISTVERSION=	4.5.1
4
DISTVERSION=	4.5.1
5
PORTREVISION=	1
5
PORTREVISION=	2
6
CATEGORIES=	graphics
6
CATEGORIES=	graphics
7
7
8
MAINTAINER=	tcberner@FreeBSD.org
8
MAINTAINER=	tcberner@FreeBSD.org
Lines 11-94 Link Here
11
LICENSE=	BSD3CLAUSE
11
LICENSE=	BSD3CLAUSE
12
LICENSE_FILE=	${WRKSRC}/LICENSE
12
LICENSE_FILE=	${WRKSRC}/LICENSE
13
13
14
BUILD_DEPENDS=	vulkan-headers>0:graphics/vulkan-headers \
15
		opencl>=0:devel/opencl
16
RUN_DEPENDS=	opencl>=0:devel/opencl
17
LIB_DEPENDS=	\
14
LIB_DEPENDS=	\
18
		libIlmImf.so:graphics/openexr \
19
		libavcodec.so:multimedia/ffmpeg \
20
		libfreetype.so:print/freetype2 \
15
		libfreetype.so:print/freetype2 \
21
		libgflags.so:devel/gflags \
16
		libgflags.so:devel/gflags \
22
		libglog.so:devel/glog \
17
		libglog.so:devel/glog \
23
		libgphoto2.so:graphics/libgphoto2 \
24
		libharfbuzz.so:print/harfbuzz \
18
		libharfbuzz.so:print/harfbuzz \
25
		libhdf5.so:science/hdf5 \
19
		libhdf5.so:science/hdf5
26
		libopenblas.so:math/openblas \
27
		libpng16.so:graphics/png \
28
		libtbb.so:devel/tbb \
29
		libtiff.so:graphics/tiff \
30
		libwebp.so:graphics/webp \
31
20
32
USES=		cmake compiler:c++14-lang eigen:3 jpeg localbase:ldflags pkgconfig python:3.6+,build
21
22
USES=		cmake compiler:c++14-lang localbase:ldflags pkgconfig python:3.6+,build
33
USE_GITHUB=	yes
23
USE_GITHUB=	yes
34
GH_PROJECT=	opencv_contrib:contrib \
24
GH_PROJECT=	opencv_contrib:contrib \
35
		ade:ade \
25
		ade:ade \
36
		opencv_3rdparty:extra_mod_3rdparty_boost_descr \
26
		opencv_3rdparty:extra_mod_3rdparty_boost_descr \
37
		opencv_3rdparty:extra_mod_3rdparty_vgg_descr
27
		opencv_3rdparty:extra_mod_3rdparty_vgg_descr \
28
		opencv_3rdparty:extra_mod_3rdparty_face_alignment_dat
38
GH_TAGNAME=	v0.1.1f:ade \
29
GH_TAGNAME=	v0.1.1f:ade \
39
		34e4206aef44d50e6bbcd0ab06354b52e7466d26:extra_mod_3rdparty_boost_descr \
30
		34e4206aef44d50e6bbcd0ab06354b52e7466d26:extra_mod_3rdparty_boost_descr \
40
		fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d:extra_mod_3rdparty_vgg_descr
31
		fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d:extra_mod_3rdparty_vgg_descr \
32
		8afa57abc8229d611c4937165d20e2a2d9fc5a12:extra_mod_3rdparty_face_alignment_dat
41
33
42
CMAKE_ON=	\
34
43
		WITH_EIGEN  \
35
CMAKE_ON=	ENABLE_CONFIG_VERIFICATION \
44
		WITH_GDAL \
36
		OPENCV_GENERATE_PKGCONFIG
45
		WITH_GDCM \
37
46
		WITH_GPHOTO2 \
47
		WITH_JASPER \
48
		WITH_JPEG \
49
		WITH_OPENCL \
50
		WITH_OPENEXR \
51
		WITH_OPENGL \
52
		WITH_PNG \
53
		WITH_TBB \
54
		WITH_TIFF \
55
		WITH_VULKAN \
56
		WITH_WEBP \
57
		OPENCV_GENERATE_PKGCONFIG \
58
		OPENCV_ENABLE_NONFREE
59
CMAKE_OFF=	OPENCV_GENERATE_SETUPVARS \
38
CMAKE_OFF=	OPENCV_GENERATE_SETUPVARS \
60
		BUILD_opencv_python2 \
39
		BUILD_opencv_python2 \
61
		BUILD_TESTS
40
		BUILD_ZLIB \
41
		BUILD_TIFF \
42
		BUILD_JASPER \
43
		BUILD_JPEG \
44
		BUILD_PNG \
45
		BUILD_OPENEXR \
46
		BUILD_WEBP \
47
		BUILD_TBB \
48
		BUILD_IPP_IW \
49
		BUILD_ITT \
50
		BUILD_TESTS \
51
		ENABLE_CCACHE \
52
		ENABLE_PRECOMPILED_HEADERS \
53
		WITH_AVFOUNDATION \
54
		WITH_CAP_IOS \
55
		WITH_CAROTENE \
56
		WITH_CPUFEATURES \
57
		WITH_VTK \
58
		WITH_CUDA \
59
		WITH_CUFFT \
60
		WITH_CUBLAS \
61
		WITH_CUDNN \
62
		WITH_NVCUVID \
63
		WITH_GTK \
64
		WITH_GTK_2_X \
65
		WITH_IPP \
66
		WITH_HALIDE \
67
		WITH_INF_ENGINE \
68
		WITH_NGRAPH \
69
		WITH_OPENGL \
70
		WITH_OPENVX \
71
		WITH_OPENNI \
72
		WITH_OPENNI2 \
73
		WITH_PVAPI \
74
		WITH_ARAVIS \
75
		WITH_QT \
76
		WITH_HPX \
77
		WITH_OPENMP \
78
		WITH_DSHOW \
79
		WITH_MSMF \
80
		WITH_MSMF_DXVA \
81
		WITH_XIMEA \
82
		WITH_UEYE \
83
		WITH_CLP \
84
		WITH_OPENCL_SVM \
85
		WITH_OPENCLAMDFFT \
86
		WITH_OPENCLAMDBLAS \
87
		WITH_DIRECTX \
88
		WITH_OPENCL_D3D11_NV \
89
		WITH_LIBREALSENSE \
90
		WITH_VA \
91
		WITH_VA_INTEL \
92
		WITH_MFX \
93
		WITH_ITT \
94
		WITH_ANDROID_MEDIANDK \
95
		WITH_TENGINE \
96
		WITH_ONNX
97
		
62
CMAKE_ARGS=	-DOPENCV_EXTRA_MODULES_PATH="${WRKSRC}/contrib/modules" \
98
CMAKE_ARGS=	-DOPENCV_EXTRA_MODULES_PATH="${WRKSRC}/contrib/modules" \
63
		-DOPENCV_PYTHON3_INSTALL_PATH=${PYTHON_SITELIBDIR} \
99
		-DOPENCV_PYTHON3_INSTALL_PATH=${PYTHON_SITELIBDIR} \
64
		-DVULKAN_INCLUDE_DIRS=${LOCALBASE}/include
100
		-DVULKAN_INCLUDE_DIRS=${LOCALBASE}/include
65
101
66
DATADIR=	${PREFIX}/share/${PORTNAME}4
102
DATADIR=	${PREFIX}/share/${PORTNAME}4
67
103
68
OPTIONS_DEFINE=		HARDENING PYTHON JAVA LTO
104
OPTIONS_DEFINE=		PYTHON JAVA EIGEN GDAL GDCM OPENCL TBB PATENTED PROTOBUF HARDENING LTO
69
OPTIONS_DEFAULT=	PYTHON
70
OPTIONS_SUB=		yes
105
OPTIONS_SUB=		yes
106
OPTIONS_DEFAULT=	PYTHON OPENBLAS DC1394 EIGEN GDAL GPHOTO2 OPENJPEG JPEG OPENCL OPENEXR PNG TIFF VULKAN WEBP V4L PROTOBUF GSTREAMER GDCM XINE
107
OPTIONS_GROUP=		VIDEO IMAGEPROC
108
OPTIONS_GROUP_VIDEO=	DC1394 VULKAN WEBP FFMPEG V4L GSTREAMER XINE
109
OPTIONS_GROUP_IMAGEPROC=GPHOTO2 JPEG OPENEXR PNG TIFF
110
OPTIONS_SINGLE=		BLAS
111
OPTIONS_SINGLE_BLAS=	ATLAS OPENBLAS NOBLAS
112
OPTIONS_RADIO=		JPEG2K
113
OPTIONS_RADIO_JPEG2K=	JASPER OPENJPEG
71
114
72
HARDENING_CMAKE_BOOL=	ENABLE_BUILD_HARDENING
115
ATLAS_DESC=         	ATLAS blas implementation with lapacke
73
HARDENING_DESC=		Enable hardening of the resulting binaries
116
ATLAS_LIB_DEPENDS=	libatlas.so:math/atlas \
117
			liblapacke.so:math/lapacke
74
118
75
JAVA_CMAKE_BOOL=	BUILD_openv_java
119
OPENBLAS_DESC=		OpenBLAS blas implementation with lapacke
76
JAVA_BUILD_DEPENDS=	ant:devel/apache-ant
120
OPENBLAS_LIB_DEPENDS=	libopenblas.so:math/openblas \
121
			liblapacke.so:math/lapacke
77
122
123
NOBLAS_DESC=		Disable support for lapack/blas
124
NOBLAS_CMAKE_ON=	-DWITH_LAPACK:BOOL=FALSE
125
126
DC1394_DESC=		IEEE 1394 camera support
127
DC1394_CMAKE_BOOL=	WITH_1394
128
DC1394_LIB_DEPENDS=	libdc1394.so:multimedia/libdc1394
129
EIGEN_DESC=		Add Eigen v3 Support, builds sfm modules
130
EIGEN_CMAKE_BOOL=	WITH_EIGEN
131
EIGEN_USES=		eigen:3
132
GDAL_DESC=		Add Geospatial Data Abstraction Library Support
133
GDAL_CMAKE_BOOL=	WITH_GDAL
134
GDAL_LIB_DEPENDS=	libgdal.so:graphics/gdal
135
GDCM_DESC=		Add Open source DICOM library Support
136
GDCM_CMAKE_BOOL=	WITH_GDCM
137
GDCM_LIB_DEPENDS=	libgdcmMSFF.so:devel/gdcm
138
GPHOTO2_DESC=		Add Gphoto2 Support
139
GPHOTO2_CMAKE_BOOL=	WITH_GPHOTO2
140
GPHOTO2_LIB_DEPENDS=	libgphoto2.so:graphics/libgphoto2
141
JASPER_DESC=		Add Jasper Support for JPEG2000
142
JASPER_CMAKE_BOOL=	WITH_JASPER
143
JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
144
OPENJPEG_DESC=		Add OpenJPEG Support for JPEG2000, OpenCV preferred
145
OPENJPEG_CMAKE_BOOL=	WITH_OPENJPEG
146
OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
147
JPEG_DESC=		Add LibJpeg Support
148
JPEG_CMAKE_BOOL=	WITH_JPEG
149
JPEG_USES=		jpeg 
150
OPENCL_DESC=		Add OpenCL Support
151
OPENCL_CMAKE_BOOL=	WITH_OPENCL
152
OPENCL_BUILD_DEPENDS=	opencl>=0:devel/opencl
153
OPENCL_RUN_DEPENDS=	opencl>=0:devel/opencl
154
OPENEXR_DESC=		Add OpenEXR Support
155
OPENEXR_CMAKE_BOOL=	WITH_OPENEXR
156
OPENEXR_LIB_DEPENDS=	libIlmImf.so:graphics/openexr
157
PNG_DESC=		Add LibPNG Support
158
PNG_CMAKE_BOOL=		WITH_PNG
159
PNG_LIB_DEPENDS=	libpng16.so:graphics/png
160
TBB_DESC=		Add Intel Threading Building Blocks Support
161
TBB_CMAKE_BOOL=		WITH_TBB
162
TBB_LIB_DEPENDS=	libtbb.so:devel/tbb
163
TIFF_DESC=		Add LibTIFF Support
164
TIFF_CMAKE_BOOL=	WITH_TIFF
165
TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
166
VULKAN_DESC=		Add Vulkan Support
167
VULKAN_CMAKE_BOOL=	WITH_VULKAN
168
VULKAN_BUILD_DEPENDS=	vulkan-headers>0:graphics/vulkan-headers
169
GSTREAMER_DESC=		Add GSTREAMER Support
170
GSTREAMER_CMAKE_BOOL=	WITH_GSTREAMER
171
GSTREAMER_USE=		GSTREAMER1=yes
172
WEBP_DESC=		Add Webp Support
173
WEBP_CMAKE_BOOL=	WITH_WEBP
174
WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
175
PATENTED_DESC=		Enable patented 2d feature detection USE AT OWN RISK
176
PATENTED_CMAKE_BOOL=	OPENCV_ENABLE_NONFREE
177
FFMPEG_DESC=		Link with ffmpeg, circular dependancy possible
178
FFMPEG_CMAKE_BOOL=	WITH_FFMPEG
179
FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
180
V4L_DESC=		Enable support for Video for Linux
181
V4L_CMAKE_BOOL=		WITH_V4L WITH_LIBV4L
182
V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
183
V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
184
PROTOBUF_DESC=		Enable protobuf support, builds dnn modules
185
PROTOBUF_CMAKE_BOOL=	WITH_PROTOBUF
186
PROTOBUF_LIB_DEPENDS=	libprotobuf.so:devel/protobuf
187
XINE_DESC=		Add Xine Support
188
XINE_CMAKE_BOOL=	WITH_XINE
189
XINE_LIB_DEPENDS=	libxine.so:multimedia/libxine
190
JAVA_DESC=		Enable Java Support
191
JAVA_CMAKE_BOOL=	BUILD_opencv_java BUILD_opencv_java_bindings_generator BUILD_JAVA 
192
JAVA_BUILD_DEPENDS=	ant:devel/apache-ant
193
PYTHON_DESC=		Enable Python Support 3.6 or greater
78
PYTHON_BUILD_DEPENDS=	${PYNUMPY}
194
PYTHON_BUILD_DEPENDS=	${PYNUMPY}
79
PYTHON_RUN_DEPENDS=	${PYNUMPY}
195
PYTHON_RUN_DEPENDS=	${PYNUMPY}
80
PYTHON_USES=		python:3.6+
196
PYTHON_USES=		python:3.6+
81
PYTHON_USE_PYTHON=	noflavors
197
PYTHON_USE_PYTHON=	noflavors
82
PYTHON_CMAKE_BOOL=	BUILD_opencv_python3
198
PYTHON_CMAKE_BOOL=	BUILD_opencv_python3
83
199
HARDENING_DESC=		Enables Build Hardening
200
HARDENING_CMAKE_BOOL=	ENABLE_BUILD_HARDENING
201
LTO_DESC=		Enables Link Time Optimizations
84
LTO_CMAKE_BOOL=		ENABLE_THIN_LTO
202
LTO_CMAKE_BOOL=		ENABLE_THIN_LTO
85
203
204
86
post-extract:
205
post-extract:
87
	${MV} ${WRKSRC_contrib} ${WRKSRC}/contrib
206
	${MV} ${WRKSRC_contrib} ${WRKSRC}/contrib
88
	${MKDIR} ${BUILD_WRKSRC}/3rdparty/ade
207
	${MKDIR} ${BUILD_WRKSRC}/3rdparty/ade
89
	${MV} ${WRKSRC_ade} ${BUILD_WRKSRC}/3rdparty/ade
208
	${MV} ${WRKSRC_ade} ${BUILD_WRKSRC}/3rdparty/ade
90
	${MKDIR} ${WRKSRC}/contrib/modules/xfeatures2d/src
209
	${MKDIR} ${BUILD_WRKSRC}/downloads/xfeatures2d
91
	${MV} ${WRKSRC_extra_mod_3rdparty_boost_descr}/* ${WRKSRC}/contrib/modules/xfeatures2d/src
210
	${MV} ${WRKSRC_extra_mod_3rdparty_boost_descr}/* ${BUILD_WRKSRC}/downloads/xfeatures2d
92
	${MV} ${WRKSRC_extra_mod_3rdparty_vgg_descr}/* ${WRKSRC}/contrib/modules/xfeatures2d/src
211
	${MV} ${WRKSRC_extra_mod_3rdparty_vgg_descr}/* ${BUILD_WRKSRC}/downloads/xfeatures2d
93
212
	${MKDIR} ${BUILD_WRKSRC}/share/opencv4/testdata/cv/face
213
	${MV} ${WRKSRC_extra_mod_3rdparty_face_alignment_dat}/* ${BUILD_WRKSRC}/share/opencv4/testdata/cv/face
214
post-patch:
215
	${REINPLACE_CMD} -e 's|/usr/lib/atlas-base|${LOCALBASE}/lib|g' ${WRKSRC}/cmake/OpenCVFindAtlas.cmake
216
	${REINPLACE_CMD} -e 's|/usr/include/atlas|${LOCALBASE}/include|g' ${WRKSRC}/cmake/OpenCVFindAtlas.cmake
217
	${REINPLACE_CMD} -e 's|/libpng/png.h|/libpng16/png.h|g' ${WRKSRC}/cmake/OpenCVFindLibsGrfmt.cmake
218
	${REINPLACE_CMD} -e 's|<libpng/png.h>|<libpng16/png.h>|g' ${WRKSRC}/modules/imgcodecs/src/grfmt_png.cpp
94
.include <bsd.port.mk>
219
.include <bsd.port.mk>
(-)distinfo (-1 / +3 lines)
Lines 1-4 Link Here
1
TIMESTAMP = 1612010514
1
TIMESTAMP = 1612384781
2
SHA256 (opencv-opencv-4.5.1_GH0.tar.gz) = e27fe5b168918ab60d58d7ace2bd82dd14a4d0bd1d3ae182952c2113f5637513
2
SHA256 (opencv-opencv-4.5.1_GH0.tar.gz) = e27fe5b168918ab60d58d7ace2bd82dd14a4d0bd1d3ae182952c2113f5637513
3
SIZE (opencv-opencv-4.5.1_GH0.tar.gz) = 88245766
3
SIZE (opencv-opencv-4.5.1_GH0.tar.gz) = 88245766
4
SHA256 (opencv-opencv_contrib-4.5.1_GH0.tar.gz) = 12c3b1ddd0b8c1a7da5b743590a288df0934e5cef243e036ca290c2e45e425f5
4
SHA256 (opencv-opencv_contrib-4.5.1_GH0.tar.gz) = 12c3b1ddd0b8c1a7da5b743590a288df0934e5cef243e036ca290c2e45e425f5
Lines 9-11 Link Here
9
SIZE (opencv-opencv_3rdparty-34e4206aef44d50e6bbcd0ab06354b52e7466d26_GH0.tar.gz) = 397901
9
SIZE (opencv-opencv_3rdparty-34e4206aef44d50e6bbcd0ab06354b52e7466d26_GH0.tar.gz) = 397901
10
SHA256 (opencv-opencv_3rdparty-fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d_GH0.tar.gz) = e9abccbabcace092e5424073168cc86d422585d15d25569f01fb6503b109e0e1
10
SHA256 (opencv-opencv_3rdparty-fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d_GH0.tar.gz) = e9abccbabcace092e5424073168cc86d422585d15d25569f01fb6503b109e0e1
11
SIZE (opencv-opencv_3rdparty-fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d_GH0.tar.gz) = 1470898
11
SIZE (opencv-opencv_3rdparty-fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d_GH0.tar.gz) = 1470898
12
SHA256 (opencv-opencv_3rdparty-8afa57abc8229d611c4937165d20e2a2d9fc5a12_GH0.tar.gz) = 0ae1f2d2a619ab177d96024e253e142d15dea27236510aaf1a65c7b529ee6677
13
SIZE (opencv-opencv_3rdparty-8afa57abc8229d611c4937165d20e2a2d9fc5a12_GH0.tar.gz) = 63301261
(-)pkg-plist (-56 / +56 lines)
Lines 3-9 Link Here
3
bin/opencv_version
3
bin/opencv_version
4
bin/opencv_visualisation
4
bin/opencv_visualisation
5
bin/opencv_waldboost_detector
5
bin/opencv_waldboost_detector
6
include/opencv4/opencv2/alphamat.hpp
7
include/opencv4/opencv2/aruco.hpp
6
include/opencv4/opencv2/aruco.hpp
8
include/opencv4/opencv2/aruco/charuco.hpp
7
include/opencv4/opencv2/aruco/charuco.hpp
9
include/opencv4/opencv2/aruco/dictionary.hpp
8
include/opencv4/opencv2/aruco/dictionary.hpp
Lines 141-147 Link Here
141
include/opencv4/opencv2/core/va_intel.hpp
140
include/opencv4/opencv2/core/va_intel.hpp
142
include/opencv4/opencv2/core/version.hpp
141
include/opencv4/opencv2/core/version.hpp
143
include/opencv4/opencv2/core/vsx_utils.hpp
142
include/opencv4/opencv2/core/vsx_utils.hpp
144
include/opencv4/opencv2/core_detect.hpp
145
include/opencv4/opencv2/cvconfig.h
143
include/opencv4/opencv2/cvconfig.h
146
include/opencv4/opencv2/datasets/ar_hmdb.hpp
144
include/opencv4/opencv2/datasets/ar_hmdb.hpp
147
include/opencv4/opencv2/datasets/ar_sports.hpp
145
include/opencv4/opencv2/datasets/ar_sports.hpp
Lines 175-191 Link Here
175
include/opencv4/opencv2/datasets/track_alov.hpp
173
include/opencv4/opencv2/datasets/track_alov.hpp
176
include/opencv4/opencv2/datasets/track_vot.hpp
174
include/opencv4/opencv2/datasets/track_vot.hpp
177
include/opencv4/opencv2/datasets/util.hpp
175
include/opencv4/opencv2/datasets/util.hpp
178
include/opencv4/opencv2/dnn.hpp
179
include/opencv4/opencv2/dnn/all_layers.hpp
180
include/opencv4/opencv2/dnn/dict.hpp
181
include/opencv4/opencv2/dnn/dnn.hpp
182
include/opencv4/opencv2/dnn/dnn.inl.hpp
183
include/opencv4/opencv2/dnn/layer.details.hpp
184
include/opencv4/opencv2/dnn/layer.hpp
185
include/opencv4/opencv2/dnn/shape_utils.hpp
186
include/opencv4/opencv2/dnn/utils/inference_engine.hpp
187
include/opencv4/opencv2/dnn/version.hpp
188
include/opencv4/opencv2/dnn_superres.hpp
189
include/opencv4/opencv2/dpm.hpp
176
include/opencv4/opencv2/dpm.hpp
190
include/opencv4/opencv2/face.hpp
177
include/opencv4/opencv2/face.hpp
191
include/opencv4/opencv2/face/bif.hpp
178
include/opencv4/opencv2/face/bif.hpp
Lines 350-359 Link Here
350
include/opencv4/opencv2/intensity_transform.hpp
337
include/opencv4/opencv2/intensity_transform.hpp
351
include/opencv4/opencv2/line_descriptor.hpp
338
include/opencv4/opencv2/line_descriptor.hpp
352
include/opencv4/opencv2/line_descriptor/descriptor.hpp
339
include/opencv4/opencv2/line_descriptor/descriptor.hpp
353
include/opencv4/opencv2/mcc.hpp
354
include/opencv4/opencv2/mcc/ccm.hpp
355
include/opencv4/opencv2/mcc/checker_detector.hpp
356
include/opencv4/opencv2/mcc/checker_model.hpp
357
include/opencv4/opencv2/ml.hpp
340
include/opencv4/opencv2/ml.hpp
358
include/opencv4/opencv2/ml/ml.hpp
341
include/opencv4/opencv2/ml/ml.hpp
359
include/opencv4/opencv2/ml/ml.inl.hpp
342
include/opencv4/opencv2/ml/ml.inl.hpp
Lines 406-421 Link Here
406
include/opencv4/opencv2/saliency.hpp
389
include/opencv4/opencv2/saliency.hpp
407
include/opencv4/opencv2/saliency/saliencyBaseClasses.hpp
390
include/opencv4/opencv2/saliency/saliencyBaseClasses.hpp
408
include/opencv4/opencv2/saliency/saliencySpecializedClasses.hpp
391
include/opencv4/opencv2/saliency/saliencySpecializedClasses.hpp
409
include/opencv4/opencv2/sfm.hpp
410
include/opencv4/opencv2/sfm/conditioning.hpp
411
include/opencv4/opencv2/sfm/fundamental.hpp
412
include/opencv4/opencv2/sfm/io.hpp
413
include/opencv4/opencv2/sfm/numeric.hpp
414
include/opencv4/opencv2/sfm/projection.hpp
415
include/opencv4/opencv2/sfm/reconstruct.hpp
416
include/opencv4/opencv2/sfm/robust.hpp
417
include/opencv4/opencv2/sfm/simple_pipeline.hpp
418
include/opencv4/opencv2/sfm/triangulation.hpp
419
include/opencv4/opencv2/shape.hpp
392
include/opencv4/opencv2/shape.hpp
420
include/opencv4/opencv2/shape/emdL1.hpp
393
include/opencv4/opencv2/shape/emdL1.hpp
421
include/opencv4/opencv2/shape/hist_cost.hpp
394
include/opencv4/opencv2/shape/hist_cost.hpp
Lines 452-462 Link Here
452
include/opencv4/opencv2/surface_matching/ppf_helpers.hpp
425
include/opencv4/opencv2/surface_matching/ppf_helpers.hpp
453
include/opencv4/opencv2/surface_matching/ppf_match_3d.hpp
426
include/opencv4/opencv2/surface_matching/ppf_match_3d.hpp
454
include/opencv4/opencv2/surface_matching/t_hash_int.hpp
427
include/opencv4/opencv2/surface_matching/t_hash_int.hpp
455
include/opencv4/opencv2/text.hpp
456
include/opencv4/opencv2/text/erfilter.hpp
457
include/opencv4/opencv2/text/ocr.hpp
458
include/opencv4/opencv2/text/swt_text_detection.hpp
459
include/opencv4/opencv2/text/textDetector.hpp
460
include/opencv4/opencv2/tracking.hpp
428
include/opencv4/opencv2/tracking.hpp
461
include/opencv4/opencv2/tracking/feature.hpp
429
include/opencv4/opencv2/tracking/feature.hpp
462
include/opencv4/opencv2/tracking/kalman_filters.hpp
430
include/opencv4/opencv2/tracking/kalman_filters.hpp
Lines 530-538 Link Here
530
lib/cmake/opencv4/OpenCVConfig.cmake
498
lib/cmake/opencv4/OpenCVConfig.cmake
531
lib/cmake/opencv4/OpenCVModules-%%CMAKE_BUILD_TYPE%%.cmake
499
lib/cmake/opencv4/OpenCVModules-%%CMAKE_BUILD_TYPE%%.cmake
532
lib/cmake/opencv4/OpenCVModules.cmake
500
lib/cmake/opencv4/OpenCVModules.cmake
533
lib/libopencv_alphamat.so
534
lib/libopencv_alphamat.so.4.5
535
lib/libopencv_alphamat.so.4.5.1
536
lib/libopencv_aruco.so
501
lib/libopencv_aruco.so
537
lib/libopencv_aruco.so.4.5
502
lib/libopencv_aruco.so.4.5
538
lib/libopencv_aruco.so.4.5.1
503
lib/libopencv_aruco.so.4.5.1
Lines 554-568 Link Here
554
lib/libopencv_datasets.so
519
lib/libopencv_datasets.so
555
lib/libopencv_datasets.so.4.5
520
lib/libopencv_datasets.so.4.5
556
lib/libopencv_datasets.so.4.5.1
521
lib/libopencv_datasets.so.4.5.1
557
lib/libopencv_dnn.so
558
lib/libopencv_dnn.so.4.5
559
lib/libopencv_dnn.so.4.5.1
560
lib/libopencv_dnn_objdetect.so
561
lib/libopencv_dnn_objdetect.so.4.5
562
lib/libopencv_dnn_objdetect.so.4.5.1
563
lib/libopencv_dnn_superres.so
564
lib/libopencv_dnn_superres.so.4.5
565
lib/libopencv_dnn_superres.so.4.5.1
566
lib/libopencv_dpm.so
522
lib/libopencv_dpm.so
567
lib/libopencv_dpm.so.4.5
523
lib/libopencv_dpm.so.4.5
568
lib/libopencv_dpm.so.4.5.1
524
lib/libopencv_dpm.so.4.5.1
Lines 608-616 Link Here
608
lib/libopencv_line_descriptor.so
564
lib/libopencv_line_descriptor.so
609
lib/libopencv_line_descriptor.so.4.5
565
lib/libopencv_line_descriptor.so.4.5
610
lib/libopencv_line_descriptor.so.4.5.1
566
lib/libopencv_line_descriptor.so.4.5.1
611
lib/libopencv_mcc.so
612
lib/libopencv_mcc.so.4.5
613
lib/libopencv_mcc.so.4.5.1
614
lib/libopencv_ml.so
567
lib/libopencv_ml.so
615
lib/libopencv_ml.so.4.5
568
lib/libopencv_ml.so.4.5
616
lib/libopencv_ml.so.4.5.1
569
lib/libopencv_ml.so.4.5.1
Lines 644-652 Link Here
644
lib/libopencv_saliency.so
597
lib/libopencv_saliency.so
645
lib/libopencv_saliency.so.4.5
598
lib/libopencv_saliency.so.4.5
646
lib/libopencv_saliency.so.4.5.1
599
lib/libopencv_saliency.so.4.5.1
647
lib/libopencv_sfm.so
648
lib/libopencv_sfm.so.4.5
649
lib/libopencv_sfm.so.4.5.1
650
lib/libopencv_shape.so
600
lib/libopencv_shape.so
651
lib/libopencv_shape.so.4.5
601
lib/libopencv_shape.so.4.5
652
lib/libopencv_shape.so.4.5.1
602
lib/libopencv_shape.so.4.5.1
Lines 665-673 Link Here
665
lib/libopencv_surface_matching.so
615
lib/libopencv_surface_matching.so
666
lib/libopencv_surface_matching.so.4.5
616
lib/libopencv_surface_matching.so.4.5
667
lib/libopencv_surface_matching.so.4.5.1
617
lib/libopencv_surface_matching.so.4.5.1
668
lib/libopencv_text.so
669
lib/libopencv_text.so.4.5
670
lib/libopencv_text.so.4.5.1
671
lib/libopencv_tracking.so
618
lib/libopencv_tracking.so
672
lib/libopencv_tracking.so.4.5
619
lib/libopencv_tracking.so.4.5
673
lib/libopencv_tracking.so.4.5.1
620
lib/libopencv_tracking.so.4.5.1
Lines 692-701 Link Here
692
lib/libopencv_xphoto.so
639
lib/libopencv_xphoto.so
693
lib/libopencv_xphoto.so.4.5
640
lib/libopencv_xphoto.so.4.5
694
lib/libopencv_xphoto.so.4.5.1
641
lib/libopencv_xphoto.so.4.5.1
695
lib/opencv4/3rdparty/libcorrespondence.a
696
lib/opencv4/3rdparty/libmultiview.a
697
lib/opencv4/3rdparty/libnumeric.a
698
libdata/pkgconfig/opencv4.pc
642
libdata/pkgconfig/opencv4.pc
643
%%PROTOBUF%%lib/libopencv_text.so
644
%%PROTOBUF%%lib/libopencv_text.so.4.5
645
%%PROTOBUF%%lib/libopencv_text.so.4.5.1
646
%%PROTOBUF%%lib/libopencv_mcc.so
647
%%PROTOBUF%%lib/libopencv_mcc.so.4.5
648
%%PROTOBUF%%lib/libopencv_mcc.so.4.5.1
649
%%PROTOBUF%%lib/libopencv_dnn.so
650
%%PROTOBUF%%lib/libopencv_dnn.so.4.5
651
%%PROTOBUF%%lib/libopencv_dnn.so.4.5.1
652
%%PROTOBUF%%lib/libopencv_dnn_objdetect.so
653
%%PROTOBUF%%lib/libopencv_dnn_objdetect.so.4.5
654
%%PROTOBUF%%lib/libopencv_dnn_objdetect.so.4.5.1
655
%%PROTOBUF%%lib/libopencv_dnn_superres.so
656
%%PROTOBUF%%lib/libopencv_dnn_superres.so.4.5
657
%%PROTOBUF%%lib/libopencv_dnn_superres.so.4.5.1
658
%%PROTOBUF%%include/opencv4/opencv2/text.hpp
659
%%PROTOBUF%%include/opencv4/opencv2/text/erfilter.hpp
660
%%PROTOBUF%%include/opencv4/opencv2/text/ocr.hpp
661
%%PROTOBUF%%include/opencv4/opencv2/text/swt_text_detection.hpp
662
%%PROTOBUF%%include/opencv4/opencv2/text/textDetector.hpp
663
%%PROTOBUF%%include/opencv4/opencv2/mcc.hpp
664
%%PROTOBUF%%include/opencv4/opencv2/mcc/ccm.hpp
665
%%PROTOBUF%%include/opencv4/opencv2/mcc/checker_detector.hpp
666
%%PROTOBUF%%include/opencv4/opencv2/mcc/checker_model.hpp
667
%%PROTOBUF%%include/opencv4/opencv2/dnn.hpp
668
%%PROTOBUF%%include/opencv4/opencv2/dnn/all_layers.hpp
669
%%PROTOBUF%%include/opencv4/opencv2/dnn/dict.hpp
670
%%PROTOBUF%%include/opencv4/opencv2/dnn/dnn.hpp
671
%%PROTOBUF%%include/opencv4/opencv2/dnn/dnn.inl.hpp
672
%%PROTOBUF%%include/opencv4/opencv2/dnn/layer.details.hpp
673
%%PROTOBUF%%include/opencv4/opencv2/dnn/layer.hpp
674
%%PROTOBUF%%include/opencv4/opencv2/dnn/shape_utils.hpp
675
%%PROTOBUF%%include/opencv4/opencv2/dnn/utils/inference_engine.hpp
676
%%PROTOBUF%%include/opencv4/opencv2/dnn/version.hpp
677
%%PROTOBUF%%include/opencv4/opencv2/dnn_superres.hpp
678
%%PROTOBUF%%include/opencv4/opencv2/core_detect.hpp
679
%%EIGEN%%lib/libopencv_alphamat.so
680
%%EIGEN%%lib/libopencv_alphamat.so.4.5
681
%%EIGEN%%lib/libopencv_alphamat.so.4.5.1
682
%%EIGEN%%lib/libopencv_sfm.so
683
%%EIGEN%%lib/libopencv_sfm.so.4.5
684
%%EIGEN%%lib/libopencv_sfm.so.4.5.1
685
%%EIGEN%%include/opencv4/opencv2/sfm.hpp
686
%%EIGEN%%include/opencv4/opencv2/sfm/conditioning.hpp
687
%%EIGEN%%include/opencv4/opencv2/sfm/fundamental.hpp
688
%%EIGEN%%include/opencv4/opencv2/sfm/io.hpp
689
%%EIGEN%%include/opencv4/opencv2/sfm/numeric.hpp
690
%%EIGEN%%include/opencv4/opencv2/sfm/projection.hpp
691
%%EIGEN%%include/opencv4/opencv2/sfm/reconstruct.hpp
692
%%EIGEN%%include/opencv4/opencv2/sfm/robust.hpp
693
%%EIGEN%%include/opencv4/opencv2/sfm/simple_pipeline.hpp
694
%%EIGEN%%include/opencv4/opencv2/sfm/triangulation.hpp
695
%%EIGEN%%include/opencv4/opencv2/alphamat.hpp
696
%%EIGEN%%lib/opencv4/3rdparty/libcorrespondence.a
697
%%EIGEN%%lib/opencv4/3rdparty/libmultiview.a
698
%%EIGEN%%lib/opencv4/3rdparty/libnumeric.a
699
%%DATADIR%%/haarcascades/haarcascade_eye.xml
699
%%DATADIR%%/haarcascades/haarcascade_eye.xml
700
%%DATADIR%%/haarcascades/haarcascade_eye_tree_eyeglasses.xml
700
%%DATADIR%%/haarcascades/haarcascade_eye_tree_eyeglasses.xml
701
%%DATADIR%%/haarcascades/haarcascade_frontalcatface.xml
701
%%DATADIR%%/haarcascades/haarcascade_frontalcatface.xml

Return to bug 253110