FreeBSD Bugzilla – Attachment 220746 Details for
Bug 237135
[exp-run] Update graphics/opencv to 3.4.7
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
v1
opencv-3.4.7.v1.diff (text/plain), 124.57 KB, created by
Tobias C. Berner
on 2020-12-20 12:45:58 UTC
(
hide
)
Description:
v1
Filename:
MIME Type:
Creator:
Tobias C. Berner
Created:
2020-12-20 12:45:58 UTC
Size:
124.57 KB
patch
obsolete
>diff --git a/graphics/gstreamer-plugins-opencv/Makefile b/graphics/gstreamer-plugins-opencv/Makefile >index 6edd2aea9f81..3028abf5ef81 100644 >--- a/graphics/gstreamer-plugins-opencv/Makefile >+++ b/graphics/gstreamer-plugins-opencv/Makefile >@@ -10,4 +10,6 @@ GST_PLUGIN= opencv > > MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins > >+BROKEN= Incompatible with OpenCV 3.4.7 >+ > .include "${MASTERDIR}/Makefile" >diff --git a/graphics/opencv-core/Makefile b/graphics/opencv-core/Makefile >index fa0de009e639..4748e16276b2 100644 >--- a/graphics/opencv-core/Makefile >+++ b/graphics/opencv-core/Makefile >@@ -1,8 +1,7 @@ > # Created by: Martin Matuska <mm@FreeBSD.org> > # $FreeBSD$ > >-PORTREVISION= 3 >-PKGNAMESUFFIX= -${OCV_SLAVE} >+PKGNAMESUFFIX= ${OCV_SUFFIX}-${OCV_SLAVE} > > COMMENT= OpenCV core libraries > >diff --git a/graphics/opencv-core/pkg-plist b/graphics/opencv-core/pkg-plist >index 9efdefdc99a8..bc9cb2674ba6 100644 >--- a/graphics/opencv-core/pkg-plist >+++ b/graphics/opencv-core/pkg-plist >@@ -1,11 +1,23 @@ >+include/opencv/cvwimage.h >+include/opencv/cxcore.h >+include/opencv/cxcore.hpp >+include/opencv/cxeigen.hpp >+include/opencv/cxmisc.h >+include/opencv2/core/async.hpp >+include/opencv2/core/detail/async_promise.hpp >+include/opencv2/core/detail/exception_ptr.hpp >+include/opencv2/core/hal/intrin_avx512.hpp >+include/opencv2/core/simd_intrinsics.hpp >+include/opencv2/core/utils/allocator_stats.hpp >+include/opencv2/core/utils/allocator_stats.impl.hpp > include/opencv2/core.hpp > include/opencv2/core/affine.hpp > include/opencv2/core/base.hpp >+include/opencv2/core/bindings_utils.hpp > include/opencv2/core/bufferpool.hpp >-include/opencv2/core/core_c.h >+include/opencv2/core/check.hpp > include/opencv2/core/core.hpp >-include/opencv2/core/cuda_stream_accessor.hpp >-include/opencv2/core/cuda_types.hpp >+include/opencv2/core/core_c.h > include/opencv2/core/cuda.hpp > include/opencv2/core/cuda.inl.hpp > include/opencv2/core/cuda/block.hpp >@@ -14,8 +26,8 @@ include/opencv2/core/cuda/color.hpp > include/opencv2/core/cuda/common.hpp > include/opencv2/core/cuda/datamov_utils.hpp > include/opencv2/core/cuda/detail/color_detail.hpp >-include/opencv2/core/cuda/detail/reduce_key_val.hpp > include/opencv2/core/cuda/detail/reduce.hpp >+include/opencv2/core/cuda/detail/reduce_key_val.hpp > include/opencv2/core/cuda/detail/transform_detail.hpp > include/opencv2/core/cuda/detail/type_traits_detail.hpp > include/opencv2/core/cuda/detail/vec_distance_detail.hpp >@@ -35,9 +47,11 @@ include/opencv2/core/cuda/utility.hpp > include/opencv2/core/cuda/vec_distance.hpp > include/opencv2/core/cuda/vec_math.hpp > include/opencv2/core/cuda/vec_traits.hpp >+include/opencv2/core/cuda/warp.hpp > include/opencv2/core/cuda/warp_reduce.hpp > include/opencv2/core/cuda/warp_shuffle.hpp >-include/opencv2/core/cuda/warp.hpp >+include/opencv2/core/cuda_stream_accessor.hpp >+include/opencv2/core/cuda_types.hpp > include/opencv2/core/cv_cpu_dispatch.h > include/opencv2/core/cv_cpu_helper.h > include/opencv2/core/cvdef.h >@@ -48,11 +62,21 @@ include/opencv2/core/eigen.hpp > include/opencv2/core/fast_math.hpp > include/opencv2/core/hal/hal.hpp > include/opencv2/core/hal/interface.h >+include/opencv2/core/hal/intrin.hpp >+include/opencv2/core/hal/intrin_avx.hpp > include/opencv2/core/hal/intrin_cpp.hpp >+include/opencv2/core/hal/intrin_forward.hpp > include/opencv2/core/hal/intrin_neon.hpp > include/opencv2/core/hal/intrin_sse.hpp >+include/opencv2/core/hal/intrin_sse_em.hpp > include/opencv2/core/hal/intrin_vsx.hpp >-include/opencv2/core/hal/intrin.hpp >+include/opencv2/core/ippasync.hpp >+include/opencv2/core/mat.hpp >+include/opencv2/core/mat.inl.hpp >+include/opencv2/core/matx.hpp >+include/opencv2/core/neon_utils.hpp >+include/opencv2/core/ocl.hpp >+include/opencv2/core/ocl_genbase.hpp > include/opencv2/core/opencl/ocl_defs.hpp > include/opencv2/core/opencl/opencl_info.hpp > include/opencv2/core/opencl/opencl_svm.hpp >@@ -71,13 +95,6 @@ include/opencv2/core/opencl/runtime/opencl_gl_wrappers.hpp > include/opencv2/core/opencl/runtime/opencl_svm_20.hpp > include/opencv2/core/opencl/runtime/opencl_svm_definitions.hpp > include/opencv2/core/opencl/runtime/opencl_svm_hsa_extension.hpp >-include/opencv2/core/ippasync.hpp >-include/opencv2/core/mat.hpp >-include/opencv2/core/mat.inl.hpp >-include/opencv2/core/matx.hpp >-include/opencv2/core/neon_utils.hpp >-include/opencv2/core/ocl_genbase.hpp >-include/opencv2/core/ocl.hpp > include/opencv2/core/opengl.hpp > include/opencv2/core/operations.hpp > include/opencv2/core/optim.hpp >@@ -88,8 +105,8 @@ include/opencv2/core/saturate.hpp > include/opencv2/core/softfloat.hpp > include/opencv2/core/sse_utils.hpp > include/opencv2/core/traits.hpp >-include/opencv2/core/types_c.h > include/opencv2/core/types.hpp >+include/opencv2/core/types_c.h > include/opencv2/core/utility.hpp > include/opencv2/core/utils/filesystem.hpp > include/opencv2/core/utils/logger.defines.hpp >@@ -104,8 +121,8 @@ include/opencv2/imgproc.hpp > include/opencv2/imgproc/detail/distortion_model.hpp > include/opencv2/imgproc/hal/hal.hpp > include/opencv2/imgproc/hal/interface.h >-include/opencv2/imgproc/imgproc_c.h > include/opencv2/imgproc/imgproc.hpp >+include/opencv2/imgproc/imgproc_c.h > include/opencv2/imgproc/types_c.h > @comment include/opencv2/opencv.hpp > @comment include/opencv2/opencv_modules.hpp >diff --git a/graphics/opencv-java/Makefile b/graphics/opencv-java/Makefile >index 37818c96021b..4da51c483288 100644 >--- a/graphics/opencv-java/Makefile >+++ b/graphics/opencv-java/Makefile >@@ -1,6 +1,6 @@ > # $FreeBSD$ > >-PORTREVISION= 4 >+PORTREVISION= 0 > CATEGORIES= graphics java > PKGNAMESUFFIX= -${OCV_SLAVE} > >diff --git a/graphics/opencv-java/pkg-plist b/graphics/opencv-java/pkg-plist >index 107f21febc9e..151781fc3a90 100644 >--- a/graphics/opencv-java/pkg-plist >+++ b/graphics/opencv-java/pkg-plist >@@ -1,2 +1,82 @@ > %%DATADIR%%/java/libopencv_java%%OCV_VER%%.so > %%DATADIR%%/java/opencv-%%OCV_VER%%.jar >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/ant/build.xml >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/ant/src/SimpleSample.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/clojure/simple-sample/project.clj >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/clojure/simple-sample/resources/images/lena.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/clojure/simple-sample/src/simple_sample/core.clj >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/clojure/simple-sample/test/simple_sample/core_test.clj >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/eclipse/HelloCV/.classpath >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/eclipse/HelloCV/.project >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/eclipse/HelloCV/.settings/org.eclipse.jdt.core.prefs >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/eclipse/HelloCV/src/Main.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/opencv_version.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/sbt/README >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/sbt/lib/copy_opencv_jar_here >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/sbt/project/build.scala >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/sbt/project/plugins.sbt >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/sbt/sbt/sbt >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/sbt/sbt/sbt-launch.jar >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/sbt/src/main/java/DetectFaceDemo.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/sbt/src/main/resources/AverageMaleFace.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/sbt/src/main/resources/img1.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/sbt/src/main/resources/img2.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/sbt/src/main/scala/Main.scala >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/sbt/src/main/scala/ScalaCorrespondenceMatchingDemo.scala >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/sbt/src/main/scala/ScalaDetectFaceDemo.scala >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/CMakeLists.txt >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/Histograms_Matching/back_projection/CalcBackProjectDemo1.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/Histograms_Matching/back_projection/CalcBackProjectDemo2.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/Histograms_Matching/histogram_calculation/CalcHistDemo.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/Histograms_Matching/histogram_comparison/CompareHistDemo.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/Histograms_Matching/histogram_equalization/EqualizeHistDemo.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/ImgProc/BasicGeometricDrawing/BasicGeometricDrawing.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/ImgProc/HitMiss/HitMiss.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/ImgProc/Pyramids/Pyramids.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/ImgProc/Smoothing/Smoothing.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/ImgProc/changing_contrast_brightness_image/BasicLinearTransformsDemo.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/ImgProc/changing_contrast_brightness_image/ChangingContrastBrightnessImageDemo.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/ImgProc/erosion_dilatation/MorphologyDemo1.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/ImgProc/morph_lines_detection/Morphology_3.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/ImgProc/opening_closing_hats/MorphologyDemo2.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/ImgProc/threshold/Threshold.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/ImgProc/threshold_inRange/ThresholdInRange.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/ImgProc/tutorial_template_matching/MatchTemplateDemo.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/ImgTrans/Filter2D/Filter2D_Demo.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/ImgTrans/HoughCircle/HoughCircles.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/ImgTrans/HoughLine/HoughLines.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/ImgTrans/LaPlace/LaplaceDemo.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/ImgTrans/MakeBorder/CopyMakeBorder.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/ImgTrans/SobelDemo/SobelDemo.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/ImgTrans/canny_detector/CannyDetectorDemo.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/ImgTrans/distance_transformation/ImageSegmentationDemo.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/ImgTrans/remap/RemapDemo.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/ImgTrans/warp_affine/GeometricTransformsDemo.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/ShapeDescriptors/bounding_rects_circles/GeneralContoursDemo1.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/ShapeDescriptors/bounding_rotated_ellipses/GeneralContoursDemo2.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/ShapeDescriptors/find_contours/FindContoursDemo.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/ShapeDescriptors/hull/HullDemo.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/ShapeDescriptors/moments/MomentsDemo.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/ShapeDescriptors/point_polygon_test/PointPolygonTestDemo.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/TrackingMotion/corner_subpixels/CornerSubPixDemo.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/TrackingMotion/generic_corner_detector/CornerDetectorDemo.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/TrackingMotion/good_features_to_track/GoodFeaturesToTrackDemo.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/TrackingMotion/harris_detector/CornerHarrisDemo.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/build.xml >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/core/AddingImages/AddingImages.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/core/discrete_fourier_transform/DiscreteFourierTransform.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/core/mat_mask_operations/MatMaskOperations.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/core/mat_operations/MatOperations.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/features2D/akaze_matching/AKAZEMatchDemo.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/features2D/feature_description/SURFMatchingDemo.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/features2D/feature_detection/SURFDetectionDemo.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/features2D/feature_flann_matcher/SURFFLANNMatchingDemo.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/features2D/feature_homography/SURFFLANNMatchingHomographyDemo.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/highgui/trackbar/AddingImagesTrackbar.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/introduction/documentation/Documentation.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/ml/introduction_to_pca/IntroductionToPCADemo.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/ml/introduction_to_svm/IntroductionToSVMDemo.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/ml/non_linear_svms/NonLinearSVMsDemo.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/objectDetection/cascade_classifier/ObjectDetectionDemo.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/photo/hdr_imaging/HDRImagingDemo.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/tutorial_code/video/background_subtraction/BackgroundSubtractionDemo.java >diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile >index 1cc021d34868..8754a743a3f9 100644 >--- a/graphics/opencv/Makefile >+++ b/graphics/opencv/Makefile >@@ -2,9 +2,8 @@ > # $FreeBSD$ > > PORTNAME= opencv >-PORTVERSION= 3.4.1 >-PORTREVISION= 37 >-CATEGORIES= graphics >+PORTVERSION= 3.4.7 >+CATEGORIES?= graphics > > MAINTAINER= tcberner@FreeBSD.org > COMMENT= Open Source Computer Vision library >@@ -19,10 +18,15 @@ NOT_FOR_ARCHS_REASON_sparc64= does not compile on sparc64 > BUILD_DEPENDS= protoc:devel/protobuf > .else > LIB_DEPENDS= libprotobuf.so:devel/protobuf \ >- libtesseract.so:graphics/tesseract >+ libtesseract.so:graphics/tesseract \ >+ libhdf5.so:science/hdf5 \ >+ libgflags.so:devel/gflags \ >+ libglog.so:devel/glog >+BUILD_DEPENDS= ${LOCALBASE}/lib/libopencv_core.so:graphics/opencv-core >+RUN_DEPENDS= ${LOCALBASE}/lib/libopencv_core.so:graphics/opencv-core > .endif > >-USES= cmake compiler:c++14-lang localbase:ldflags pkgconfig >+USES+= cmake compiler:c++14-lang gnome localbase:ldflags pkgconfig > > USE_GITHUB= yes > USE_LDCONFIG= yes >@@ -31,117 +35,33 @@ USE_CXXSTD= c++11 > DATADIR= ${PREFIX}/share/OpenCV > PLIST_SUB+= SOVERSION=${DISTVERSION:R} VERSION=${DISTVERSION} > >+# Explicitely force a fail if configure mismatches expectations >+CMAKE_OFF+= ENABLE_CONFIG_VERIFICATION >+ >+# Don't generate bash script >+CMAKE_OFF+= OPENCV_GENERATE_SETUPVARS USE_IPPICV >+ > # 3rd party libs >-CMAKE_ON= ENABLE_CXX11 >-CMAKE_OFF= BUILD_ZLIB BUILD_TIFF BUILD_JASPER BUILD_JPEG BUILD_PNG BUILD_OPENEXR BUILD_TBB BUILD_IPP_IW BUILD_ITT BUILD_PROTOBUF >+CMAKE_ON+= ENABLE_CXX11 PROTOBUF_UPDATE_FILES >+CMAKE_OFF+= BUILD_ZLIB BUILD_TIFF BUILD_JASPER BUILD_JPEG BUILD_PNG \ >+ BUILD_OPENEXR BUILD_WEBP BUILD_TBB BUILD_PROTOBUF >+ > # Optional 3rd party components >-CMAKE_ARGS+= -DWITH_1394:BOOL=OFF \ >- -DWITH_CAROTENE:BOOL=OFF \ >- -DWITH_CPUFEATURES:BOOL=OFF \ >- -DWITH_VTK:BOOL=OFF \ >- -DWITH_CUDA:BOOL=OFF \ >- -DWITH_CUFFT:BOOL=OFF \ >- -DWITH_CUBLAS:BOOL=OFF \ >- -DWITH_NVCUVID:BOOL=OFF \ >- -DWITH_EIGEN:BOOL=OFF \ >- -DWITH_VFW:BOOL=OFF \ >- -DWITH_FFMPEG:BOOL=OFF \ >- -DWITH_GSTREAMER:BOOL=OFF \ >- -DWITH_GSTREAMER_0_10:BOOL=OFF \ >- -DWITH_GTK:BOOL=OFF \ >- -DWITH_GTK_2_X:BOOL=ON \ >- -DWITH_IPP:BOOL=OFF \ >- -DWITH_IPP_A:BOOL=OFF \ >- -DWITH_HALIDE:BOOL=OFF \ >- -DWITH_JASPER:BOOL=OFF \ >- -DWITH_JPEG:BOOL=OFF \ >- -DWITH_WEBP:BOOL=OFF \ >- -DWITH_OPENEXR:BOOL=OFF \ >- -DWITH_OPENGL:BOOL=OFF \ >- -DWITH_OPENVX:BOOL=OFF \ >- -DWITH_OPENNI:BOOL=OFF \ >- -DWITH_OPENNI2:BOOL=OFF \ >- -DWITH_PNG:BOOL=OFF \ >- -DWITH_GDCM:BOOL=OFF \ >- -DWITH_PVAPI:BOOL=OFF \ >- -DWITH_GIGEAPI:BOOL=OFF \ >- -DWITH_ARAVIS:BOOL=OFF \ >- -DWITH_QT:BOOL=OFF \ >- -DWITH_WIN32UI:BOOL=OFF \ >- -DWITH_TBB:BOOL=OFF \ >- -DWITH_OPENMP:BOOL=OFF \ >- -DWITH_CSTRIPES:BOOL=ON \ >- -DWITH_PTHREADS_PF:BOOL=OFF \ >- -DWITH_TIFF:BOOL=OFF \ >- -DWITH_UNICAP:BOOL=OFF \ >- -DWITH_V4L:BOOL=OFF \ >- -DWITH_LIBV4L:BOOL=OFF \ >- -DWITH_DSHOW:BOOL=OFF \ >- -DWITH_MSMF:BOOL=OFF \ >- -DWITH_XIMEA:BOOL=OFF \ >- -DWITH_XINE:BOOL=OFF \ >- -DWITH_CLP:BOOL=OFF \ >- -DWITH_OPENCL:BOOL=OFF \ >- -DWITH_OPENCL_SVM:BOOL=OFF \ >- -DWITH_OPENCLAMDFFT:BOOL=OFF \ >- -DWITH_OPENCLAMDBLAS:BOOL=OFF \ >- -DWITH_DIRECTX:BOOL=OFF \ >- -DWITH_INTELPERC:BOOL=OFF \ >- -DWITH_MATLAB:BOOL=OFF \ >- -DWITH_VA:BOOL=OFF \ >- -DWITH_VA_INTEL:BOOL=OFF \ >- -DWITH_GDAL:BOOL=OFF \ >- -DWITH_GPHOTO2:BOOL=OFF \ >- -DWITH_LAPACK:BOOL=OFF \ >- -DWITH_ITT:BOOL=OFF >+# always off (not supported on FreeBSD or difficult to deal with in ports) >+CMAKE_OFF+= WITH_CPUFEATURES WITH_CUBLAS WITH_CUDA WITH_CUFFT \ >+ WITH_INF_ENGINE WITH_NVCUVID WITH_OPENNI WITH_OPENNI2 > # OpenCV build components >-CMAKE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=ON \ >- -DBUILD_opencv_apps:BOOL=ON \ >- -DBUILD_opencv_js:BOOL=OFF \ >- -DBUILD_ANDROID_EXAMPLES:BOOL=OFF \ >- -DBUILD_DOCS:BOOL=OFF \ >- -DBUILD_EXAMPLES:BOOL=OFF \ >- -DBUILD_PACKAGE:BOOL=OFF \ >- -DBUILD_PERF_TESTS:BOOL=OFF \ >- -DBUILD_TESTS:BOOL=OFF \ >- -DBUILD_WITH_DEBUG_INFO:BOOL=OFF \ >- -DBUILD_WITH_DYNAMIC_IPP:BOOL=OFF \ >- -DBUILD_FAT_JAVA_LIB:BOOL=OFF \ >- -DBUILD_CUDA_STUBS:BOOL=OFF \ >- -DBUILD_ANDROID_SERVICE:BOOL=OFF \ >- -DBUILD_opencv_ts:BOOL=OFF \ >- -DBUILD_opencv_cnn_3dobj_INIT:BOOL=OFF \ >- -DBUILD_opencv_world:BOOL=OFF >+CMAKE_OFF+= BUILD_FAT_JAVA_LIB BUILD_PACKAGE BUILD_PERF_TESTS \ >+ BUILD_TESTS BUILD_WITH_DEBUG_INFO > # OpenCV installation options >-CMAKE_ARGS+= -DINSTALL_CREATE_DISTRIB:BOOL=OFF \ >- -DINSTALL_C_EXAMPLES:BOOL=OFF \ >- -DINSTALL_PYTHON_EXAMPLES:BOOL=OFF \ >- -DINSTALL_TO_MANGLED_PATHS:BOOL=OFF \ >- -DINSTALL_TESTS:BOOL=OFF >+CMAKE_OFF+= INSTALL_CREATE_DISTRIB > # OpenCV build options >-CMAKE_ARGS+= -DENABLE_CCACHE:BOOL=OFF \ >- -DENABLE_PRECOMPILED_HEADERS:BOOL=OFF \ >- -DENABLE_SOLUTION_FOLDERS:BOOL=OFF \ >- -DENABLE_PROFILING:BOOL=OFF \ >- -DENABLE_COVERAGE:BOOL=OFF \ >- -DENABLE_OMIT_FRAME_POINTER:BOOL=ON \ >- -DENABLE_POWERPC:BOOL=OFF \ >- -DENABLE_VSX:BOOL=OFF \ >- -DENABLE_FAST_MATH:BOOL=OFF \ >- -DENABLE_NEON:BOOL=OFF \ >- -DENABLE_VFPV3:BOOL=OFF \ >- -DENABLE_NOISY_WARNINGS:BOOL=OFF \ >- -DOPENCV_WARNINGS_ARE_ERRORS:BOOL=OFF \ >- -DENABLE_IMPL_COLLECTION:BOOL=OFF \ >- -DENABLE_INSTRUMENTATION:BOOL=OFF \ >- -DENABLE_GNU_STL_DEBUG:BOOL=OFF \ >- -DENABLE_BUILD_HARDENING:BOOL=OFF \ >- -DENABLE_LTO:BOOL=OFF \ >- -DGENERATE_ABI_DESCRIPTOR:BOOL=OFF \ >- -DCV_ENABLE_INTRINSICS:BOOL=ON \ >- -DCV_DISABLE_OPTIMIZATION:BOOL=OFF \ >- -DCV_TRACE:BOOL=OFF \ >- -DENABLE_PYLINT:BOOL=OFF >+CMAKE_OFF+= ENABLE_CCACHE ENABLE_FLAKE8 ENABLE_PYLINT >+CMAKE_ON+= ENABLE_OMIT_FRAME_POINTER >+ >+CMAKE_OFF+= WITH_VTK WITH_CAROTENE WITH_QUIRC \ >+ WITH_GTK WITH_QT WITH_OPENGL \ >+ WITH_VA WITH_ITT > > SUB_FILES= FindOpenCVCore.cmake > SUB_LIST= OCV_VERSION=${DISTVERSION} >@@ -151,21 +71,18 @@ OCV_MODS= apps calib3d contrib dnn features2d flann highgui \ > imgcodecs ml objdetect photo shape stitching \ > superres ts video videoio videostab > OCV_JAVA_MODS= java >-OCV_PYTHON_MODS= python${PYTHON_MAJOR_VER} >+OCV_PYTHON_MODS= python3 > >-OPTIONS_DEFINE= EXAMPLES EXTRA_MODULES OPENGL GTK2 >+OPTIONS_DEFINE= EXAMPLES EXTRA_MODULES > OPTIONS_GROUP= PERFORMANCE IMAGE VIDEO > OPTIONS_GROUP_PERFORMANCE= EIGEN3 OPENCL TBB > OPTIONS_GROUP_IMAGE= GDAL GDCM JASPER JPEG OPENEXR PNG TIFF WEBP >-OPTIONS_GROUP_VIDEO= ARAVIS DC1394 FFMPEG GPHOTO2 GSTREAMER MFX V4L XINE >-# EXTRA_MODULES required for libopencv_dnn which is required by py-opencv >+OPTIONS_GROUP_VIDEO= ARAVIS DC1394 FFMPEG GPHOTO2 GSTREAMER MFX V4L > OPTIONS_DEFAULT= EIGEN3 EXTRA_MODULES FFMPEG JASPER JPEG PNG TIFF WEBP V4L \ > ${MACHINE_CPU:tu} > OPTIONS_SUB= yes > .if defined(OCV_CORE) >-OPTIONS_EXCLUDE= ARAVIS DC1394 EXAMPLES EXTRA_MODULES FFMPEG \ >- GDAL GDCM GPHOTO2 GSTREAMER GTK2 JASPER JPEG \ >- OPENEXR OPENGL PNG TIFF WEBP V4L XINE >+OPTIONS_EXCLUDE= ${OPTIONS_GROUP_VIDEO} ${OPTIONS_GROUP_IMAGE} > .elif defined(OCV_SLAVE) > OPTIONS_EXCLUDE= EXAMPLES > .endif >@@ -174,7 +91,7 @@ DC1394_DESC= IEEE 1394 camera support > DC1394_LIB_DEPENDS= libdc1394.so:multimedia/libdc1394 > DC1394_CMAKE_BOOL= WITH_1394 > >-EXAMPLES_CMAKE_BOOL= INSTALL_C_EXAMPLES >+EXAMPLES_CMAKE_BOOL= BUILD_EXAMPLES > > PERFORMANCE_DESC= Performance enhancing libraries > >@@ -182,12 +99,12 @@ EIGEN3_DESC= Eigen 3 support > EIGEN3_USES= eigen:3 > EIGEN3_CMAKE_BOOL= WITH_EIGEN > >-OPENCL_DESC= OpenCL support >+OPENCL_LIB_DEPENDS= libOpenCL.so:devel/ocl-icd > OPENCL_BUILD_DEPENDS= opencl>=0:devel/opencl > OPENCL_RUN_DEPENDS= opencl>=0:devel/opencl > OPENCL_CMAKE_BOOL= WITH_OPENCL > >-TBB_DESC= TBB support >+TBB_DESC= Parallel processing support via TBB > TBB_LIB_DEPENDS= libtbb.so:devel/tbb > TBB_CMAKE_BOOL= WITH_TBB > >@@ -213,7 +130,8 @@ MFX_LIB_DEPENDS= libmfx.so:multimedia/intel-media-sdk \ > MFX_CONFIGURE_ENV= MFX_HOME="${LOCALBASE}" > MFX_CMAKE_BOOL= WITH_MFX > >-OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr >+OPENEXR_LIB_DEPENDS= libHalf.so:graphics/ilmbase \ >+ libIlmImf.so:graphics/openexr > OPENEXR_CMAKE_BOOL= WITH_OPENEXR > > PNG_LIB_DEPENDS= libpng.so:graphics/png >@@ -238,101 +156,87 @@ GPHOTO2_DESC= Gphoto2 camera support > GPHOTO2_LIB_DEPENDS= libgphoto2.so:graphics/libgphoto2 > GPHOTO2_CMAKE_BOOL= WITH_GPHOTO2 > >-GSTREAMER_USE= GSTREAMER1=yes >+GSTREAMER_USE= GSTREAMER1=yes GNOME=glib20 >+GSTREAMER_USES= gettext-runtime > GSTREAMER_CMAKE_BOOL= WITH_GSTREAMER > > V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat > V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l > V4L_CMAKE_BOOL= WITH_V4L WITH_LIBV4L >-V4L_CMAKE_ON= CMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include" >+V4L_CMAKE_ON= CMAKE_REQUIRED_INCLUDES:STRING=${LOCALBASE}/include > >-XINE_LIB_DEPENDS= libxine.so:multimedia/libxine >-XINE_CMAKE_BOOL= WITH_XINE >- >-EXTRA_MODULES_DESC= Extra modules >-EXTRA_MODULES_GH_ACCOUNT= tiny-dnn:extra_mod_3rdparty_tiny_dnn >+EXTRA_MODULES_DESC= Build OpenCV contrib modules > EXTRA_MODULES_GH_PROJECT= opencv_contrib:extra_mod \ >- tiny-dnn:extra_mod_3rdparty_tiny_dnn \ >- opencv_3rdparty:extra_mod_3rdparty_face_landmark_model \ > opencv_3rdparty:extra_mod_3rdparty_boost_descr \ >- opencv_3rdparty:extra_mod_3rdparty_vgg_descr >+ opencv_3rdparty:extra_mod_3rdparty_vgg_descr \ >+ opencv_3rdparty:extra_mod_face > EXTRA_MODULES_GH_TAGNAME= ${PORTVERSION}:extra_mod \ >- 2a2b50caa437a5964a61e45ffc83e70558e2bc68:extra_mod_3rdparty_tiny_dnn \ >- 8afa57abc8229d611c4937165d20e2a2d9fc5a12:extra_mod_3rdparty_face_landmark_model \ > 34e4206aef44d50e6bbcd0ab06354b52e7466d26:extra_mod_3rdparty_boost_descr \ >- fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d:extra_mod_3rdparty_vgg_descr >-EXTRA_MODULES_LIB_DEPENDS= libgflags.so:devel/gflags \ >- libglog.so:devel/glog \ >- libhdf5.so:science/hdf5 >-EXTRA_MODULES_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-modules_dnn__modern_CMakeLists.txt \ >- ${FILESDIR}/extra-patch-modules_sfm_src__libmv__light_libmv_numeric_numeric.h \ >- ${FILESDIR}/extra-patch-modules_stereo_src_descriptor.cpp >- >-OPENGL_DESC= OpenGL (requires GTK2) >-OPENGL_CMAKE_BOOL= WITH_OPENGL >-OPENGL_LIB_DEPENDS= ${PORT_OPTIONS:MGTK2:C,.+,libgtkglext-x11-1.0.so:x11-toolkits/gtkglext,} >- >-# GUI >- >-GTK2_USES= gnome >-GTK2_USE= GNOME=cairo,gdkpixbuf2,gtk20 >-GTK2_CMAKE_BOOL= WITH_GTK >-GTK2_LIB_DEPENDS= libfreetype.so:print/freetype2 \ >- libharfbuzz.so:print/harfbuzz \ >- libsz.so:science/szip \ >- libfontconfig.so:x11-fonts/fontconfig \ >- liblept.so:graphics/leptonica >- >+ fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d:extra_mod_3rdparty_vgg_descr \ >+ 8afa57abc8229d611c4937165d20e2a2d9fc5a12:extra_mod_face >+EXTRA_MODULES_CMAKE_BOOL_OFF= BUILD_opencv_matlab >+EXTRA_MODULES_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-modules_sfm_src__libmv__light_libmv_numeric_numeric.h \ >+ ${FILESDIR}/extra-patch-modules_sfm_src_libmv__light_libmv_numeric_numeric.cc \ >+ ${FILESDIR}/extra-patch-modules_xobjdetect_tools_waldboost__detector_CMakeLists.txt >+EXTRA_MODULES_LIB_DEPENDS= libfreetype.so:print/freetype2 \ >+ libharfbuzz.so:print/harfbuzz \ >+ libsz.so:science/szip >+EXTRA_MODULES_WRKSRC= ${WRKDIR}/${PORTNAME}_contrib-${PORTVERSION}/ >+EXTRA_MODULES_VARS= LDFLAGS+=-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} \ >+ LDFLAGS+=${LOCALBASE}/lib/gcc${GCC_DEFAULT}/libgcc_s.so >+EXTRA_MODULES_CMAKE_ARGS= -DCMAKE_INSTALL_RPATH=${LOCALBASE}/lib;${LOCALBASE}/lib/gcc${GCC_DEFAULT} >+EXTRA_MODULES_BUILD_DEPENDS= ${LOCALBASE}/lib/gcc${GCC_DEFAULT}/libgcc_s.so:lang/gcc${GCC_DEFAULT} >+EXTRA_MODULES_RUN_DEPENDS= ${LOCALBASE}/lib/gcc${GCC_DEFAULT}/libgcc_s.so:lang/gcc${GCC_DEFAULT} >+ >+OCV_LIBDIR= ${LOCALBASE}/lib > .if defined(OCV_CORE) >-. for module in ${OCV_MODS} ${OCV_JAVA_MODS} ${OCV_PYTHON_MODS} >-CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=OFF >-. endfor >+. for module in ${OCV_MODS} ${OCV_JAVA_MODS} ${OCV_PYTHON_MODS} >+CMAKE_OFF+= BUILD_opencv_${module} >+. endfor > .elif defined(OCV_PYTHON) >-LIB_DEPENDS+= libopencv_core.so:graphics/opencv-core \ >- libopencv_imgproc.so:graphics/opencv-core \ >- libopencv_ml.so:graphics/opencv >+_PYTHON_FEATURE_FLAVORS= yes > BUILD_DEPENDS+= ${PYNUMPY} > RUN_DEPENDS+= ${PYNUMPY} >-USES+= python >+RUN_DEPENDS+= ${OCV_LIBDIR}/libopencv_ml.so.${DISTVERSION}:graphics/opencv >+USES+= python:3.6+ > USE_PYTHON= flavors >-CMAKE_ARGS+= -DBUILD_opencv_python${PYTHON_MAJOR_VER}:BOOL=ON >-. for module in apps java stitching superres videostab >-CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=OFF >-. endfor >-INSTALL_WRKSRC= ${WRKDIR}/.build/modules/python${PYTHON_MAJOR_VER} >+CMAKE_ON+= BUILD_opencv_python3 >+. for module in apps java stitching superres videostab >+CMAKE_OFF+= BUILD_opencv_${module} >+. endfor >+INSTALL_WRKSRC= ${CONFIGURE_WRKSRC}/modules/python3 >+EXAMPLES_CMAKE_BOOL+= INSTALL_PYTHON_EXAMPLES >+ > .elif defined(OCV_JAVA) > BUILD_DEPENDS+= ant:devel/apache-ant >-LIB_DEPENDS+= libopencv_ml.so:graphics/opencv > USES+= python:build > USE_JAVA= yes >-CMAKE_ARGS+= -DBUILD_opencv_java:BOOL=ON >-. for module in apps python stitching superres videostab >-CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=OFF >-. endfor >+CMAKE_ON+= BUILD_opencv_java \ >+ BUILD_JAVA >+. for module in apps js python3 shape stitching superres ts \ >+ videostab viz >+CMAKE_OFF+= BUILD_opencv_${module} >+. endfor > CONFIGURE_ENV+= JAVA_HOME="${JAVA_HOME}" >-INSTALL_WRKSRC= ${WRKDIR}/.build/modules/java >+INSTALL_WRKSRC= ${CONFIGURE_WRKSRC}/modules/java >+ > .else >-LIB_DEPENDS+= libopencv_core.so:graphics/opencv-core >-. for module in ${OCV_JAVA_MODS} ${OCV_PYTHON_MODS} >-CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=OFF >-. endfor >+EXAMPLES_CMAKE_BOOL+= INSTALL_C_EXAMPLES >+. for module in ${OCV_JAVA_MODS} ${OCV_PYTHON_MODS} >+CMAKE_OFF+= BUILD_opencv_${module} >+. endfor > .endif > > .if !defined(OCV_JAVA) >-CMAKE_ARGS+= -DBUILD_JAVA:BOOL=OFF >+CMAKE_OFF+= BUILD_JAVA > .endif > > post-extract-EXTRA_MODULES-on: >- @${MV} ${WRKSRC_extra_mod}/doc/tutorials/* ${WRKSRC}/doc/tutorials/ >- @${MV} ${WRKSRC_extra_mod}/modules/* ${WRKSRC}/modules/ >- @${CP} -RpP ${WRKSRC_extra_mod}/samples/* ${WRKSRC}/samples/ >- @${MKDIR} ${CONFIGURE_WRKSRC}/3rdparty/tinydnn/tiny-dnn-1.0.0a3/ >- @${MV} ${WRKSRC_extra_mod_3rdparty_tiny_dnn}/* ${CONFIGURE_WRKSRC}/3rdparty/tinydnn/tiny-dnn-1.0.0a3/ >- @${MKDIR} ${CONFIGURE_WRKSRC}/share/OpenCV/testdata/cv/face/ >- @${MV} ${WRKSRC_extra_mod_3rdparty_face_landmark_model}/* ${CONFIGURE_WRKSRC}/share/OpenCV/testdata/cv/face/ >- @${MKDIR} ${CONFIGURE_WRKSRC}/downloads/xfeatures2d/ >+ @${MKDIR} ${CONFIGURE_WRKSRC}/downloads/xfeatures2d > @${MV} ${WRKSRC_extra_mod_3rdparty_boost_descr}/* ${CONFIGURE_WRKSRC}/downloads/xfeatures2d/ > @${MV} ${WRKSRC_extra_mod_3rdparty_vgg_descr}/* ${CONFIGURE_WRKSRC}/downloads/xfeatures2d/ >+ @${MKDIR} ${CONFIGURE_WRKSRC}/share/OpenCV/testdata/cv/face >+ @${MV} ${WRKSRC_extra_mod_face}/* ${CONFIGURE_WRKSRC}/share/OpenCV/testdata/cv/face/ > > post-patch: > @${REINPLACE_CMD} -e '/pkgconfig/s|$${OPENCV_LIB_INSTALL_PATH}|libdata|' \ >@@ -342,36 +246,45 @@ post-patch: > @${REINPLACE_CMD} -e 's|share/OpenCV/doc|${DOCSDIR_REL}|g' \ > -e 's|share/OpenCV/samples|${EXAMPLESDIR_REL}|g' \ > ${WRKSRC}/CMakeLists.txt >- @${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' \ >- ${WRKSRC}/modules/dnn/src/torch/THGeneral.cpp > .if defined(OCV_CORE) > @${REINPLACE_CMD} -e 's|opencv.pc|opencv-core.pc|g' \ > ${WRKSRC}/cmake/OpenCVGenPkgconfig.cmake > @${REINPLACE_CMD} -e 's|Name:.*|Name: OpenCV-core|' \ > ${WRKSRC}/cmake/templates/opencv-XXX.pc.in >-.endif >-.if defined(OCV_SLAVE) >+.elif defined(OCV_SLAVE) > @${REINPLACE_CMD} -e 's|add_subdirectory(data)||g' \ > ${WRKSRC}/CMakeLists.txt > .endif > @${FIND} ${WRKSRC} -name '*.bak' -exec ${RM} {} \; > >-pre-build: >- protoc --proto_path=${WRKSRC}/modules/dnn/src/caffe/ --cpp_out=${WRKSRC}/modules/dnn/misc/caffe/ ${WRKSRC}/modules/dnn/src/caffe/*.proto >- protoc --proto_path=${WRKSRC}/modules/dnn/src/tensorflow/ --cpp_out=${WRKSRC}/modules/dnn/misc/tensorflow/ ${WRKSRC}/modules/dnn/src/tensorflow/*.proto >- > post-install: > .if !defined(OCV_SLAVE) > (cd ${STAGEDIR}${PREFIX} && \ >- ${RM} -r include/opencv2/core include/opencv2/core.hpp include/opencv2/imgproc \ >+ ${RM} -r include/opencv2/core \ >+ include/opencv2/core.hpp \ >+ include/opencv2/imgproc \ > include/opencv2/imgproc.hpp \ >- include/opencv2/cvconfig.h lib/libopencv_core* lib/libopencv_imgproc*) >+ include/opencv2/cvconfig.h \ >+ include/opencv/cvwimage.h \ >+ include/opencv/cxcore.h \ >+ include/opencv/cxcore.hpp \ >+ include/opencv/cxeigen.hpp \ >+ include/opencv/cxmisc.h \ >+ lib/libopencv_core* \ >+ lib/libopencv_imgproc*) > .endif > .if defined(OCV_CORE) >- ${RM} -r ${STAGEDIR}${PREFIX}/include/opencv >+ (cd ${STAGEDIR}${PREFIX} && \ >+ ${RM} include/opencv/cv.h \ >+ include/opencv/cv.hpp \ >+ include/opencv/cvaux.h \ >+ include/opencv/cvaux.hpp \ >+ include/opencv/highgui.h \ >+ include/opencv/ml.h ) > ${RM} -r ${STAGEDIR}${DATADIR} > ${MKDIR} ${STAGEDIR}${PREFIX}/share/cmake/Modules >- ${INSTALL_DATA} ${WRKDIR}/FindOpenCVCore.cmake ${STAGEDIR}${PREFIX}/share/cmake/Modules >+ ${INSTALL_DATA} ${WRKDIR}/FindOpenCVCore.cmake \ >+ ${STAGEDIR}${PREFIX}/share/cmake/Modules/ > .endif > .if defined(OCV_PYTHON) > (cd ${STAGEDIR}${PREFIX} && \ >@@ -383,6 +296,8 @@ post-install: > cd ${WRKSRC}/samples/python && \ > ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/python > .endif >+ >+post-install-EXAMPLES-on: > .if defined(OCV_JAVA) > ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} > cd ${WRKSRC}/samples/java && \ >@@ -391,10 +306,8 @@ post-install: > > .include <bsd.port.pre.mk> > >-.if !defined(OCV_CORE) >-.if (${OPSYS} == FreeBSD && ${OSVERSION} < 1200000) >-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-modules_sfm_src_libmv__light_libmv_numeric_numeric.cc >-.endif >+.if ${PORT_OPTIONS:MEXTRA_MODULES} && !defined(OCV_CORE) >+CMAKE_ARGS+= -DOPENCV_EXTRA_MODULES_PATH=${WRKDIR}/opencv_contrib-${PORTVERSION}/modules > .endif > > .include <bsd.port.post.mk> >diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo >index c27031efb0c3..3665e7766484 100644 >--- a/graphics/opencv/distinfo >+++ b/graphics/opencv/distinfo >@@ -1,13 +1,11 @@ >-TIMESTAMP = 1524780757 >-SHA256 (opencv-opencv-3.4.1_GH0.tar.gz) = f1b87684d75496a1054405ae3ee0b6573acaf3dad39eaf4f1d66fdd7e03dc852 >-SIZE (opencv-opencv-3.4.1_GH0.tar.gz) = 87051748 >-SHA256 (tiny-dnn-tiny-dnn-2a2b50caa437a5964a61e45ffc83e70558e2bc68_GH0.tar.gz) = 03ff06b154a1a6a0f53d6f24a128727e533355d68164c509303e2da14062e97f >-SIZE (tiny-dnn-tiny-dnn-2a2b50caa437a5964a61e45ffc83e70558e2bc68_GH0.tar.gz) = 12885594 >-SHA256 (opencv-opencv_contrib-3.4.1_GH0.tar.gz) = 298c69ee006d7675e1ff9d371ba8b0d9e7e88374bb7ba0f9d0789851d352ec6e >-SIZE (opencv-opencv_contrib-3.4.1_GH0.tar.gz) = 57126844 >-SHA256 (opencv-opencv_3rdparty-8afa57abc8229d611c4937165d20e2a2d9fc5a12_GH0.tar.gz) = 0ae1f2d2a619ab177d96024e253e142d15dea27236510aaf1a65c7b529ee6677 >-SIZE (opencv-opencv_3rdparty-8afa57abc8229d611c4937165d20e2a2d9fc5a12_GH0.tar.gz) = 63301261 >+TIMESTAMP = 1607099691 >+SHA256 (opencv-opencv-3.4.7_GH0.tar.gz) = ea743896a604a6ba1e1c1651ad42c97d0f90165debe9940811c7e0bdaa307526 >+SIZE (opencv-opencv-3.4.7_GH0.tar.gz) = 88350165 >+SHA256 (opencv-opencv_contrib-3.4.7_GH0.tar.gz) = 5e3ba5fbe0ff3ab7462d42c08501f8c15d3e46b0684aee281f735345e1353cb4 >+SIZE (opencv-opencv_contrib-3.4.7_GH0.tar.gz) = 57303405 > SHA256 (opencv-opencv_3rdparty-34e4206aef44d50e6bbcd0ab06354b52e7466d26_GH0.tar.gz) = d93c783cdf799da7e4a9209d169390424c4c198c1c9b5eeb78ffc890afe5f332 > SIZE (opencv-opencv_3rdparty-34e4206aef44d50e6bbcd0ab06354b52e7466d26_GH0.tar.gz) = 397901 > SHA256 (opencv-opencv_3rdparty-fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d_GH0.tar.gz) = e9abccbabcace092e5424073168cc86d422585d15d25569f01fb6503b109e0e1 > SIZE (opencv-opencv_3rdparty-fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d_GH0.tar.gz) = 1470898 >+SHA256 (opencv-opencv_3rdparty-8afa57abc8229d611c4937165d20e2a2d9fc5a12_GH0.tar.gz) = 0ae1f2d2a619ab177d96024e253e142d15dea27236510aaf1a65c7b529ee6677 >+SIZE (opencv-opencv_3rdparty-8afa57abc8229d611c4937165d20e2a2d9fc5a12_GH0.tar.gz) = 63301261 >diff --git a/graphics/opencv/files/extra-patch-modules_dnn__modern_CMakeLists.txt b/graphics/opencv/files/extra-patch-modules_dnn__modern_CMakeLists.txt >deleted file mode 100644 >index cd478f415543..000000000000 >--- a/graphics/opencv/files/extra-patch-modules_dnn__modern_CMakeLists.txt >+++ /dev/null >@@ -1,37 +0,0 @@ >---- modules/dnn_modern/CMakeLists.txt.orig 2017-12-22 19:15:17.000000000 +0300 >-+++ modules/dnn_modern/CMakeLists.txt 2018-01-17 02:29:23.382430000 +0300 >-@@ -15,20 +15,20 @@ >- >- set(TINY_DNN_CPP_PATH "${OpenCV_BINARY_DIR}/3rdparty/tinydnn") >- set(TINY_DNN_CPP_ROOT "${TINY_DNN_CPP_PATH}/tiny-dnn-1.0.0a3") >--ocv_download(FILENAME "v1.0.0a3.tar.gz" >-- HASH "adb1c512e09ca2c7a6faef36f9c53e59" >-- URL >-- "${OPENCV_TINY_DNN_URL}" >-- "$ENV{OPENCV_TINY_DNN_URL}" >-- "https://github.com/tiny-dnn/tiny-dnn/archive/" >-- DESTINATION_DIR "${TINY_DNN_CPP_PATH}" >-- STATUS TINY_DNN_DOWNLOAD_SUCCESS >-- ID "tiny-dnn" >-- UNPACK RELATIVE_URL) >-- >--if(NOT TINY_DNN_DOWNLOAD_SUCCESS) >-- message(STATUS "Failed to download tiny-dnn sources") >--endif() >-+#ocv_download(FILENAME "v1.0.0a3.tar.gz" >-+# HASH "adb1c512e09ca2c7a6faef36f9c53e59" >-+# URL >-+# "${OPENCV_TINY_DNN_URL}" >-+# "$ENV{OPENCV_TINY_DNN_URL}" >-+# "https://github.com/tiny-dnn/tiny-dnn/archive/" >-+# DESTINATION_DIR "${TINY_DNN_CPP_PATH}" >-+# STATUS TINY_DNN_DOWNLOAD_SUCCESS >-+# ID "tiny-dnn" >-+# UNPACK RELATIVE_URL) >-+# >-+#if(NOT TINY_DNN_DOWNLOAD_SUCCESS) >-+# message(STATUS "Failed to download tiny-dnn sources") >-+#endif() >- >- find_package(TinyDNN QUIET) >- >diff --git a/graphics/opencv/files/extra-patch-modules_sfm_CMakeLists.txt b/graphics/opencv/files/extra-patch-modules_sfm_CMakeLists.txt >deleted file mode 100644 >index c2fa1ba870a5..000000000000 >--- a/graphics/opencv/files/extra-patch-modules_sfm_CMakeLists.txt >+++ /dev/null >@@ -1,40 +0,0 @@ >---- modules/sfm/CMakeLists.txt.orig 2015-12-17 20:11:31.000000000 +0300 >-+++ modules/sfm/CMakeLists.txt 2016-10-10 18:28:05.556797000 +0300 >-@@ -1,25 +1,30 @@ >- set(the_description "SFM algorithms") >-+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) >- >- >- ### LIBMV LIGHT EXTERNAL DEPENDENCIES ### >- >- find_package(Gflags QUIET) >--find_package(Ceres QUIET) >--if(NOT Ceres_FOUND) # Looks like Ceres find glog on the own, so separate search isn't necessary >-+#find_package(Ceres QUIET) >-+#if(NOT Ceres_FOUND) # Looks like Ceres find glog on the own, so separate search isn't necessary >- find_package(Glog QUIET) >--endif() >-+#endif() >- >- if((gflags_FOUND OR GFLAGS_FOUND) AND (glog_FOUND OR GLOG_FOUND)) >- set(_fname "${CMAKE_CURRENT_BINARY_DIR}/test_sfm_deps.cpp") >- file(WRITE "${_fname}" "#include <glog/logging.h>\n#include <gflags/gflags.h>\nint main() { (void)(0); return 0; }\n") >-- try_compile(SFM_DEPS_OK "${CMAKE_BINARY_DIR}" "${_fname}" >-- CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${GLOG_INCLUDE_DIRS};${GFLAGS_INCLUDE_DIRS}" >-- LINK_LIBRARIES ${GLOG_LIBRARIES} ${GFLAGS_LIBRARIES} >-- OUTPUT_VARIABLE OUTPUT >-+ try_compile(SFM_DEPS_OK "${CMAKE_CURRENT_BINARY_DIR}" "${_fname}" >-+ CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${GLOG_INCLUDE_DIRS};${GFLAGS_INCLUDE_DIRS} -DLINK_LIBRARIES:STRING=${GLOG_LIBRARIES};${GFLAGS_LIBRARIES}" >- ) >- file(REMOVE "${_fname}") >- message(STATUS "Checking SFM deps... ${SFM_DEPS_OK}") >- else() >-+ if(NOT gflags_FOUND AND NOT GFLAGS_FOUND) >-+ message(STATUS "gflags not found") >-+ endif() >-+ if(NOT glog_FOUND AND NOT GLOG_FOUND) >-+ message(STATUS "glog not found") >-+ endif() >- set(SFM_DEPS_OK FALSE) >- endif() >- >diff --git a/graphics/opencv/files/extra-patch-modules_sfm_src__libmv__light_libmv_numeric_numeric.h b/graphics/opencv/files/extra-patch-modules_sfm_src__libmv__light_libmv_numeric_numeric.h >index 6ba8d996322c..fa6e9025cc64 100644 >--- a/graphics/opencv/files/extra-patch-modules_sfm_src__libmv__light_libmv_numeric_numeric.h >+++ b/graphics/opencv/files/extra-patch-modules_sfm_src__libmv__light_libmv_numeric_numeric.h >@@ -1,5 +1,5 @@ >---- modules/sfm/src/libmv_light/libmv/numeric/numeric.h.orig 2017-12-22 19:15:17.000000000 +0300 >-+++ modules/sfm/src/libmv_light/libmv/numeric/numeric.h 2018-01-15 01:06:23.742535000 +0300 >+--- ../opencv_contrib-3.4.7/modules/sfm/src/libmv_light/libmv/numeric/numeric.h.orig 2017-12-22 19:15:17.000000000 +0300 >++++ ../opencv_contrib-3.4.7/modules/sfm/src/libmv_light/libmv/numeric/numeric.h 2018-01-15 01:06:23.742535000 +0300 > @@ -35,7 +35,7 @@ > > #if !defined(__MINGW64__) >diff --git a/graphics/opencv/files/extra-patch-modules_sfm_src_libmv__light_libmv_numeric_numeric.cc b/graphics/opencv/files/extra-patch-modules_sfm_src_libmv__light_libmv_numeric_numeric.cc >index 6e94e48d9660..9ab583d657cd 100644 >--- a/graphics/opencv/files/extra-patch-modules_sfm_src_libmv__light_libmv_numeric_numeric.cc >+++ b/graphics/opencv/files/extra-patch-modules_sfm_src_libmv__light_libmv_numeric_numeric.cc >@@ -1,5 +1,5 @@ >---- modules/sfm/src/libmv_light/libmv/numeric/numeric.cc.orig 2018-04-27 13:11:58.957812000 +0000 >-+++ modules/sfm/src/libmv_light/libmv/numeric/numeric.cc 2018-04-27 15:52:13.702374000 +0000 >+--- ../opencv_contrib-3.4.7/modules/sfm/src/libmv_light/libmv/numeric/numeric.cc.orig 2018-04-27 13:11:58.957812000 +0000 >++++ ../opencv_contrib-3.4.7/modules/sfm/src/libmv_light/libmv/numeric/numeric.cc 2018-04-27 15:52:13.702374000 +0000 > @@ -24,8 +24,8 @@ > namespace libmv { > >diff --git a/graphics/opencv/files/extra-patch-modules_stereo_src_descriptor.cpp b/graphics/opencv/files/extra-patch-modules_stereo_src_descriptor.cpp >deleted file mode 100644 >index 49805ec35396..000000000000 >--- a/graphics/opencv/files/extra-patch-modules_stereo_src_descriptor.cpp >+++ /dev/null >@@ -1,15 +0,0 @@ >-https://github.com/opencv/opencv_contrib/commit/4e10bc5dae62 >- >---- modules/stereo/src/descriptor.cpp.orig 2018-02-22 13:38:31 UTC >-+++ modules/stereo/src/descriptor.cpp >-@@ -226,8 +226,8 @@ namespace cv >- //integral image computation used in the Mean Variation Census Transform >- void imageMeanKernelSize(const Mat &image, int windowSize, Mat &cost) >- { >-- CV_Assert(image.size > 0); >-- CV_Assert(cost.size > 0); >-+ CV_Assert(!image.empty()); >-+ CV_Assert(!cost.empty()); >- CV_Assert(windowSize % 2 != 0); >- int win = windowSize / 2; >- float scalling = ((float) 1) / (windowSize * windowSize); >diff --git a/graphics/opencv/files/extra-patch-modules_xobjdetect_tools_waldboost__detector_CMakeLists.txt b/graphics/opencv/files/extra-patch-modules_xobjdetect_tools_waldboost__detector_CMakeLists.txt >new file mode 100644 >index 000000000000..8ef247643f58 >--- /dev/null >+++ b/graphics/opencv/files/extra-patch-modules_xobjdetect_tools_waldboost__detector_CMakeLists.txt >@@ -0,0 +1,8 @@ >+--- ../opencv_contrib-3.4.7/modules/xobjdetect/tools/waldboost_detector/CMakeLists.txt.orig 2019-04-06 09:23:17.688837000 +0000 >++++ ../opencv_contrib-3.4.7/modules/xobjdetect/tools/waldboost_detector/CMakeLists.txt 2019-04-06 09:23:34.896963000 +0000 >+@@ -31,4 +31,4 @@ >+ set_target_properties(${the_target} PROPERTIES FOLDER "applications") >+ endif() >+ >+-install(TARGETS ${the_target} OPTIONAL RUNTIME DESTINATION bin COMPONENT main) >++install(TARGETS ${the_target} OPTIONAL RUNTIME DESTINATION bin COMPONENT main) >diff --git a/graphics/opencv/files/patch-modules_core_include_opencv2_core_cv__cpu__dispatch.h b/graphics/opencv/files/patch-modules_core_include_opencv2_core_cv__cpu__dispatch.h >index 72ac65b848ae..6ba57e8f93b1 100644 >--- a/graphics/opencv/files/patch-modules_core_include_opencv2_core_cv__cpu__dispatch.h >+++ b/graphics/opencv/files/patch-modules_core_include_opencv2_core_cv__cpu__dispatch.h >@@ -1,26 +1,11 @@ > --- modules/core/include/opencv2/core/cv_cpu_dispatch.h.orig 2020-10-23 01:17:26 UTC > +++ modules/core/include/opencv2/core/cv_cpu_dispatch.h >-@@ -108,10 +108,10 @@ >- #endif >- >- #if defined(__VSX__) && defined(__PPC64__) && defined(__LITTLE_ENDIAN__) >+@@ -112 +111,0 @@ > -# include <altivec.h> >- # undef vector >- # undef pixel >- # undef bool >+@@ -115,0 +115 @@ > +# include <altivec.h> >- # define CV_VSX 1 >- #endif >- >-@@ -152,10 +152,10 @@ struct VZeroUpperGuard { >- # include <arm_neon.h> >- # define CV_NEON 1 >- #elif defined(__VSX__) && defined(__PPC64__) && defined(__LITTLE_ENDIAN__) >+@@ -164 +163,0 @@ struct VZeroUpperGuard { > -# include <altivec.h> >- # undef vector >- # undef pixel >- # undef bool >+@@ -167,0 +167 @@ struct VZeroUpperGuard { > +# include <altivec.h> >- # define CV_VSX 1 >- #endif > >diff --git a/graphics/opencv/files/patch-modules_core_include_opencv2_core_cvdef.h b/graphics/opencv/files/patch-modules_core_include_opencv2_core_cvdef.h >deleted file mode 100644 >index 0713c9c42675..000000000000 >--- a/graphics/opencv/files/patch-modules_core_include_opencv2_core_cvdef.h >+++ /dev/null >@@ -1,20 +0,0 @@ >---- modules/core/include/opencv2/core/cvdef.h.orig 2018-02-23 08:38:33 UTC >-+++ modules/core/include/opencv2/core/cvdef.h >-@@ -452,6 +452,7 @@ Cv64suf; >- # endif >- #endif >- >-+#if defined __cplusplus >- >- // Integer types portatibility >- #ifdef OPENCV_STDINT_HEADER >-@@ -493,6 +494,9 @@ typedef ::int64_t int64_t; >- typedef ::uint64_t uint64_t; >- } >- #endif >-+#endif >-+#else >-+#include <stdint.h> >- #endif >- >- >diff --git a/graphics/opencv/files/patch-modules_core_include_opencv2_core_types__c.h b/graphics/opencv/files/patch-modules_core_include_opencv2_core_types__c.h >deleted file mode 100644 >index 1970421b4437..000000000000 >--- a/graphics/opencv/files/patch-modules_core_include_opencv2_core_types__c.h >+++ /dev/null >@@ -1,49 +0,0 @@ >---- modules/core/include/opencv2/core/types_c.h.orig 2018-02-23 08:38:33 UTC >-+++ modules/core/include/opencv2/core/types_c.h >-@@ -63,6 +63,7 @@ >- #include <stdlib.h> >- #include <string.h> >- #include <float.h> >-+#include <math.h> >- #endif // SKIP_INCLUDES >- >- #if defined _WIN32 >-@@ -196,6 +197,38 @@ enum { >- >- #define cvInvSqrt(value) ((float)(1./sqrt(value))) >- #define cvSqrt(value) ((float)sqrt(value)) >-+ >-+#ifndef __cplusplus >-+CV_INLINE int cvRound(float value) >-+{ >-+#if ((defined _MSC_VER && defined _M_X64) || ((defined __GNUC__ || defined __clang__) && defined __x86_64__ && \ >-+ defined __SSE2__ && !defined __APPLE__)) && !defined(__CUDACC__) >-+ __m128 t = _mm_set_ss( value ); >-+ return _mm_cvtss_si32(t); >-+#elif defined _MSC_VER && defined _M_IX86 >-+ int t; >-+ __asm >-+ { >-+ fld value; >-+ fistp t; >-+ } >-+ return t; >-+#elif ((defined _MSC_VER && defined _M_ARM) || defined CV_ICC || \ >-+ defined __GNUC__ || defined __clang__) && defined HAVE_TEGRA_OPTIMIZATION >-+ TEGRA_ROUND_FLT(value); >-+#elif defined CV_ICC || defined __GNUC__ || defined __clang__ >-+# if CV_VFP >-+ ARM_ROUND_FLT(value); >-+# else >-+ return (int)lrintf(value); >-+# endif >-+#else >-+ /* it's ok if round does not comply with IEEE754 standard; >-+ the tests should allow +/-1 difference when the tested functions use round */ >-+ return (int)(value + (value >= 0 ? 0.5f : -0.5f)); >-+#endif >-+} >-+#endif >- >- >- /*************** Random number generation *******************/ >diff --git a/graphics/opencv/files/patch-modules_core_src_utils_filesystem.cpp b/graphics/opencv/files/patch-modules_core_src_utils_filesystem.cpp >deleted file mode 100644 >index a835bdf8abc7..000000000000 >--- a/graphics/opencv/files/patch-modules_core_src_utils_filesystem.cpp >+++ /dev/null >@@ -1,47 +0,0 @@ >---- modules/core/src/utils/filesystem.cpp.orig 2017-12-22 22:46:21.000000000 +0300 >-+++ modules/core/src/utils/filesystem.cpp 2018-01-14 12:05:05.454427000 +0300 >-@@ -33,7 +33,7 @@ >- #include <errno.h> >- #include <io.h> >- #include <stdio.h> >--#elif defined __linux__ || defined __APPLE__ >-+#elif defined __linux__ || defined __APPLE__ || defined(__FreeBSD__) >- #include <sys/types.h> >- #include <sys/stat.h> >- #include <fcntl.h> >-@@ -156,7 +156,7 @@ >- sz = GetCurrentDirectoryA((DWORD)buf.size(), (char*)buf); >- return cv::String((char*)buf, (size_t)sz); >- #endif >--#elif defined __linux__ || defined __APPLE__ >-+#elif defined __linux__ || defined __APPLE__ || defined(__FreeBSD__) >- for(;;) >- { >- char* p = ::getcwd((char*)buf, buf.size()); >-@@ -190,7 +190,7 @@ >- #else >- int result = _mkdir(path.c_str()); >- #endif >--#elif defined __linux__ || defined __APPLE__ >-+#elif defined __linux__ || defined __APPLE__ || defined(__FreeBSD__) >- int result = mkdir(path.c_str(), 0777); >- #else >- int result = -1; >-@@ -305,7 +305,7 @@ >- Impl& operator=(const Impl&); // disabled >- }; >- >--#elif defined __linux__ || defined __APPLE__ >-+#elif defined __linux__ || defined __APPLE__ || defined(__FreeBSD__) >- >- struct FileLock::Impl >- { >-@@ -408,7 +408,7 @@ >- } >- #elif defined __ANDROID__ >- // no defaults >--#elif defined __APPLE__ >-+#elif defined __APPLE__ || defined(__FreeBSD__) >- const char* tmpdir_env = getenv("TMPDIR"); >- if (tmpdir_env && utils::fs::isDirectory(tmpdir_env)) >- { >diff --git a/graphics/opencv/files/patch-modules_highgui_include_opencv2_highgui_highgui__c.h b/graphics/opencv/files/patch-modules_highgui_include_opencv2_highgui_highgui__c.h >deleted file mode 100644 >index 026268502290..000000000000 >--- a/graphics/opencv/files/patch-modules_highgui_include_opencv2_highgui_highgui__c.h >+++ /dev/null >@@ -1,11 +0,0 @@ >---- ./modules/highgui/include/opencv2/highgui/highgui_c.h.orig 2018-05-02 14:30:32.736476000 -0400 >-+++ ./modules/highgui/include/opencv2/highgui/highgui_c.h 2018-05-02 14:33:46.169249000 -0400 >-@@ -136,7 +136,7 @@ CVAPI(void) cvSetWindowProperty(const char* name, int >- CVAPI(double) cvGetWindowProperty(const char* name, int prop_id); >- >- /* Get window image rectangle coordinates, width and height */ >--CVAPI(cv::Rect)cvGetWindowImageRect(const char* name); >-+CVAPI(CvRect)cvGetWindowImageRect(const char* name); >- >- /* display image within window (highgui windows remember their content) */ >- CVAPI(void) cvShowImage( const char* name, const CvArr* image ); >diff --git a/graphics/opencv/files/patch-modules_highgui_src_window.cpp b/graphics/opencv/files/patch-modules_highgui_src_window.cpp >deleted file mode 100644 >index 241840e3edb0..000000000000 >--- a/graphics/opencv/files/patch-modules_highgui_src_window.cpp >+++ /dev/null >@@ -1,11 +0,0 @@ >---- ./modules/highgui/src/window.cpp.orig 2018-05-02 14:34:06.721814000 -0400 >-+++ ./modules/highgui/src/window.cpp 2018-05-02 14:34:25.980873000 -0400 >-@@ -165,7 +165,7 @@ CV_IMPL double cvGetWindowProperty(const char* name, i >- } >- } >- >--cv::Rect cvGetWindowImageRect(const char* name) >-+CvRect cvGetWindowImageRect(const char* name) >- { >- if (!name) >- return cv::Rect(-1, -1, -1, -1); >diff --git a/graphics/opencv/files/patch-modules_highgui_src_window__gtk.cpp b/graphics/opencv/files/patch-modules_highgui_src_window__gtk.cpp >index 114c824b815a..46aae2fd55b5 100644 >--- a/graphics/opencv/files/patch-modules_highgui_src_window__gtk.cpp >+++ b/graphics/opencv/files/patch-modules_highgui_src_window__gtk.cpp >@@ -1,6 +1,6 @@ >---- modules/highgui/src/window_gtk.cpp.orig 2016-12-23 12:54:44 UTC >+--- modules/highgui/src/window_gtk.cpp.orig 2018-12-21 14:31:20 UTC > +++ modules/highgui/src/window_gtk.cpp >-@@ -46,10 +46,12 @@ >+@@ -45,10 +45,12 @@ > > #if defined (HAVE_GTK) > >diff --git a/graphics/opencv/files/patch-modules_python_src2_cv2.cpp b/graphics/opencv/files/patch-modules_python_src2_cv2.cpp >deleted file mode 100644 >index c2727519aaac..000000000000 >--- a/graphics/opencv/files/patch-modules_python_src2_cv2.cpp >+++ /dev/null >@@ -1,11 +0,0 @@ >---- modules/python/src2/cv2.cpp.orig 2018-02-23 08:38:33 UTC >-+++ modules/python/src2/cv2.cpp >-@@ -886,7 +886,7 @@ bool pyopencv_to(PyObject* obj, String& value, const c >- (void)name; >- if(!obj || obj == Py_None) >- return true; >-- char* str = PyString_AsString(obj); >-+ const char* str = PyString_AsString(obj); >- if(!str) >- return false; >- value = String(str); >diff --git a/graphics/opencv/files/patch-modules_videoio_src_cap__libv4l.cpp b/graphics/opencv/files/patch-modules_videoio_src_cap__libv4l.cpp >index 4744276df79c..dd7f78c0f266 100644 >--- a/graphics/opencv/files/patch-modules_videoio_src_cap__libv4l.cpp >+++ b/graphics/opencv/files/patch-modules_videoio_src_cap__libv4l.cpp >@@ -1,4 +1,4 @@ >---- modules/videoio/src/cap_libv4l.cpp.orig 2016-12-23 12:54:44 UTC >+--- modules/videoio/src/cap_libv4l.cpp.orig 2018-12-21 14:31:20 UTC > +++ modules/videoio/src/cap_libv4l.cpp > @@ -251,7 +251,9 @@ make & enjoy! > #include <sys/mman.h> >@@ -29,7 +29,7 @@ > } v4l2_ctrl_range; > > typedef struct CvCaptureCAM_V4L >-@@ -542,7 +544,7 @@ static void v4l2_add_ctrl_range(CvCaptur >+@@ -543,7 +545,7 @@ static void v4l2_add_ctrl_range(CvCaptureCAM_V4L* capt > capture->v4l2_ctrl_ranges = (v4l2_ctrl_range**)realloc((v4l2_ctrl_range**)capture->v4l2_ctrl_ranges, (capture->v4l2_ctrl_count + 1) * sizeof(v4l2_ctrl_range*)); > } > >@@ -38,7 +38,7 @@ > int i; > for (i = 0; i < capture->v4l2_ctrl_count; i++) { > if (id == capture->v4l2_ctrl_ranges[i]->ctrl_id) { >-@@ -552,7 +554,7 @@ static int v4l2_get_ctrl_default(CvCaptu >+@@ -553,7 +555,7 @@ static int v4l2_get_ctrl_default(CvCaptureCAM_V4L* cap > return -1; > } > >@@ -47,7 +47,7 @@ > int i; > for (i = 0; i < capture->v4l2_ctrl_count; i++) { > if (id == capture->v4l2_ctrl_ranges[i]->ctrl_id) { >-@@ -562,7 +564,7 @@ static int v4l2_get_ctrl_min(CvCaptureCA >+@@ -563,7 +565,7 @@ static int v4l2_get_ctrl_min(CvCaptureCAM_V4L* capture > return -1; > } > >@@ -56,7 +56,7 @@ > int i; > for (i = 0; i < capture->v4l2_ctrl_count; i++) { > if (id == capture->v4l2_ctrl_ranges[i]->ctrl_id) { >-@@ -575,7 +577,7 @@ static int v4l2_get_ctrl_max(CvCaptureCA >+@@ -576,7 +578,7 @@ static int v4l2_get_ctrl_max(CvCaptureCAM_V4L* capture > > static void v4l2_scan_controls(CvCaptureCAM_V4L* capture) { > >@@ -65,7 +65,7 @@ > struct v4l2_control c; > if (capture->v4l2_ctrl_ranges != NULL) { > v4l2_free_ranges(capture); >-@@ -1653,7 +1655,7 @@ static int icvSetVideoSize( CvCaptureCAM >+@@ -1660,7 +1662,7 @@ static int icvSetVideoSize( CvCaptureCAM_V4L* capture, > > static int icvSetControl (CvCaptureCAM_V4L* capture, int property_id, double value) { > struct v4l2_control c; >diff --git a/graphics/opencv/files/patch-samples_opengl_opengl__interop.cpp b/graphics/opencv/files/patch-samples_opengl_opengl__interop.cpp >new file mode 100644 >index 000000000000..76ca1ff9b119 >--- /dev/null >+++ b/graphics/opencv/files/patch-samples_opengl_opengl__interop.cpp >@@ -0,0 +1,92 @@ >+--- samples/opengl/opengl_interop.cpp.orig 2019-04-04 21:22:40 UTC >++++ samples/opengl/opengl_interop.cpp >+@@ -8,7 +8,7 @@ >+ #if defined(_WIN32) >+ # define WIN32_LEAN_AND_MEAN >+ # include <windows.h> >+-#elif defined(__linux__) >++#elif defined(__linux__) || defined(__FreeBSD__) >+ # include <X11/X.h> >+ # include <X11/Xlib.h> >+ #endif >+@@ -59,7 +59,7 @@ class GLWinApp : public WinApp (public) >+ virtual void cleanup() CV_OVERRIDE >+ { >+ m_shutdown = true; >+-#if defined(__linux__) >++#if defined(__linux__) || defined(__FreeBSD__) >+ glXMakeCurrent(m_display, None, NULL); >+ glXDestroyContext(m_display, m_glctx); >+ #endif >+@@ -112,7 +112,7 @@ class GLWinApp : public WinApp (public) >+ } >+ #endif >+ >+-#if defined(__linux__) >++#if defined(__linux__) || defined(__FreeBSD__) >+ int handle_event(XEvent& e) CV_OVERRIDE >+ { >+ switch(e.type) >+@@ -172,7 +172,7 @@ class GLWinApp : public WinApp (public) >+ >+ m_hRC = wglCreateContext(m_hDC); >+ wglMakeCurrent(m_hDC, m_hRC); >+-#elif defined(__linux__) >++#elif defined(__linux__) || defined(__FreeBSD__) >+ m_glctx = glXCreateContext(m_display, m_visual_info, NULL, GL_TRUE); >+ glXMakeCurrent(m_display, m_window, m_glctx); >+ #endif >+@@ -242,7 +242,7 @@ class GLWinApp : public WinApp (public) >+ >+ ::SelectObject(hDC, hOldFont); >+ } >+-#elif defined(__linux__) >++#elif defined(__linux__) || defined(__FreeBSD__) >+ >+ char buf[256+1]; >+ snprintf(buf, sizeof(buf)-1, "Time, msec: %2.1f, Mode: %s OpenGL %s, Device: %s", time, m_modeStr[mode].c_str(), use_buffer() ? "buffer" : "texture", oclDevName.c_str()); >+@@ -296,7 +296,7 @@ class GLWinApp : public WinApp (public) >+ texture.copyFrom(m, true); >+ } >+ >+-#if defined(__linux__) >++#if defined(__linux__) || defined(__FreeBSD__) >+ XWindowAttributes window_attributes; >+ XGetWindowAttributes(m_display, m_window, &window_attributes); >+ glViewport(0, 0, window_attributes.width, window_attributes.height); >+@@ -317,7 +317,7 @@ class GLWinApp : public WinApp (public) >+ >+ #if defined(_WIN32) >+ SwapBuffers(m_hDC); >+-#elif defined(__linux__) >++#elif defined(__linux__) || defined(__FreeBSD__) >+ glXSwapBuffers(m_display, m_window); >+ #endif >+ >+@@ -431,7 +431,7 @@ class GLWinApp : public WinApp (public) >+ } >+ #endif >+ >+-#if defined(__linux__) >++#if defined(__linux__) || defined(__FreeBSD__) >+ KeySym keycode_to_keysym(unsigned keycode) >+ { // note that XKeycodeToKeysym() is considered deprecated >+ int keysyms_per_keycode_return = 0; >+@@ -456,7 +456,7 @@ class GLWinApp : public WinApp (public) >+ #if defined(_WIN32) >+ HDC m_hDC; >+ HGLRC m_hRC; >+-#elif defined(__linux__) >++#elif defined(__linux__) || defined(__FreeBSD__) >+ GLXContext m_glctx; >+ #endif >+ cv::VideoCapture m_cap; >+@@ -509,7 +509,7 @@ int main(int argc, char** argv) >+ >+ #if defined(_WIN32) >+ string wndname = "WGL Window"; >+-#elif defined(__linux__) >++#elif defined(__linux__) || defined(__FreeBSD__) >+ string wndname = "GLX Window"; >+ #endif >+ >diff --git a/graphics/opencv/files/patch-samples_opengl_winapp.hpp b/graphics/opencv/files/patch-samples_opengl_winapp.hpp >new file mode 100644 >index 000000000000..7f8d40f83bbc >--- /dev/null >+++ b/graphics/opencv/files/patch-samples_opengl_winapp.hpp >@@ -0,0 +1,65 @@ >+--- samples/opengl/winapp.hpp.orig 2019-04-04 21:14:55 UTC >++++ samples/opengl/winapp.hpp >+@@ -1,7 +1,7 @@ >+ #if defined(_WIN32) >+ # define WIN32_LEAN_AND_MEAN >+ # include <windows.h> >+-#elif defined(__linux__) >++#elif defined(__linux__) || defined(__FreeBSD__) >+ # include <X11/X.h> >+ # include <X11/Xlib.h> >+ # include <X11/Xutil.h> >+@@ -12,7 +12,7 @@ >+ #include <GL/gl.h> >+ #if defined(_WIN32) >+ # include <GL/glu.h> >+-#elif defined(__linux__) >++#elif defined(__linux__) || defined(__FreeBSD__) >+ # include <GL/glx.h> >+ #endif >+ >+@@ -77,7 +77,7 @@ class WinApp (public) >+ ::ShowWindow(m_hWnd, SW_SHOW); >+ ::UpdateWindow(m_hWnd); >+ ::SetFocus(m_hWnd); >+-#elif defined(__linux__) >++#elif defined(__linux__) || defined(__FreeBSD__) >+ m_display = XOpenDisplay(NULL); >+ >+ if (m_display == NULL) >+@@ -120,7 +120,7 @@ class WinApp (public) >+ { >+ #if defined(_WIN32) >+ ::DestroyWindow(m_hWnd); >+-#elif defined(__linux__) >++#elif defined(__linux__) || defined(__FreeBSD__) >+ XDestroyWindow(m_display, m_window); >+ XCloseDisplay(m_display); >+ #endif >+@@ -151,7 +151,7 @@ class WinApp (public) >+ } >+ >+ return static_cast<int>(msg.wParam); >+-#elif defined(__linux__) >++#elif defined(__linux__) || defined(__FreeBSD__) >+ m_end_loop = false; >+ >+ do { >+@@ -195,7 +195,7 @@ class WinApp (public) >+ } >+ #endif >+ >+-#if defined(__linux__) >++#if defined(__linux__) || defined(__FreeBSD__) >+ virtual int handle_event(XEvent& e) = 0; >+ #endif >+ >+@@ -207,7 +207,7 @@ class WinApp (public) >+ #if defined(_WIN32) >+ HINSTANCE m_hInstance; >+ HWND m_hWnd; >+-#elif defined(__linux__) >++#elif defined(__linux__) || defined(__FreeBSD__) >+ Display* m_display; >+ XVisualInfo* m_visual_info; >+ Window m_window; >diff --git a/graphics/opencv/pkg-plist b/graphics/opencv/pkg-plist >index 1c85948ce347..990cd3f82244 100644 >--- a/graphics/opencv/pkg-plist >+++ b/graphics/opencv/pkg-plist >@@ -1,26 +1,16 @@ > bin/opencv_annotation > bin/opencv_createsamples >-%%EXTRA_MODULES%%bin/opencv_interactive-calibration >+bin/opencv_interactive-calibration >+%%EXTRA_MODULES%%bin/opencv_waldboost_detector > bin/opencv_traincascade > bin/opencv_version > bin/opencv_visualisation >-%%EXTRA_MODULES%%bin/opencv_waldboost_detector > include/opencv/cv.h > include/opencv/cv.hpp > include/opencv/cvaux.h > include/opencv/cvaux.hpp >-include/opencv/cvwimage.h >-include/opencv/cxcore.h >-include/opencv/cxcore.hpp >-include/opencv/cxeigen.hpp >-include/opencv/cxmisc.h > include/opencv/highgui.h > include/opencv/ml.h >-include/opencv2/ml/ml.inl.hpp >-include/opencv2/opencv.hpp >-include/opencv2/opencv_modules.hpp >-include/opencv2/core_detect.hpp >-include/opencv2/hfs.hpp > %%EXTRA_MODULES%%include/opencv2/aruco.hpp > %%EXTRA_MODULES%%include/opencv2/aruco/charuco.hpp > %%EXTRA_MODULES%%include/opencv2/aruco/dictionary.hpp >@@ -37,6 +27,7 @@ include/opencv2/calib3d/calib3d_c.h > %%EXTRA_MODULES%%include/opencv2/ccalib/multicalib.hpp > %%EXTRA_MODULES%%include/opencv2/ccalib/omnidir.hpp > %%EXTRA_MODULES%%include/opencv2/ccalib/randpattern.hpp >+%%EXTRA_MODULES%%include/opencv2/core_detect.hpp > %%EXTRA_MODULES%%include/opencv2/datasets/ar_hmdb.hpp > %%EXTRA_MODULES%%include/opencv2/datasets/ar_sports.hpp > %%EXTRA_MODULES%%include/opencv2/datasets/dataset.hpp >@@ -66,15 +57,15 @@ include/opencv2/calib3d/calib3d_c.h > %%EXTRA_MODULES%%include/opencv2/datasets/track_alov.hpp > %%EXTRA_MODULES%%include/opencv2/datasets/track_vot.hpp > %%EXTRA_MODULES%%include/opencv2/datasets/util.hpp >-%%EXTRA_MODULES%%include/opencv2/dnn.hpp >-%%EXTRA_MODULES%%include/opencv2/dnn/all_layers.hpp >-%%EXTRA_MODULES%%include/opencv2/dnn/dict.hpp >-%%EXTRA_MODULES%%include/opencv2/dnn/dnn.hpp >-%%EXTRA_MODULES%%include/opencv2/dnn/dnn.inl.hpp >-%%EXTRA_MODULES%%include/opencv2/dnn/layer.details.hpp >-%%EXTRA_MODULES%%include/opencv2/dnn/layer.hpp >-%%EXTRA_MODULES%%include/opencv2/dnn/shape_utils.hpp >-%%EXTRA_MODULES%%include/opencv2/dnn_modern.hpp >+include/opencv2/dnn.hpp >+include/opencv2/dnn/all_layers.hpp >+include/opencv2/dnn/dict.hpp >+include/opencv2/dnn/dnn.hpp >+include/opencv2/dnn/dnn.inl.hpp >+include/opencv2/dnn/layer.details.hpp >+include/opencv2/dnn/layer.hpp >+include/opencv2/dnn/shape_utils.hpp >+include/opencv2/dnn/utils/inference_engine.hpp > %%EXTRA_MODULES%%include/opencv2/dpm.hpp > %%EXTRA_MODULES%%include/opencv2/face.hpp > %%EXTRA_MODULES%%include/opencv2/face/bif.hpp >@@ -82,7 +73,9 @@ include/opencv2/calib3d/calib3d_c.h > %%EXTRA_MODULES%%include/opencv2/face/facemark.hpp > %%EXTRA_MODULES%%include/opencv2/face/facemarkAAM.hpp > %%EXTRA_MODULES%%include/opencv2/face/facemarkLBF.hpp >+%%EXTRA_MODULES%%include/opencv2/face/facemark_train.hpp > %%EXTRA_MODULES%%include/opencv2/face/facerec.hpp >+%%EXTRA_MODULES%%include/opencv2/face/mace.hpp > %%EXTRA_MODULES%%include/opencv2/face/predict_collector.hpp > include/opencv2/features2d.hpp > include/opencv2/features2d/features2d.hpp >@@ -132,17 +125,33 @@ include/opencv2/flann/timer.h > %%EXTRA_MODULES%%include/opencv2/fuzzy/types.hpp > %%EXTRA_MODULES%%include/opencv2/hdf.hpp > %%EXTRA_MODULES%%include/opencv2/hdf/hdf5.hpp >+%%EXTRA_MODULES%%include/opencv2/hfs.hpp > include/opencv2/highgui.hpp > include/opencv2/highgui/highgui.hpp > include/opencv2/highgui/highgui_c.h >+%%EXTRA_MODULES%%include/opencv2/img_hash.hpp >+%%EXTRA_MODULES%%include/opencv2/img_hash/average_hash.hpp >+%%EXTRA_MODULES%%include/opencv2/img_hash/block_mean_hash.hpp >+%%EXTRA_MODULES%%include/opencv2/img_hash/color_moment_hash.hpp >+%%EXTRA_MODULES%%include/opencv2/img_hash/img_hash_base.hpp >+%%EXTRA_MODULES%%include/opencv2/img_hash/marr_hildreth_hash.hpp >+%%EXTRA_MODULES%%include/opencv2/img_hash/phash.hpp >+%%EXTRA_MODULES%%include/opencv2/img_hash/radial_variance_hash.hpp >+include/opencv2/imgcodecs.hpp >+include/opencv2/imgcodecs/imgcodecs.hpp >+include/opencv2/imgcodecs/imgcodecs_c.h >+include/opencv2/imgcodecs/ios.h > %%EXTRA_MODULES%%include/opencv2/line_descriptor.hpp > %%EXTRA_MODULES%%include/opencv2/line_descriptor/descriptor.hpp > include/opencv2/ml.hpp > include/opencv2/ml/ml.hpp >+include/opencv2/ml/ml.inl.hpp > include/opencv2/objdetect.hpp > include/opencv2/objdetect/detection_based_tracker.hpp > include/opencv2/objdetect/objdetect.hpp > include/opencv2/objdetect/objdetect_c.h >+include/opencv2/opencv.hpp >+include/opencv2/opencv_modules.hpp > %%EXTRA_MODULES%%include/opencv2/optflow.hpp > %%EXTRA_MODULES%%include/opencv2/optflow/motempl.hpp > %%EXTRA_MODULES%%include/opencv2/optflow/pcaflow.hpp >@@ -171,16 +180,16 @@ include/opencv2/photo/photo_c.h > %%EXTRA_MODULES%%include/opencv2/saliency.hpp > %%EXTRA_MODULES%%include/opencv2/saliency/saliencyBaseClasses.hpp > %%EXTRA_MODULES%%include/opencv2/saliency/saliencySpecializedClasses.hpp >-%%EXTRA_MODULES%%include/opencv2/sfm.hpp >-%%EXTRA_MODULES%%include/opencv2/sfm/conditioning.hpp >-%%EXTRA_MODULES%%include/opencv2/sfm/fundamental.hpp >-%%EXTRA_MODULES%%include/opencv2/sfm/io.hpp >-%%EXTRA_MODULES%%include/opencv2/sfm/numeric.hpp >-%%EXTRA_MODULES%%include/opencv2/sfm/projection.hpp >-%%EXTRA_MODULES%%include/opencv2/sfm/reconstruct.hpp >-%%EXTRA_MODULES%%include/opencv2/sfm/robust.hpp >-%%EXTRA_MODULES%%include/opencv2/sfm/simple_pipeline.hpp >-%%EXTRA_MODULES%%include/opencv2/sfm/triangulation.hpp >+%%EIGEN3%%%%EXTRA_MODULES%%include/opencv2/sfm.hpp >+%%EIGEN3%%%%EXTRA_MODULES%%include/opencv2/sfm/conditioning.hpp >+%%EIGEN3%%%%EXTRA_MODULES%%include/opencv2/sfm/fundamental.hpp >+%%EIGEN3%%%%EXTRA_MODULES%%include/opencv2/sfm/io.hpp >+%%EIGEN3%%%%EXTRA_MODULES%%include/opencv2/sfm/numeric.hpp >+%%EIGEN3%%%%EXTRA_MODULES%%include/opencv2/sfm/projection.hpp >+%%EIGEN3%%%%EXTRA_MODULES%%include/opencv2/sfm/reconstruct.hpp >+%%EIGEN3%%%%EXTRA_MODULES%%include/opencv2/sfm/robust.hpp >+%%EIGEN3%%%%EXTRA_MODULES%%include/opencv2/sfm/simple_pipeline.hpp >+%%EIGEN3%%%%EXTRA_MODULES%%include/opencv2/sfm/triangulation.hpp > include/opencv2/shape.hpp > include/opencv2/shape/emdL1.hpp > include/opencv2/shape/hist_cost.hpp >@@ -236,6 +245,7 @@ include/opencv2/video/tracking_c.h > include/opencv2/video/video.hpp > include/opencv2/videoio.hpp > include/opencv2/videoio/cap_ios.h >+include/opencv2/videoio/registry.hpp > include/opencv2/videoio/videoio.hpp > include/opencv2/videoio/videoio_c.h > include/opencv2/videostab.hpp >@@ -253,7 +263,6 @@ include/opencv2/videostab/outlier_rejection.hpp > include/opencv2/videostab/ring_buffer.hpp > include/opencv2/videostab/stabilizer.hpp > include/opencv2/videostab/wobble_suppression.hpp >-include/opencv2/ximgproc/edgeboxes.hpp > %%EXTRA_MODULES%%include/opencv2/xfeatures2d.hpp > %%EXTRA_MODULES%%include/opencv2/xfeatures2d/cuda.hpp > %%EXTRA_MODULES%%include/opencv2/xfeatures2d/nonfree.hpp >@@ -262,6 +271,7 @@ include/opencv2/ximgproc/edgeboxes.hpp > %%EXTRA_MODULES%%include/opencv2/ximgproc/deriche_filter.hpp > %%EXTRA_MODULES%%include/opencv2/ximgproc/disparity_filter.hpp > %%EXTRA_MODULES%%include/opencv2/ximgproc/edge_filter.hpp >+%%EXTRA_MODULES%%include/opencv2/ximgproc/edgeboxes.hpp > %%EXTRA_MODULES%%include/opencv2/ximgproc/estimated_covariance.hpp > %%EXTRA_MODULES%%include/opencv2/ximgproc/fast_hough_transform.hpp > %%EXTRA_MODULES%%include/opencv2/ximgproc/fast_line_detector.hpp >@@ -281,6 +291,7 @@ include/opencv2/ximgproc/edgeboxes.hpp > %%EXTRA_MODULES%%include/opencv2/xphoto/bm3d_image_denoising.hpp > %%EXTRA_MODULES%%include/opencv2/xphoto/dct_image_denoising.hpp > %%EXTRA_MODULES%%include/opencv2/xphoto/inpainting.hpp >+%%EXTRA_MODULES%%include/opencv2/xphoto/tonemap.hpp > %%EXTRA_MODULES%%include/opencv2/xphoto/white_balance.hpp > %%EXTRA_MODULES%%lib/libopencv_aruco.so > %%EXTRA_MODULES%%lib/libopencv_aruco.so.%%SOVERSION%% >@@ -294,21 +305,18 @@ include/opencv2/ximgproc/edgeboxes.hpp > lib/libopencv_calib3d.so > lib/libopencv_calib3d.so.%%SOVERSION%% > lib/libopencv_calib3d.so.%%VERSION%% >-lib/libopencv_dnn_objdetect.so >-lib/libopencv_dnn_objdetect.so.%%SOVERSION%% >-lib/libopencv_dnn_objdetect.so.%%VERSION%% > %%EXTRA_MODULES%%lib/libopencv_ccalib.so > %%EXTRA_MODULES%%lib/libopencv_ccalib.so.%%SOVERSION%% > %%EXTRA_MODULES%%lib/libopencv_ccalib.so.%%VERSION%% > %%EXTRA_MODULES%%lib/libopencv_datasets.so > %%EXTRA_MODULES%%lib/libopencv_datasets.so.%%SOVERSION%% > %%EXTRA_MODULES%%lib/libopencv_datasets.so.%%VERSION%% >-%%EXTRA_MODULES%%lib/libopencv_dnn.so >-%%EXTRA_MODULES%%lib/libopencv_dnn.so.%%SOVERSION%% >-%%EXTRA_MODULES%%lib/libopencv_dnn.so.%%VERSION%% >-%%EXTRA_MODULES%%lib/libopencv_dnn_modern.so >-%%EXTRA_MODULES%%lib/libopencv_dnn_modern.so.%%SOVERSION%% >-%%EXTRA_MODULES%%lib/libopencv_dnn_modern.so.%%VERSION%% >+lib/libopencv_dnn.so >+lib/libopencv_dnn.so.%%SOVERSION%% >+lib/libopencv_dnn.so.%%VERSION%% >+%%EXTRA_MODULES%%lib/libopencv_dnn_objdetect.so >+%%EXTRA_MODULES%%lib/libopencv_dnn_objdetect.so.%%SOVERSION%% >+%%EXTRA_MODULES%%lib/libopencv_dnn_objdetect.so.%%VERSION%% > %%EXTRA_MODULES%%lib/libopencv_dpm.so > %%EXTRA_MODULES%%lib/libopencv_dpm.so.%%SOVERSION%% > %%EXTRA_MODULES%%lib/libopencv_dpm.so.%%VERSION%% >@@ -330,30 +338,18 @@ lib/libopencv_flann.so.%%VERSION%% > %%EXTRA_MODULES%%lib/libopencv_hdf.so > %%EXTRA_MODULES%%lib/libopencv_hdf.so.%%SOVERSION%% > %%EXTRA_MODULES%%lib/libopencv_hdf.so.%%VERSION%% >-lib/libopencv_hfs.so >-lib/libopencv_hfs.so.%%SOVERSION%% >-lib/libopencv_hfs.so.%%VERSION%% >+%%EXTRA_MODULES%%lib/libopencv_hfs.so >+%%EXTRA_MODULES%%lib/libopencv_hfs.so.%%SOVERSION%% >+%%EXTRA_MODULES%%lib/libopencv_hfs.so.%%VERSION%% > lib/libopencv_highgui.so > lib/libopencv_highgui.so.%%SOVERSION%% > lib/libopencv_highgui.so.%%VERSION%% >-include/opencv2/imgcodecs.hpp >-include/opencv2/imgcodecs/imgcodecs.hpp >-include/opencv2/imgcodecs/imgcodecs_c.h >-include/opencv2/imgcodecs/ios.h >-include/opencv2/img_hash.hpp >-include/opencv2/img_hash/average_hash.hpp >-include/opencv2/img_hash/block_mean_hash.hpp >-include/opencv2/img_hash/color_moment_hash.hpp >-include/opencv2/img_hash/img_hash_base.hpp >-include/opencv2/img_hash/marr_hildreth_hash.hpp >-include/opencv2/img_hash/phash.hpp >-include/opencv2/img_hash/radial_variance_hash.hpp >+%%EXTRA_MODULES%%lib/libopencv_img_hash.so >+%%EXTRA_MODULES%%lib/libopencv_img_hash.so.%%SOVERSION%% >+%%EXTRA_MODULES%%lib/libopencv_img_hash.so.%%VERSION%% > lib/libopencv_imgcodecs.so > lib/libopencv_imgcodecs.so.%%SOVERSION%% > lib/libopencv_imgcodecs.so.%%VERSION%% >-lib/libopencv_img_hash.so >-lib/libopencv_img_hash.so.%%SOVERSION%% >-lib/libopencv_img_hash.so.%%VERSION%% > %%EXTRA_MODULES%%lib/libopencv_line_descriptor.so > %%EXTRA_MODULES%%lib/libopencv_line_descriptor.so.%%SOVERSION%% > %%EXTRA_MODULES%%lib/libopencv_line_descriptor.so.%%VERSION%% >@@ -384,9 +380,9 @@ lib/libopencv_photo.so.%%VERSION%% > %%EXTRA_MODULES%%lib/libopencv_saliency.so > %%EXTRA_MODULES%%lib/libopencv_saliency.so.%%SOVERSION%% > %%EXTRA_MODULES%%lib/libopencv_saliency.so.%%VERSION%% >-%%EXTRA_MODULES%%lib/libopencv_sfm.so >-%%EXTRA_MODULES%%lib/libopencv_sfm.so.%%SOVERSION%% >-%%EXTRA_MODULES%%lib/libopencv_sfm.so.%%VERSION%% >+%%EIGEN3%%%%EXTRA_MODULES%%lib/libopencv_sfm.so >+%%EIGEN3%%%%EXTRA_MODULES%%lib/libopencv_sfm.so.%%SOVERSION%% >+%%EIGEN3%%%%EXTRA_MODULES%%lib/libopencv_sfm.so.%%VERSION%% > lib/libopencv_shape.so > lib/libopencv_shape.so.%%SOVERSION%% > lib/libopencv_shape.so.%%VERSION%% >@@ -433,13 +429,15 @@ lib/libopencv_videostab.so.%%VERSION%% > %%EXTRA_MODULES%%lib/libopencv_xphoto.so.%%SOVERSION%% > %%EXTRA_MODULES%%lib/libopencv_xphoto.so.%%VERSION%% > libdata/pkgconfig/opencv.pc >-%%EXTRA_MODULES%%%%DATADIR%%/3rdparty/lib/libcorrespondence.a >-%%EXTRA_MODULES%%%%DATADIR%%/3rdparty/lib/libmultiview.a >-%%EXTRA_MODULES%%%%DATADIR%%/3rdparty/lib/libnumeric.a >+%%EIGEN3%%%%EXTRA_MODULES%%%%DATADIR%%/3rdparty/lib/libcorrespondence.a >+%%EIGEN3%%%%EXTRA_MODULES%%%%DATADIR%%/3rdparty/lib/libmultiview.a >+%%EIGEN3%%%%EXTRA_MODULES%%%%DATADIR%%/3rdparty/lib/libnumeric.a > %%DATADIR%%/OpenCVConfig-version.cmake > %%DATADIR%%/OpenCVConfig.cmake > %%DATADIR%%/OpenCVModules-%%CMAKE_BUILD_TYPE%%.cmake > %%DATADIR%%/OpenCVModules.cmake >+%%DATADIR%%/valgrind.supp >+%%DATADIR%%/valgrind_3rdparty.supp > %%DATADIR%%/haarcascades/haarcascade_eye.xml > %%DATADIR%%/haarcascades/haarcascade_eye_tree_eyeglasses.xml > %%DATADIR%%/haarcascades/haarcascade_frontalcatface.xml >@@ -462,13 +460,37 @@ libdata/pkgconfig/opencv.pc > %%DATADIR%%/lbpcascades/lbpcascade_frontalface_improved.xml > %%DATADIR%%/lbpcascades/lbpcascade_profileface.xml > %%DATADIR%%/lbpcascades/lbpcascade_silverware.xml >-%%DATADIR%%/valgrind.supp >-%%DATADIR%%/valgrind_3rdparty.supp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/CMakeLists.txt >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aruco/calibrate_camera.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aruco/calibrate_camera_charuco.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aruco/create_board.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aruco/create_board_charuco.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aruco/create_diamond.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aruco/create_marker.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aruco/detect_board.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aruco/detect_board_charuco.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aruco/detect_diamonds.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aruco/detect_markers.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aruco/detector_params.yml >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bgsegm/bgfg.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bgsegm/evaluation.py >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bgsegm/viz.py >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bgsegm/viz_synthetic_seq.py >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bioinspired/OpenEXRimages_HDR_Retina_toneMapping.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bioinspired/cpp/OpenEXRimages_HDR_Retina_toneMapping.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bioinspired/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bioinspired/cpp/retinaDemo.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bioinspired/cpp/tutorial_code/bioinspired/retina_tutorial.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bioinspired/ocl/retina_ocl.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bioinspired/retinaDemo.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ccalib/multi_cameras_calibration.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ccalib/omni_calibration.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ccalib/omni_stereo_calibration.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ccalib/random_pattern_calibration.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ccalib/random_pattern_generator.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/3calibration.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/CMakeLists.txt > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/application_trace.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/autofocus.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/bgfg_segm.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/calibration.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/camshiftdemo.cpp >@@ -485,6 +507,7 @@ libdata/pkgconfig/opencv.pc > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/detect_blob.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/detect_mser.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/dft.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/digits.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/distrans.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/drawing.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/edge.cpp >@@ -495,22 +518,19 @@ libdata/pkgconfig/opencv.pc > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/fback.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/ffilldemo.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/filestorage.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/filestorage_base64.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/fitellipse.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/grabcut.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/image.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/image_alignment.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/image_sequence.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/imagelist_creator.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/imagelist_reader.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/inpaint.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/intelperc_capture.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/kalman.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/kmeans.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/laplace.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/letter_recog.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/lkdemo.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/logistic_regression.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/lsd_lines.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/mask_tmpl.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/matchmethod_orb_akaze_brisk.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/minarea.cpp >@@ -518,18 +538,18 @@ libdata/pkgconfig/opencv.pc > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/neural_network.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/npr_demo.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/opencv_version.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/openni_capture.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/pca.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/peopledetect.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/phase_corr.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/points_classifier.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/polar_transforms.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/qrcode.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/segment_objects.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/select3dobj.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/shape_example.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/simd_basic.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/smiledetect.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/squares.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/starter_imagelist.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/stereo_calib.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/stereo_match.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/stitching.cpp >@@ -540,390 +560,182 @@ libdata/pkgconfig/opencv.pc > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/tree_engine.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/tvl1_optical_flow.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/videocapture_basic.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/videocapture_camera.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/videocapture_gphoto2_autofocus.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/videocapture_gstreamer_pipeline.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/videocapture_image_sequence.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/videocapture_intelperc.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/videocapture_openni.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/videocapture_starter.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/videostab.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/videowriter_basic.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/warpPerspective_demo.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/watershed.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/Blender_Suzanne1.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/Blender_Suzanne2.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/H1to3p.xml >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/HappyFish.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/LinuxLogo.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/Megamind.avi >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/Megamind_bugy.avi >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/WindowsLogo.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/aero1.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/aero3.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/aloeGT.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/aloeL.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/aloeR.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/apple.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/baboon.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/basketball1.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/basketball2.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/blox.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/board.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/box.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/box_in_scene.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/building.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/butterfly.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/cards.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/chessboard.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/chicky_512.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/data01.xml >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/detect_blob.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/digits.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/dnn/MobileNetSSD_300x300.prototxt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/dnn/VGG_VOC0712_SSD_300x300_iter_60000.prototxt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/dnn/bvlc_googlenet.prototxt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/dnn/enet-classes.txt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/dnn/fcn32s-heavy-pascal.prototxt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/dnn/fcn8s-heavy-pascal.prototxt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/dnn/pascal-classes.txt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/dnn/rgb.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/dnn/space_shuttle.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/dnn/synset_words.txt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/ellipses.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/fruits.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/gradient.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/graf1.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/graf3.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/home.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/imageTextN.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/imageTextR.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/intrinsics.yml >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/left.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/left01.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/left02.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/left03.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/left04.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/left05.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/left06.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/left07.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/left08.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/left09.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/left11.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/left12.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/left13.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/left14.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/left_intrinsics.yml >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/lena.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/lena_tmpl.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/letter-recognition.data >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/licenseplate_motion.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/mask.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/messi5.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/ml.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/notes.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/opencv-logo-white.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/opencv-logo.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/orange.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/pca_test1.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/pic1.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/pic2.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/pic3.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/pic4.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/pic5.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/pic6.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/right.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/right01.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/right02.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/right03.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/right04.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/right05.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/right06.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/right07.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/right08.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/right09.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/right11.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/right12.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/right13.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/right14.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/rubberwhale1.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/rubberwhale2.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/shape_sample/1.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/shape_sample/10.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/shape_sample/11.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/shape_sample/12.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/shape_sample/13.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/shape_sample/14.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/shape_sample/15.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/shape_sample/16.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/shape_sample/17.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/shape_sample/18.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/shape_sample/19.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/shape_sample/2.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/shape_sample/20.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/shape_sample/3.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/shape_sample/4.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/shape_sample/5.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/shape_sample/6.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/shape_sample/7.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/shape_sample/8.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/shape_sample/9.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/smarties.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/starry_night.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/stereo_calib.xml >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/stuff.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/sudoku.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/templ.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/text_defocus.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/text_motion.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/tmpl.png >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/tree.avi >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/vtest.avi >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/Blender_Suzanne1.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/Blender_Suzanne2.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/H1to3p.xml >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/HappyFish.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/LinuxLogo.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/Megamind.avi >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/Megamind_bugy.avi >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/WindowsLogo.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/aero1.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/aero3.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/aloeGT.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/aloeL.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/aloeR.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/apple.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/baboon.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/basketball1.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/basketball2.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/blox.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/board.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/box.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/box_in_scene.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/building.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/butterfly.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/calibration.yml >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/cards.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/chessboard.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/chicky_512.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data01.xml >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/detect_blob.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/digits.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/dnn/action_recongnition_kinetics.txt >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/dnn/classification_classes_ILSVRC2012.txt >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/dnn/enet-classes.txt >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/dnn/object_detection_classes_coco.txt >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/dnn/object_detection_classes_pascal_voc.txt >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/dnn/object_detection_classes_yolov3.txt >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/ellipses.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/fruits.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/gradient.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/graf1.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/graf3.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/home.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/imageTextN.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/imageTextR.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/intrinsics.yml >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/left.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/left01.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/left02.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/left03.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/left04.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/left05.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/left06.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/left07.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/left08.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/left09.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/left11.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/left12.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/left13.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/left14.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/left_intrinsics.yml >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/lena.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/lena_tmpl.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/letter-recognition.data >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/licenseplate_motion.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/mask.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/messi5.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/ml.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/notes.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/opencv-logo-white.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/opencv-logo.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/orange.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/pca_test1.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/pic1.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/pic2.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/pic3.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/pic4.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/pic5.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/pic6.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/right.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/right01.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/right02.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/right03.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/right04.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/right05.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/right06.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/right07.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/right08.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/right09.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/right11.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/right12.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/right13.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/right14.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/rubberwhale1.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/rubberwhale2.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/shape_sample/1.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/shape_sample/10.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/shape_sample/11.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/shape_sample/12.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/shape_sample/13.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/shape_sample/14.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/shape_sample/15.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/shape_sample/16.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/shape_sample/17.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/shape_sample/18.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/shape_sample/19.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/shape_sample/2.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/shape_sample/20.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/shape_sample/3.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/shape_sample/4.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/shape_sample/5.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/shape_sample/6.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/shape_sample/7.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/shape_sample/8.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/shape_sample/9.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/smarties.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/starry_night.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/stereo_calib.xml >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/stuff.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/sudoku.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/templ.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/text_defocus.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/text_motion.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/tmpl.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/tree.avi >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/vtest.avi >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/ar_hmdb.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/ar_hmdb_benchmark.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/ar_sports.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/fr_adience.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/fr_lfw.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/fr_lfw_benchmark.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/gr_chalearn.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/gr_skig.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/hpe_humaneva.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/hpe_parse.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/ir_affine.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/ir_robot.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/is_bsds.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/is_weizmann.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/msm_epfl.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/msm_middlebury.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/or_imagenet.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/or_mnist.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/or_pascal.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/or_sun.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/pd_caltech.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/pd_inria.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/slam_kitti.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/slam_tumindoor.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/tr_chars.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/tr_chars_benchmark.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/tr_icdar.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/tr_icdar_benchmark.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/tr_svt.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/tr_svt_benchmark.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/track_vot.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn/CMakeLists.txt >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn/classification.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn/colorization.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn/faster_rcnn.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn/resnet_ssd_face.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn/squeezenet_halide.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn/ssd_mobilenet_object_detection.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn/torch_enet.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn/yolo_object_detection.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/CMakeLists.txt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/alpha_comp.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/bgfg_segm.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/cascadeclassifier.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/cascadeclassifier_nvidia_api.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/driver_api_multi.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/driver_api_stereo_multi.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/farneback_optical_flow.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/generalized_hough.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/hog.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/houghlines.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/morphology.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/multi.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/opengl.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/optical_flow.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/opticalflow_nvidia_api.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/pyrlk_optical_flow.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/stereo_match.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/stereo_multi.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/super_resolution.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/surf_keypoint_matcher.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/video_reader.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/video_writer.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opencl/CMakeLists.txt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opencl/opencl-opencv-interop.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tapi/CMakeLists.txt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tapi/bgfg_segm.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tapi/camshift.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tapi/clahe.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tapi/hog.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tapi/opencl_custom_kernel.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tapi/pyrlk_optical_flow.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tapi/squares.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tapi/tvl1_optical_flow.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tapi/ufacedetect.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aruco/calibrate_camera.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aruco/calibrate_camera_charuco.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aruco/create_board.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aruco/create_board_charuco.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aruco/create_diamond.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aruco/create_marker.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aruco/detect_board.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aruco/detect_board_charuco.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aruco/detect_diamonds.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aruco/detect_markers.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aruco/detector_params.yml >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bioinspired/OpenEXRimages_HDR_Retina_toneMapping.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bioinspired/cpp/OpenEXRimages_HDR_Retina_toneMapping.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bioinspired/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bioinspired/cpp/retinaDemo.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bioinspired/cpp/tutorial_code/bioinspired/retina_tutorial.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bioinspired/ocl/retina_ocl.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bioinspired/retinaDemo.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ccalib/multi_cameras_calibration.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ccalib/omni_calibration.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ccalib/omni_stereo_calibration.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ccalib/random_pattern_calibration.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ccalib/random_pattern_generator.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/ar_hmdb.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/ar_hmdb_benchmark.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/ar_sports.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/fr_adience.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/fr_lfw.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/fr_lfw_benchmark.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/gr_chalearn.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/gr_skig.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/hpe_humaneva.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/hpe_parse.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/ir_affine.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/ir_robot.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/is_bsds.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/is_weizmann.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/msm_epfl.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/msm_middlebury.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/or_imagenet.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/or_mnist.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/or_pascal.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/or_sun.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/pd_caltech.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/pd_inria.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/slam_kitti.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/slam_tumindoor.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/tr_chars.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/tr_chars_benchmark.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/tr_icdar.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/tr_icdar_benchmark.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/tr_svt.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/tr_svt_benchmark.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datasets/track_vot.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn/caffe_googlenet.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn/fcn_semsegm.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn/ssd_object_detection.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn/tf_inception.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dpm/cascade_detect_camera.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dpm/cascade_detect_sequence.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dpm/data/inriaperson.xml >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/CMakeLists.txt >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/etc/at.txt >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/etc/create_csv.py >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/etc/crop_face.py >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/facerec_demo.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/facerec_eigenfaces.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/facerec_fisherfaces.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/facerec_lbph.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/facerec_save_load.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/facerec_video.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fuzzy/fuzzy_filtering.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fuzzy/fuzzy_inpainting.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fuzzy/input.png >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fuzzy/mask1.png >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fuzzy/mask2.png >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fuzzy/mask3.png >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/line_descriptor/compute_descriptors.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/line_descriptor/knn_matching.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/line_descriptor/lines_extraction.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/line_descriptor/lsd_lines_extraction.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/line_descriptor/matching.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/line_descriptor/radius_matching.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/optflow/gpc_evaluate.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/optflow/gpc_train.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/optflow/gpc_train_middlebury.py >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/optflow/gpc_train_sintel.py >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/optflow/motempl.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/optflow/motempl.py >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/optflow/optical_flow_benchmark.py >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/optflow/optical_flow_evaluation.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/optflow/pcaflow_demo.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/optflow/simpleflow_demo.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/phase_unwrapping/unwrap.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/reg/CMakeLists.txt >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/reg/LR_05.png >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/reg/LR_06.png >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/reg/home.png >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/reg/map_test.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rgbd/CMakeLists.txt >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rgbd/linemod.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rgbd/odometry_evaluation.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/saliency/ObjectnessTrainedModel/ObjNessB2W8HSV.idx.yml.gz >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/saliency/ObjectnessTrainedModel/ObjNessB2W8HSV.wS1.yml.gz >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/saliency/ObjectnessTrainedModel/ObjNessB2W8HSV.wS2.yml.gz >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/saliency/ObjectnessTrainedModel/ObjNessB2W8I.idx.yml.gz >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/saliency/ObjectnessTrainedModel/ObjNessB2W8I.wS1.yml.gz >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/saliency/ObjectnessTrainedModel/ObjNessB2W8I.wS2.yml.gz >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/saliency/ObjectnessTrainedModel/ObjNessB2W8MAXBGR.idx.yml.gz >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/saliency/ObjectnessTrainedModel/ObjNessB2W8MAXBGR.wS1.yml.gz >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/saliency/ObjectnessTrainedModel/ObjNessB2W8MAXBGR.wS2.yml.gz >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/saliency/computeSaliency.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/stereo/sample.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/structured_light/cap_pattern.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/structured_light/capsinpattern.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/structured_light/pointcloud.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/structured_light/projectorcalibration.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/surface_matching/data/parasaurolophus_6700.ply >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/surface_matching/data/parasaurolophus_low_normals2.ply >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/surface_matching/data/rs1_normals.ply >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/surface_matching/data/rs22_proc2.ply >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/surface_matching/ppf_load_match.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/surface_matching/ppf_normal_computation.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/OCRBeamSearch_CNN_model_data.xml.gz >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/OCRHMM_knn_model_data.xml.gz >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/OCRHMM_transitions_table.xml >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/character_recognition.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/cropped_word_recognition.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/detect_er_chars.py >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/end_to_end_recognition.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext01.jpg >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext02.jpg >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext03.jpg >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext04.jpg >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext05.jpg >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext06.jpg >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext_char01.jpg >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext_char02.jpg >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext_char03.jpg >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext_segmented_word01.jpg >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext_segmented_word01_mask.png >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext_segmented_word02.jpg >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext_segmented_word02_mask.png >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext_segmented_word03.jpg >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext_segmented_word03_mask.png >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext_segmented_word04.jpg >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext_segmented_word04_mask.png >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext_segmented_word05.jpg >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext_segmented_word05_mask.png >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext_word01.jpg >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext_word02.jpg >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext_word03.jpg >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext_word04.jpg >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/segmented_word_recognition.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/textdetection.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/textdetection.py >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/trained_classifierNM1.xml >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/trained_classifierNM2.xml >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/trained_classifier_erGrouping.xml >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/webcam_demo.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tracking/benchmark.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tracking/goturnTracker.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tracking/kcf.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tracking/multiTracker_dataset.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tracking/multitracker.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tracking/multitracker.py >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tracking/tracker.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tracking/tracker.py >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tracking/tracker_dataset.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tracking/tutorial_customizing_cn_tracker.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tracking/tutorial_introduction_to_tracker.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tracking/tutorial_multitracker.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xfeatures2d/bagofwords_classification.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xfeatures2d/export-boostdesc.py >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xfeatures2d/pct_signatures.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xfeatures2d/pct_webcam.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xfeatures2d/shape_transformation.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xfeatures2d/surf_matcher.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xfeatures2d/video_homography.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/CMakeLists.txt >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/deriche_demo.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/disparity_filtering.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/fast_hough_transform.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/findredlinedpolygonfromgooglemaps.py >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/fld_lines.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/graphsegmentation_demo.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/live_demo.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/niblack_thresholding.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/paillou_demo.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/polygonstanfordoutput.png >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/seeds.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/selectivesearchsegmentation_demo.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/slic.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/stanford.png >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/structured_edge_detection.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/thinning.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xphoto/bm3d_image_denoising.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xphoto/color_balance.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xphoto/color_balance_benchmark.py >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xphoto/dct_image_denoising.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xphoto/inpainting.cpp >-%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xphoto/learn_color_balance.py >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bgsegm/bgfg.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bgsegm/evaluation.py >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bgsegm/viz.py >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bgsegm/viz_synthetic_seq.py >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/data/corridor.jpg >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn_modern/simple_test.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn/common.hpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn/custom_layers.hpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn/object_detection.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn/openpose.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn/segmentation.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn/text_detection.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn_objdetect/data/README.md > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn_objdetect/data/SqueezeDet_deploy.prototxt > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn_objdetect/data/SqueezeDet_solver.prototxt >@@ -933,9 +745,25 @@ libdata/pkgconfig/opencv.pc > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn_objdetect/data/SqueezeNet_train_test.prototxt > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn_objdetect/image_classification.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn_objdetect/obj_detect.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dpm/cascade_detect_camera.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dpm/cascade_detect_sequence.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dpm/data/inriaperson.xml >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/CMakeLists.txt >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/Facemark.java >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/etc/at.txt >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/etc/create_csv.py >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/etc/crop_face.py > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/facemark_demo_aam.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/facemark_demo_lbf.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/facemark_lbf_fitting.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/facerec_demo.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/facerec_eigenfaces.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/facerec_fisherfaces.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/facerec_lbph.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/facerec_save_load.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/facerec_video.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/landmarks_demo.py >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/mace_webcam.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/sampleDetectLandmarks.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/sampleDetectLandmarksvideo.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/sample_config_file.xml >@@ -943,6 +771,30 @@ libdata/pkgconfig/opencv.pc > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/sample_train_landmark_detector.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/sample_train_landmark_detector2.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/samplewriteconfigfile.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fuzzy/fuzzy_filtering.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fuzzy/fuzzy_inpainting.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fuzzy/input.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fuzzy/mask1.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fuzzy/mask2.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fuzzy/mask3.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/CMakeLists.txt >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/alpha_comp.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/bgfg_segm.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/cascadeclassifier.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/farneback_optical_flow.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/generalized_hough.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/hog.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/houghlines.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/morphology.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/multi.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/optical_flow.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/pyrlk_optical_flow.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/stereo_match.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/stereo_multi.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/super_resolution.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/surf_keypoint_matcher.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/video_reader.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpu/video_writer.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hdf/create_groups.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hdf/create_read_write_datasets.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hdf/read_write_attributes.cpp >@@ -952,24 +804,163 @@ libdata/pkgconfig/opencv.pc > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hfs/data/002.jpg > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hfs/example.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/img_hash/hash_samples.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/line_descriptor/compute_descriptors.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/line_descriptor/knn_matching.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/line_descriptor/lines_extraction.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/line_descriptor/lsd_lines_extraction.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/line_descriptor/matching.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/line_descriptor/radius_matching.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opencl/CMakeLists.txt >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opencl/opencl-opencv-interop.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/optflow/dis_opticalflow.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/optflow/gpc_evaluate.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/optflow/gpc_train.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/optflow/gpc_train_middlebury.py >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/optflow/gpc_train_sintel.py >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/optflow/motempl.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/optflow/motempl.py >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/optflow/optical_flow_benchmark.py >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/optflow/optical_flow_evaluation.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/optflow/pcaflow_demo.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/optflow/simpleflow_demo.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/phase_unwrapping/unwrap.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/plot/plot_demo.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/reg/CMakeLists.txt >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/reg/LR_05.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/reg/LR_06.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/reg/home.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/reg/map_test.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/reg/reg_shift.py >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rgbd/CMakeLists.txt >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rgbd/linemod.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rgbd/odometry_evaluation.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/saliency/ObjectnessTrainedModel/ObjNessB2W8HSV.idx.yml.gz >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/saliency/ObjectnessTrainedModel/ObjNessB2W8HSV.wS1.yml.gz >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/saliency/ObjectnessTrainedModel/ObjNessB2W8HSV.wS2.yml.gz >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/saliency/ObjectnessTrainedModel/ObjNessB2W8I.idx.yml.gz >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/saliency/ObjectnessTrainedModel/ObjNessB2W8I.wS1.yml.gz >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/saliency/ObjectnessTrainedModel/ObjNessB2W8I.wS2.yml.gz >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/saliency/ObjectnessTrainedModel/ObjNessB2W8MAXBGR.idx.yml.gz >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/saliency/ObjectnessTrainedModel/ObjNessB2W8MAXBGR.wS1.yml.gz >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/saliency/ObjectnessTrainedModel/ObjNessB2W8MAXBGR.wS2.yml.gz >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/saliency/computeSaliency.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/stereo/sample.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/structured_light/cap_pattern.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/structured_light/capsinpattern.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/structured_light/pointcloud.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/structured_light/projectorcalibration.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/surface_matching/data/parasaurolophus_6700.ply >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/surface_matching/data/parasaurolophus_low_normals2.ply >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/surface_matching/data/rs1_normals.ply >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/surface_matching/data/rs22_proc2.ply > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/surface_matching/ppf_icp.py >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/surface_matching/ppf_load_match.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/surface_matching/ppf_normal_computation.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tapi/CMakeLists.txt >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tapi/bgfg_segm.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tapi/camshift.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tapi/clahe.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tapi/dense_optical_flow.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tapi/hog.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tapi/opencl_custom_kernel.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tapi/pyrlk_optical_flow.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tapi/squares.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tapi/ufacedetect.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/OCRBeamSearch_CNN_model_data.xml.gz >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/OCRHMM_knn_model_data.xml.gz >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/OCRHMM_transitions_table.xml >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/character_recognition.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/cropped_word_recognition.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/deeptextdetection.py >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/detect_er_chars.py > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/dictnet_demo.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/end_to_end_recognition.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext01.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext02.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext03.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext04.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext05.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext06.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext_char01.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext_char02.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext_char03.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext_segmented_word01.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext_segmented_word01_mask.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext_segmented_word02.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext_segmented_word02_mask.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext_segmented_word03.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext_segmented_word03_mask.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext_segmented_word04.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext_segmented_word04_mask.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext_segmented_word05.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext_segmented_word05_mask.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext_word01.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext_word02.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext_word03.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/scenetext_word04.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/segmented_word_recognition.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/text_recognition_cnn.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/textbox.prototxt > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/textbox_demo.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/textdetection.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/textdetection.py >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/trained_classifierNM1.xml >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/trained_classifierNM2.xml >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/trained_classifier_erGrouping.xml >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/webcam_demo.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tracking/benchmark.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tracking/csrt.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tracking/goturnTracker.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tracking/kcf.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tracking/multiTracker_dataset.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tracking/multitracker.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tracking/multitracker.py > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tracking/samples_utility.hpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tracking/tracker.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tracking/tracker.py >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tracking/tracker_dataset.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tracking/tutorial_customizing_cn_tracker.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tracking/tutorial_introduction_to_tracker.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tracking/tutorial_multitracker.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xfeatures2d/bagofwords_classification.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xfeatures2d/export-boostdesc.py > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/xfeatures2d/gms_matcher.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xfeatures2d/pct_signatures.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xfeatures2d/pct_webcam.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xfeatures2d/shape_transformation.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xfeatures2d/surf_matcher.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xfeatures2d/video_homography.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/CMakeLists.txt > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/brightedgesexample.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/colorize.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/dericheSample.py >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/deriche_demo.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/disparity_filtering.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/edgeboxes_demo.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/edgeboxes_demo.py >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/fast_hough_transform.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/filterdemo.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/findredlinedpolygonfromgooglemaps.py >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/fld_lines.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/fourier_descriptors_demo.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/graphsegmentation_demo.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/live_demo.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/niblack_thresholding.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/paillou_demo.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/peilin.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/peilin_plane.png > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/peilin_shape.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/polygonstanfordoutput.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/seeds.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/selectivesearchsegmentation_demo.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/selectivesearchsegmentation_demo.py >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/slic.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/stanford.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/structured_edge_detection.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/thinning.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xphoto/bm3d_image_denoising.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xphoto/color_balance.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xphoto/color_balance_benchmark.py >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xphoto/dct_image_denoising.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xphoto/inpainting.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xphoto/learn_color_balance.py >diff --git a/graphics/py-opencv/Makefile b/graphics/py-opencv/Makefile >index 216eefd2a1cb..d1d8669df598 100644 >--- a/graphics/py-opencv/Makefile >+++ b/graphics/py-opencv/Makefile >@@ -1,7 +1,7 @@ > # Created by: Martin Matuska <mm@FreeBSD.org> > # $FreeBSD$ > >-PORTREVISION= 6 >+PORTREVISION= 0 > CATEGORIES= graphics python > PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} > >diff --git a/graphics/py-opencv/pkg-plist b/graphics/py-opencv/pkg-plist >index e76110b9282f..77adb5166732 100644 >--- a/graphics/py-opencv/pkg-plist >+++ b/graphics/py-opencv/pkg-plist >@@ -1 +1,16 @@ >-%%PYTHON_SITELIBDIR%%/cv2.so >+%%PYTHON_SITELIBDIR%%/cv2/python-%%PYTHON_VER%%/cv2.so >+%%PYTHON_SITELIBDIR%%/cv2/__init__.py >+%%PYTHON_SITELIBDIR%%/cv2/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc >+%%PYTHON_SITELIBDIR%%/cv2/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc >+%%PYTHON_SITELIBDIR%%/cv2/__pycache__/config-%%PYTHON_VER%%.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc >+%%PYTHON_SITELIBDIR%%/cv2/__pycache__/config-%%PYTHON_VER%%.cpython-%%PYTHON_SUFFIX%%.pyc >+%%PYTHON_SITELIBDIR%%/cv2/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc >+%%PYTHON_SITELIBDIR%%/cv2/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.pyc >+%%PYTHON_SITELIBDIR%%/cv2/__pycache__/load_config_py2.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc >+%%PYTHON_SITELIBDIR%%/cv2/__pycache__/load_config_py2.cpython-%%PYTHON_SUFFIX%%.pyc >+%%PYTHON_SITELIBDIR%%/cv2/__pycache__/load_config_py3.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc >+%%PYTHON_SITELIBDIR%%/cv2/__pycache__/load_config_py3.cpython-%%PYTHON_SUFFIX%%.pyc >+%%PYTHON_SITELIBDIR%%/cv2/config-%%PYTHON_VER%%.py >+%%PYTHON_SITELIBDIR%%/cv2/config.py >+%%PYTHON_SITELIBDIR%%/cv2/load_config_py2.py >+%%PYTHON_SITELIBDIR%%/cv2/load_config_py3.py >diff --git a/multimedia/gstreamer-plugins-all/Makefile b/multimedia/gstreamer-plugins-all/Makefile >index 4404bb99979d..318b96030256 100644 >--- a/multimedia/gstreamer-plugins-all/Makefile >+++ b/multimedia/gstreamer-plugins-all/Makefile >@@ -3,7 +3,7 @@ > > PORTNAME= gstreamer-plugins-all > PORTVERSION= 1.3.${GST_VERSION}.${GST_SHLIB_VERSION} >-PORTREVISION= 17 >+PORTREVISION= 18 > CATEGORIES= multimedia > > MAINTAINER= multimedia@FreeBSD.org >diff --git a/multimedia/gstreamer-plugins-bad/Makefile b/multimedia/gstreamer-plugins-bad/Makefile >index 2bf31826fa16..adfd1518b04b 100644 >--- a/multimedia/gstreamer-plugins-bad/Makefile >+++ b/multimedia/gstreamer-plugins-bad/Makefile >@@ -2,7 +2,7 @@ > # $FreeBSD$ > # $MCom: ports/multimedia/gstreamer-plugins-bad/Makefile,v 1.11 2008/03/19 14:05:35 ahze Exp $ > >-PORTREVISION= 4 >+PORTREVISION= 5 > CATEGORIES= multimedia > > COMMENT= Bad gstreamer-plugins >diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common >index 0fe102e12876..e25910240ffb 100644 >--- a/multimedia/gstreamer-plugins/Makefile.common >+++ b/multimedia/gstreamer-plugins/Makefile.common >@@ -49,7 +49,6 @@ BAD_GST_ALL_PLUGINS+= \ > nas \ > neon \ > ofa \ >- opencv \ > opus \ > resindvd \ > rsvg \
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=220746">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 237135
:
203513
|
203655
|
203694
|
203713
|
203820
|
203992
|
203993
|
204176
|
204177
|
204178
|
204201
|
204284
|
204540
|
204541
|
220712
|
220713
| 220746