FreeBSD Bugzilla – Attachment 192856 Details for
Bug 210505
[exp-run] graphics/opencv: Update to 3.4.1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
opencv 3.4.1 update
opencv-341.diff (text/plain), 95.62 KB, created by
Steve Wills
on 2018-04-27 20:40:09 UTC
(
hide
)
Description:
opencv 3.4.1 update
Filename:
MIME Type:
Creator:
Steve Wills
Created:
2018-04-27 20:40:09 UTC
Size:
95.62 KB
patch
obsolete
>diff --git graphics/opencv-core/Makefile graphics/opencv-core/Makefile >index 7ec85eab4d25..f3931332ccb6 100644 >--- graphics/opencv-core/Makefile >+++ graphics/opencv-core/Makefile >@@ -1,7 +1,7 @@ > # Created by: Martin Matuska <mm@FreeBSD.org> > # $FreeBSD$ > >-PORTREVISION= 1 >+PORTREVISION= 0 > PKGNAMESUFFIX= -${OCV_SLAVE} > > COMMENT= OpenCV core libraries >diff --git graphics/opencv-core/pkg-plist graphics/opencv-core/pkg-plist >index 71ea81e139b3..9efdefdc99a8 100644 >--- graphics/opencv-core/pkg-plist >+++ graphics/opencv-core/pkg-plist >@@ -1,30 +1,119 @@ > include/opencv2/core.hpp > include/opencv2/core/affine.hpp >-include/opencv2/core/core.hpp >+include/opencv2/core/base.hpp >+include/opencv2/core/bufferpool.hpp > include/opencv2/core/core_c.h >-include/opencv2/core/cuda_devptrs.hpp >-include/opencv2/core/devmem2d.hpp >+include/opencv2/core/core.hpp >+include/opencv2/core/cuda_stream_accessor.hpp >+include/opencv2/core/cuda_types.hpp >+include/opencv2/core/cuda.hpp >+include/opencv2/core/cuda.inl.hpp >+include/opencv2/core/cuda/block.hpp >+include/opencv2/core/cuda/border_interpolate.hpp >+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/transform_detail.hpp >+include/opencv2/core/cuda/detail/type_traits_detail.hpp >+include/opencv2/core/cuda/detail/vec_distance_detail.hpp >+include/opencv2/core/cuda/dynamic_smem.hpp >+include/opencv2/core/cuda/emulation.hpp >+include/opencv2/core/cuda/filters.hpp >+include/opencv2/core/cuda/funcattrib.hpp >+include/opencv2/core/cuda/functional.hpp >+include/opencv2/core/cuda/limits.hpp >+include/opencv2/core/cuda/reduce.hpp >+include/opencv2/core/cuda/saturate_cast.hpp >+include/opencv2/core/cuda/scan.hpp >+include/opencv2/core/cuda/simd_functions.hpp >+include/opencv2/core/cuda/transform.hpp >+include/opencv2/core/cuda/type_traits.hpp >+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_reduce.hpp >+include/opencv2/core/cuda/warp_shuffle.hpp >+include/opencv2/core/cuda/warp.hpp >+include/opencv2/core/cv_cpu_dispatch.h >+include/opencv2/core/cv_cpu_helper.h >+include/opencv2/core/cvdef.h >+include/opencv2/core/cvstd.hpp >+include/opencv2/core/cvstd.inl.hpp >+include/opencv2/core/directx.hpp > include/opencv2/core/eigen.hpp >-include/opencv2/core/gpumat.hpp >-include/opencv2/core/internal.hpp >+include/opencv2/core/fast_math.hpp >+include/opencv2/core/hal/hal.hpp >+include/opencv2/core/hal/interface.h >+include/opencv2/core/hal/intrin_cpp.hpp >+include/opencv2/core/hal/intrin_neon.hpp >+include/opencv2/core/hal/intrin_sse.hpp >+include/opencv2/core/hal/intrin_vsx.hpp >+include/opencv2/core/hal/intrin.hpp >+include/opencv2/core/opencl/ocl_defs.hpp >+include/opencv2/core/opencl/opencl_info.hpp >+include/opencv2/core/opencl/opencl_svm.hpp >+include/opencv2/core/opencl/runtime/autogenerated/opencl_clamdblas.hpp >+include/opencv2/core/opencl/runtime/autogenerated/opencl_clamdfft.hpp >+include/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp >+include/opencv2/core/opencl/runtime/autogenerated/opencl_core_wrappers.hpp >+include/opencv2/core/opencl/runtime/autogenerated/opencl_gl.hpp >+include/opencv2/core/opencl/runtime/autogenerated/opencl_gl_wrappers.hpp >+include/opencv2/core/opencl/runtime/opencl_clamdblas.hpp >+include/opencv2/core/opencl/runtime/opencl_clamdfft.hpp >+include/opencv2/core/opencl/runtime/opencl_core.hpp >+include/opencv2/core/opencl/runtime/opencl_core_wrappers.hpp >+include/opencv2/core/opencl/runtime/opencl_gl.hpp >+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/opengl_interop.hpp >-include/opencv2/core/opengl_interop_deprecated.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 >+include/opencv2/core/ovx.hpp >+include/opencv2/core/persistence.hpp >+include/opencv2/core/ptr.inl.hpp >+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/utility.hpp >+include/opencv2/core/utils/filesystem.hpp >+include/opencv2/core/utils/logger.defines.hpp >+include/opencv2/core/utils/logger.hpp >+include/opencv2/core/utils/trace.hpp >+include/opencv2/core/va_intel.hpp > include/opencv2/core/version.hpp >+include/opencv2/core/vsx_utils.hpp > include/opencv2/core/wimage.hpp >+include/opencv2/cvconfig.h > include/opencv2/imgproc.hpp >-include/opencv2/imgproc/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/types_c.h > @comment include/opencv2/opencv.hpp > @comment include/opencv2/opencv_modules.hpp > lib/libopencv_core.so >-lib/libopencv_core.so.2 >+lib/libopencv_core.so.%%SOVERSION%% > lib/libopencv_core.so.%%VERSION%% > lib/libopencv_imgproc.so >-lib/libopencv_imgproc.so.2 >+lib/libopencv_imgproc.so.%%SOVERSION%% > lib/libopencv_imgproc.so.%%VERSION%% > libdata/pkgconfig/opencv-core.pc > share/cmake/Modules/FindOpenCVCore.cmake >diff --git graphics/opencv-java/Makefile graphics/opencv-java/Makefile >index a9f6a19e756a..4da51c483288 100644 >--- graphics/opencv-java/Makefile >+++ graphics/opencv-java/Makefile >@@ -1,6 +1,6 @@ > # $FreeBSD$ > >-PORTREVISION= 1 >+PORTREVISION= 0 > CATEGORIES= graphics java > PKGNAMESUFFIX= -${OCV_SLAVE} > >@@ -11,6 +11,6 @@ OCV_JAVA= yes > MASTERDIR= ${.CURDIR:H}/opencv > PLIST= ${.CURDIR}/pkg-plist > >-PLIST_SUB+= OCV_VER=${DISTVERSION:R:S|.||g} >+PLIST_SUB+= OCV_VER=${DISTVERSION:S|.||g} > > .include "${MASTERDIR}/Makefile" >diff --git graphics/opencv/Makefile graphics/opencv/Makefile >index 865e134406a9..ead1829be931 100644 >--- graphics/opencv/Makefile >+++ graphics/opencv/Makefile >@@ -1,9 +1,8 @@ > # Created by: Marc Abramowitz (http://marc.abramowitz.info) > # $FreeBSD$ > >-PORTNAME?= opencv >-PORTVERSION= 2.4.13.1 >-PORTREVISION?= 9 >+PORTNAME= opencv >+PORTVERSION= 3.4.1 > CATEGORIES= graphics > > MAINTAINER= ports@FreeBSD.org >@@ -12,79 +11,191 @@ COMMENT= Open Source Computer Vision library > LICENSE= BSD3CLAUSE > LICENSE_FILE= ${WRKSRC}/LICENSE > >-USE_GITHUB= yes >- >-USES= cmake pkgconfig >-USE_LDCONFIG= yes >- > NOT_FOR_ARCHS= sparc64 > NOT_FOR_ARCHS_REASON_sparc64= does not compile on sparc64 > >-DATADIR= ${PREFIX}/share/OpenCV >-PLIST_SUB+= VERSION=${DISTVERSION:R} >+USES= cmake:outsource compiler:c++14-lang localbase:ldflags pkgconfig > >-CMAKE_ARGS+= -DWITH_CUDA:BOOL=Off \ >- -DWITH_PVAPI:BOOL=Off \ >- -DWITH_UNICAP:BOOL=Off \ >- -DBUILD_TESTS:BOOL=Off \ >- -DBUILD_DOCS:BOOL=Off \ >- -DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_CMD} >+USE_GITHUB= yes >+USE_LDCONFIG= yes >+USE_CXXSTD= c++11 >+ >+DATADIR= ${PREFIX}/share/OpenCV >+PLIST_SUB+= SOVERSION=${DISTVERSION:R} VERSION=${DISTVERSION} >+ >+# 3rd party libs >+CMAKE_ARGS+= -DENABLE_CXX11:BOOL=ON \ >+ -DBUILD_ZLIB:BOOL=OFF \ >+ -DBUILD_TIFF:BOOL=OFF \ >+ -DBUILD_JASPER:BOOL=OFF \ >+ -DBUILD_JPEG:BOOL=OFF \ >+ -DBUILD_PNG:BOOL=OFF \ >+ -DBUILD_OPENEXR:BOOL=OFF \ >+ -DBUILD_TBB:BOOL=OFF \ >+ -DBUILD_IPP_IW:BOOL=OFF \ >+ -DBUILD_ITT:BOOL=OFF \ >+ -DBUILD_PROTOBUF:BOOL=OFF >+# 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_MFX:BOOL=OFF \ >+ -DWITH_GDAL:BOOL=OFF \ >+ -DWITH_GPHOTO2:BOOL=OFF \ >+ -DWITH_LAPACK:BOOL=OFF \ >+ -DWITH_ITT:BOOL=OFF >+# 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 >+# 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 >+# 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 > > SUB_FILES= FindOpenCVCore.cmake >-SUB_LIST= OCV_VERSION=${DISTVERSION:R} >+SUB_LIST= OCV_VERSION=${DISTVERSION} > > OCV_CORE_MODS= core imgproc >-OCV_MODS= calib3d contrib features2d flann gpu \ >- highgui legacy ml ocl objdetect photo \ >- stitching superres ts video videostab >-OCV_NONFREE_MODS= nonfree >+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 >- >-OPTIONS_DEFINE= DC1394 EXAMPLES NONFREE OPENGL >-OPTIONS_GROUP= IMAGE PERFORMANCE SIMD VIDEO >-OPTIONS_GROUP_IMAGE= JASPER JPEG OPENEXR PNG TIFF >-OPTIONS_GROUP_PERFORMANCE= EIGEN3 TBB >-OPTIONS_GROUP_SIMD= ${OPTIONS_GROUP_SIMD_${MACHINE_ARCH}} >-OPTIONS_GROUP_SIMD_amd64= ${OPTIONS_GROUP_SIMD_i386} >-OPTIONS_GROUP_SIMD_armv6= NEON VFPV3 >-#OPTIONS_GROUP_SIMD_armv7= NEON VFPV3 >-OPTIONS_GROUP_SIMD_i386= SSE SSE2 SSE3 SSSE3 SSE41 SSE42 AVX AVX2 >-OPTIONS_GROUP_VIDEO= FFMPEG GSTREAMER GSTREAMER0 V4L XINE >+OCV_PYTHON_MODS= python${PYTHON_MAJOR_VER} >+ >+OPTIONS_DEFINE= EXAMPLES EXTRA_MODULES OPENGL >+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 V4L XINE > OPTIONS_RADIO= GUI > OPTIONS_RADIO_GUI= GTK2 QT4 >-OPTIONS_DEFAULT= EIGEN3 JASPER JPEG PNG TIFF V4L ${MACHINE_CPU:tu} >+# EXTRA_MODULES required for libopencv_dnn which is required by py-opencv >+OPTIONS_DEFAULT= EIGEN3 EXTRA_MODULES FFMPEG JASPER JPEG PNG TIFF WEBP V4L \ >+ ${MACHINE_CPU:tu} > OPTIONS_SUB= yes > .if defined(OCV_CORE) >-OPTIONS_EXCLUDE= DC1394 EXAMPLES GTK2 QT4 JASPER JPEG NONFREE OPENEXR \ >- OPENGL PNG TIFF FFMPEG GSTREAMER GSTREAMER0 V4L XINE >+OPTIONS_EXCLUDE= ARAVIS DC1394 EXAMPLES EXTRA_MODULES FFMPEG \ >+ GDAL GDCM GPHOTO2 GSTREAMER GTK2 JASPER JPEG \ >+ OPENEXR OPENGL PNG QT4 TIFF WEBP V4L XINE >+.elif defined(OCV_SLAVE) >+OPTIONS_EXCLUDE= EXAMPLES > .endif > > DC1394_DESC= IEEE 1394 camera support > DC1394_LIB_DEPENDS= libdc1394.so:multimedia/libdc1394 > DC1394_CMAKE_BOOL= WITH_1394 > >-EIGEN3_DESC= Eigen 3 support >-EIGEN3_USES= eigen:3 >-EIGEN3_CMAKE_BOOL= WITH_EIGEN >+EXAMPLES_CMAKE_BOOL= INSTALL_C_EXAMPLES > >-. if !defined(OCV_SLAVE) >-EXAMPLES_CMAKE_BOOL= BUILD_EXAMPLES INSTALL_C_EXAMPLES >-. endif >-EXAMPLES_PORTEXAMPLES= * >+PERFORMANCE_DESC= Performance enhancing libraries > >-FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg >-FFMPEG_CMAKE_BOOL= WITH_FFMPEG >+EIGEN3_DESC= Eigen 3 support >+EIGEN3_BUILD_DEPENDS= ${LOCALBASE}/include/eigen3/Eigen/Eigen:math/eigen3 >+EIGEN3_CMAKE_BOOL= WITH_EIGEN > >-GSTREAMER0_DESC= ${GSTREAMER_DESC} 0.10 >-GSTREAMER0_USE= GSTREAMER=yes >-GSTREAMER0_CMAKE_BOOL= WITH_GSTREAMER_0_10 >+OPENCL_DESC= OpenCL support >+OPENCL_BUILD_DEPENDS= opencl>=0:devel/opencl >+OPENCL_RUN_DEPENDS= opencl>=0:devel/opencl >+OPENCL_CMAKE_BOOL= WITH_OPENCL > >-GSTREAMER_USE= GSTREAMER1=yes >-GSTREAMER_CMAKE_BOOL= WITH_GSTREAMER >+TBB_DESC= TBB support >+TBB_LIB_DEPENDS= libtbb.so:devel/tbb >+TBB_CMAKE_BOOL= WITH_TBB > >-GTK2_USE= GNOME=gtk20 >-GTK2_CMAKE_BOOL= WITH_GTK >+IMAGE_DESC= Image format support > > JASPER_LIB_DEPENDS= libjasper.so:graphics/jasper > JASPER_CMAKE_BOOL= WITH_JASPER >@@ -92,88 +203,148 @@ JASPER_CMAKE_BOOL= WITH_JASPER > JPEG_USES= jpeg > JPEG_CMAKE_BOOL= WITH_JPEG > >-NONFREE_CMAKE_BOOL= BUILD_opencv_nonfree >+GDAL_DESC= Geospatial Data Abstraction Library >+GDAL_LIB_DEPENDS= libgdal.so:graphics/gdal >+GDAL_CMAKE_BOOL= WITH_GDAL >+ >+GDCM_DESC= Open source DICOM library >+GDCM_LIB_DEPENDS= libgdcmMSFF.so:devel/gdcm >+GDCM_CMAKE_BOOL= WITH_GDCM > > OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR > OPENEXR_CMAKE_BOOL= WITH_OPENEXR > >-OPENGL_LIB_DEPENDS= ${PORT_OPTIONS:MGTK2:C,.+,libgtkglext-x11-1.0.so:x11-toolkits/gtkglext,} >-OPENGL_USE= ${PORT_OPTIONS:MQT4:S,$,=opengl,} >-OPENGL_CMAKE_BOOL= WITH_OPENGL >- > PNG_LIB_DEPENDS= libpng.so:graphics/png > PNG_CMAKE_BOOL= WITH_PNG > >-QT4_USE= QT4=gui,moc_build,qmake_build,rcc_build,uic_build,qtestlib >-QT4_CMAKE_ON= -DWITH_QT:STRING="4" >-QT4_CMAKE_OFF= -DWITH_QT:BOOL=false >+TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff >+TIFF_CMAKE_BOOL= WITH_TIFF > >-.for _simd in ${OPTIONS_GROUP_SIMD} >-${_simd}_DESC= ${MMX_DESC:S/MMX/${_simd}/} >-${_simd}_CMAKE_BOOL= ENABLE_${_simd} >-.endfor >+WEBP_LIB_DEPENDS= libwebp.so:graphics/webp >+WEBP_CMAKE_BOOL= WITH_WEBP > >-TBB_LIB_DEPENDS= libtbb.so:devel/tbb >-TBB_CMAKE_BOOL= WITH_TBB >-TBB_CMAKE_ON= -DTBB_INCLUDE_DIR:STRING="${LOCALBASE}/include" >+VIDEO_DESC= Video support > >-TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff >-TIFF_CMAKE_BOOL= WITH_TIFF >+ARAVIS_DESC= Aravis SDK >+ARAVIS_LIB_DEPENDS= libaravis-0.6.so:devel/libaravis >+ARAVIS_CMAKE_BOOL= WITH_ARAVIS >+ >+FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg >+FFMPEG_CMAKE_BOOL= WITH_FFMPEG >+ >+GPHOTO2_DESC= Gphoto2 camera support >+GPHOTO2_LIB_DEPENDS= libgphoto2.so:graphics/libgphoto2 >+GPHOTO2_CMAKE_BOOL= WITH_GPHOTO2 >+ >+GSTREAMER_USE= GSTREAMER1=yes >+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 >-V4L_CMAKE_ON= -DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include" >+V4L_CMAKE_ON= -DWITH_V4L:BOOL=ON \ >+ -DWITH_LIBV4L:BOOL=ON \ >+ -DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include" >+V4L_CMAKE_OFF= -DWITH_V4L:BOOL=OFF -DWITH_LIBV4L:BOOL=OFF > > XINE_LIB_DEPENDS= libxine.so:multimedia/libxine > XINE_CMAKE_BOOL= WITH_XINE > >-IMAGE_DESC= Image format support >-NONFREE_DESC= Build functionality that has possible limitations of use >-PERFORMANCE_DESC= Performance enhancing libraries >-TBB_DESC= TBB support >+LIB_DEPENDS+= libprotobuf.so:devel/protobuf \ >+ libtesseract.so:graphics/tesseract >+ >+EXTRA_MODULES_DESC= Extra modules >+EXTRA_MODULES_GH_ACCOUNT= opencv:DEFAULT \ >+ tiny-dnn:extra_mod_3rdparty_tiny_dnn >+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 >+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 >+ >+OPENGL_DESC= OpenGL (require QT or GTK2) >+OPENGL_CMAKE_BOOL= WITH_OPENGL >+OPENGL_LIB_DEPENDS= ${PORT_OPTIONS:MGTK2:C,.+,libgtkglext-x11-1.0.so:x11-toolkits/gtkglext,} >+OPENGL_USE= ${PORT_OPTIONS:MQT4:S,$,=opengl,} >+ >+# GUI >+ >+GTK2_USE= GNOME=gtk20 >+GTK2_CMAKE_BOOL= WITH_GTK >+ >+QT4_USE= QT4=gui,moc_build,qmake_build,rcc_build,uic_build,qtestlib >+QT4_CMAKE_ON= -DWITH_QT:STRING="4" >+QT4_CMAKE_OFF= -DWITH_QT:BOOL=OFF > > .if defined(OCV_CORE) > . for module in ${OCV_MODS} ${OCV_JAVA_MODS} ${OCV_PYTHON_MODS} >-CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=Off >+CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=OFF > . endfor > .elif defined(OCV_PYTHON) >-LIB_DEPENDS+= libopencv_legacy.so:graphics/opencv >+LIB_DEPENDS+= libopencv_core.so:graphics/opencv-core \ >+ libopencv_imgproc.so:graphics/opencv-core \ >+ libopencv_ml.so:graphics/opencv > BUILD_DEPENDS+= ${PYNUMPY} > RUN_DEPENDS+= ${PYNUMPY} >-USES+= fortran python:2.7 >-USE_PYTHON= flavors >-CMAKE_ARGS+= -DBUILD_opencv_python:BOOL=On >+USES+= python:2.7 >+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 >+CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=OFF > . endfor >-INSTALL_WRKSRC= ${WRKSRC}/modules/python >+INSTALL_WRKSRC= ${WRKDIR}/.build/modules/python${PYTHON_MAJOR_VER} > .elif defined(OCV_JAVA) > BUILD_DEPENDS+= ant:devel/apache-ant >-LIB_DEPENDS+= libopencv_legacy.so:graphics/opencv >-USES+= python:2.7,build >+LIB_DEPENDS+= libopencv_ml.so:graphics/opencv >+USES+= python:build > USE_JAVA= yes >-CMAKE_ARGS+= -DBUILD_opencv_java:BOOL=On >+CMAKE_ARGS+= -DBUILD_opencv_java:BOOL=ON > . for module in apps python stitching superres videostab >-CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=Off >+CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=OFF > . endfor > CONFIGURE_ENV+= JAVA_HOME="${JAVA_HOME}" >-INSTALL_WRKSRC= ${WRKSRC}/modules/java >+INSTALL_WRKSRC= ${WRKDIR}/.build/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 >+CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=OFF > . endfor > .endif > >+.if !defined(OCV_JAVA) >+CMAKE_ARGS+= -DBUILD_JAVA:BOOL=OFF >+.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/ >+ @${MV} ${WRKSRC_extra_mod_3rdparty_boost_descr}/* ${CONFIGURE_WRKSRC}/downloads/xfeatures2d/ >+ @${MV} ${WRKSRC_extra_mod_3rdparty_vgg_descr}/* ${CONFIGURE_WRKSRC}/downloads/xfeatures2d/ >+ > post-patch: >- @${MKDIR} ${CONFIGURE_WRKSRC} > @${REINPLACE_CMD} -e '/pkgconfig/s|$${OPENCV_LIB_INSTALL_PATH}|libdata|' \ > ${WRKSRC}/cmake/OpenCVGenPkgconfig.cmake >+ @${REINPLACE_CMD} -e 's|$${OpenCV_SOURCE_DIR}/3rdparty/include/opencl/1.2|${LOCALBASE}/include/CL|g' \ >+ ${WRKSRC}/cmake/OpenCVDetectOpenCL.cmake > @${REINPLACE_CMD} -e 's|share/OpenCV/doc|${DOCSDIR_REL}|g' \ > -e 's|share/OpenCV/samples|${EXAMPLESDIR_REL}|g' \ > ${WRKSRC}/CMakeLists.txt >- @${FIND} ${WRKSRC} -name '*.orig' -exec ${RM} {} \; >+ @${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 >@@ -184,12 +355,18 @@ post-patch: > @${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/imgproc \ >- lib/libopencv_core* lib/libopencv_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*) > .endif > .if defined(OCV_CORE) > ${RM} -r ${STAGEDIR}${PREFIX}/include/opencv >@@ -204,8 +381,8 @@ post-install: > ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ > -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S|${PREFIX}/||}) > ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} >- cd ${WRKSRC}/samples/python2 && \ >- ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/python2 >+ cd ${WRKSRC}/samples/python && \ >+ ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/python > .endif > .if defined(OCV_JAVA) > ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} >@@ -213,4 +390,12 @@ post-install: > ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/java > .endif > >-.include <bsd.port.mk> >+.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 >+.endif >+ >+.include <bsd.port.post.mk> >diff --git graphics/opencv/distinfo graphics/opencv/distinfo >index bdc98110c8db..c27031efb0c3 100644 >--- graphics/opencv/distinfo >+++ graphics/opencv/distinfo >@@ -1,3 +1,13 @@ >-TIMESTAMP = 1475482010 >-SHA256 (opencv-opencv-2.4.13.1_GH0.tar.gz) = 0d5ce5e0973e3a745f927d1ee097aaf909aae59f787be6d27a03d639e2d96bd7 >-SIZE (opencv-opencv-2.4.13.1_GH0.tar.gz) = 91773677 >+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 >+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 >diff --git graphics/opencv/files/patch-cmake__OpenCVCompilerOptions.cmake graphics/opencv/files/patch-cmake__OpenCVCompilerOptions.cmake >deleted file mode 100644 >index b6c66a3ae2ec..000000000000 >--- graphics/opencv/files/patch-cmake__OpenCVCompilerOptions.cmake >+++ /dev/null >@@ -1,27 +0,0 @@ >---- ./cmake/OpenCVCompilerOptions.cmake.orig 2013-11-06 09:26:39.000000000 -0500 >-+++ ./cmake/OpenCVCompilerOptions.cmake 2013-11-30 05:56:46.000000000 -0500 >-@@ -122,7 +122,7 @@ >- add_extra_compiler_option(-ffast-math) >- endif() >- if(ENABLE_POWERPC) >-- add_extra_compiler_option("-mcpu=G3 -mtune=G5") >-+ add_extra_compiler_option("-mtune=G5") >- endif() >- if(ENABLE_SSE) >- add_extra_compiler_option(-msse) >-@@ -158,6 +158,7 @@ >- endif(NOT MINGW) >- >- if(X86 OR X86_64) >-+ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") >- if(NOT APPLE AND CMAKE_SIZEOF_VOID_P EQUAL 4) >- if(OPENCV_EXTRA_CXX_FLAGS MATCHES "-m(sse2|avx)") >- add_extra_compiler_option(-mfpmath=sse)# !! important - be on the same wave with x64 compilers >-@@ -165,6 +166,7 @@ >- add_extra_compiler_option(-mfpmath=387) >- endif() >- endif() >-+ endif() >- endif() >- >- # Profiling? >diff --git graphics/opencv/files/patch-cmake__OpenCVFindLibsGUI.cmake graphics/opencv/files/patch-cmake__OpenCVFindLibsGUI.cmake >deleted file mode 100644 >index cfe9392d3e21..000000000000 >--- graphics/opencv/files/patch-cmake__OpenCVFindLibsGUI.cmake >+++ /dev/null >@@ -1,14 +0,0 @@ >---- ./cmake/OpenCVFindLibsGUI.cmake.orig 2013-12-10 09:20:59.000000000 -0500 >-+++ ./cmake/OpenCVFindLibsGUI.cmake 2013-12-10 09:22:40.000000000 -0500 >-@@ -56,10 +56,9 @@ >- if(OPENGL_FOUND) >- set(HAVE_OPENGL TRUE) >- list(APPEND OPENCV_LINKER_LIBS ${OPENGL_LIBRARIES}) >-+ ocv_include_directories(${OPENGL_INCLUDE_DIR}) >- if(QT_QTOPENGL_FOUND) >- set(HAVE_QT_OPENGL TRUE) >-- else() >-- ocv_include_directories(${OPENGL_INCLUDE_DIR}) >- endif() >- endif() >- endif() >diff --git graphics/opencv/files/patch-cmake__OpenCVVersion.cmake graphics/opencv/files/patch-cmake__OpenCVVersion.cmake >deleted file mode 100644 >index d77f4b0b5511..000000000000 >--- graphics/opencv/files/patch-cmake__OpenCVVersion.cmake >+++ /dev/null >@@ -1,11 +0,0 @@ >---- ./cmake/OpenCVVersion.cmake.orig 2013-10-24 00:12:48.000000000 -0400 >-+++ ./cmake/OpenCVVersion.cmake 2013-10-24 00:13:06.000000000 -0400 >-@@ -11,7 +11,7 @@ >- set(OPENCV_VERSION "${OPENCV_VERSION}.${OPENCV_VERSION_TWEAK}") >- endif() >- >--set(OPENCV_SOVERSION "${OPENCV_VERSION_MAJOR}.${OPENCV_VERSION_MINOR}") >-+set(OPENCV_SOVERSION "${OPENCV_VERSION_MAJOR}") >- set(OPENCV_LIBVERSION "${OPENCV_VERSION_MAJOR}.${OPENCV_VERSION_MINOR}.${OPENCV_VERSION_PATCH}") >- >- # create a dependency on version file >diff --git graphics/opencv/files/patch-modules__contrib__src__spinimages.cpp graphics/opencv/files/patch-modules__contrib__src__spinimages.cpp >deleted file mode 100644 >index d44b043812a7..000000000000 >--- graphics/opencv/files/patch-modules__contrib__src__spinimages.cpp >+++ /dev/null >@@ -1,10 +0,0 @@ >---- ./modules/contrib/src/spinimages.cpp.orig 2013-10-26 07:55:45.000000000 -0400 >-+++ ./modules/contrib/src/spinimages.cpp 2013-10-26 07:56:13.000000000 -0400 >-@@ -46,6 +46,7 @@ >- #include <functional> >- #include <fstream> >- #include <limits> >-+#include <numeric> >- #include <set> >- >- using namespace cv; >diff --git graphics/opencv/files/patch-modules__core__src__system.cpp graphics/opencv/files/patch-modules__core__src__system.cpp >deleted file mode 100644 >index 81eff621346d..000000000000 >--- graphics/opencv/files/patch-modules__core__src__system.cpp >+++ /dev/null >@@ -1,41 +0,0 @@ >---- modules/core/src/system.cpp.orig 2016-09-16 15:55:58 UTC >-+++ modules/core/src/system.cpp >-@@ -157,7 +157,7 @@ std::wstring GetTempFileNameWinRT(std::w >- >- #include <stdarg.h> >- >--#if defined __linux__ || defined __APPLE__ || defined __EMSCRIPTEN__ || defined __QNX__ >-+#if defined __linux__ || defined __APPLE__ || defined __EMSCRIPTEN__ || defined __QNX__ || defined __FreeBSD__ >- #include <unistd.h> >- #include <stdio.h> >- #include <sys/types.h> >-@@ -942,14 +942,23 @@ struct Mutex::Impl >- >- struct Mutex::Impl >- { >-- Impl() { pthread_mutex_init(&sl, 0); refcount = 1; } >-- ~Impl() { pthread_mutex_destroy(&sl); } >-+ Impl() >-+ { >-+ pthread_mutexattr_t attr; >-+ pthread_mutexattr_init(&attr); >-+ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); >-+ pthread_mutex_init(&mt, &attr); >-+ pthread_mutexattr_destroy(&attr); >-+ >-+ refcount = 1; >-+ } >-+ ~Impl() { pthread_mutex_destroy(&mt); } >- >-- void lock() { pthread_mutex_lock(&sl); } >-- bool trylock() { return pthread_mutex_trylock(&sl) == 0; } >-- void unlock() { pthread_mutex_unlock(&sl); } >-+ void lock() { pthread_mutex_lock(&mt); } >-+ bool trylock() { return pthread_mutex_trylock(&mt) == 0; } >-+ void unlock() { pthread_mutex_unlock(&mt); } >- >-- pthread_mutex_t sl; >-+ pthread_mutex_t mt; >- int refcount; >- }; >- >diff --git graphics/opencv/files/patch-modules__highgui__src__cap_libv4l.cpp graphics/opencv/files/patch-modules__highgui__src__cap_libv4l.cpp >deleted file mode 100644 >index 33a6ec871e13..000000000000 >--- graphics/opencv/files/patch-modules__highgui__src__cap_libv4l.cpp >+++ /dev/null >@@ -1,19 +0,0 @@ >---- ./modules/highgui/src/cap_libv4l.cpp.orig 2013-07-10 07:49:00.000000000 -0400 >-+++ ./modules/highgui/src/cap_libv4l.cpp 2013-10-23 23:52:32.000000000 -0400 >-@@ -237,7 +237,6 @@ >- #include <sys/mman.h> >- #include <string.h> >- #include <stdlib.h> >--#include <asm/types.h> /* for videodev2.h */ >- #include <assert.h> >- #include <sys/stat.h> >- #include <sys/ioctl.h> >-@@ -574,7 +573,7 @@ >- >- static void v4l2_scan_controls(CvCaptureCAM_V4L* capture) { >- >-- __u32 ctrl_id; >-+ uint32_t ctrl_id; >- struct v4l2_control c; >- if (capture->v4l2_ctrl_ranges != NULL) { >- v4l2_free_ranges(capture); >diff --git graphics/opencv/files/patch-modules__highgui__src__cap_v4l.cpp graphics/opencv/files/patch-modules__highgui__src__cap_v4l.cpp >deleted file mode 100644 >index b8ad1a3fdfa3..000000000000 >--- graphics/opencv/files/patch-modules__highgui__src__cap_v4l.cpp >+++ /dev/null >@@ -1,19 +0,0 @@ >---- ./modules/highgui/src/cap_v4l.cpp.orig 2013-10-23 23:54:06.000000000 -0400 >-+++ ./modules/highgui/src/cap_v4l.cpp 2013-10-23 23:55:25.000000000 -0400 >-@@ -232,7 +232,6 @@ >- #include <sys/ioctl.h> >- >- #ifdef HAVE_CAMV4L2 >--#include <asm/types.h> /* for videodev2.h */ >- #include <linux/videodev2.h> >- #endif >- >-@@ -663,7 +662,7 @@ >- static void v4l2_scan_controls(CvCaptureCAM_V4L* capture) >- { >- >-- __u32 ctrl_id; >-+ uint32_t ctrl_id; >- >- for (ctrl_id = V4L2_CID_BASE; >- ctrl_id < V4L2_CID_LASTP1; >diff --git graphics/opencv/files/patch-modules__python__src2__cv2.cv.hpp graphics/opencv/files/patch-modules__python__src2__cv2.cv.hpp >deleted file mode 100644 >index 94780cc36351..000000000000 >--- graphics/opencv/files/patch-modules__python__src2__cv2.cv.hpp >+++ /dev/null >@@ -1,11 +0,0 @@ >---- ./modules/python/src2/cv2.cv.hpp.orig 2013-10-22 17:54:10.000000000 -0400 >-+++ ./modules/python/src2/cv2.cv.hpp 2013-10-22 17:55:03.000000000 -0400 >-@@ -2169,7 +2169,7 @@ >- static int convert_to_CvNextEdgeType(PyObject *o, CvNextEdgeType *dst, const char *name = "no_name") >- { >- if (!PyInt_Check(o)) { >-- *dst = (CvNextEdgeType)NULL; >-+ *dst = (CvNextEdgeType)0; >- return failmsg("Expected number for CvNextEdgeType argument '%s'", name); >- } else { >- *dst = (CvNextEdgeType)PyInt_AsLong(o); >diff --git graphics/opencv/files/patch-modules__ts__src__ts.cpp graphics/opencv/files/patch-modules__ts__src__ts.cpp >deleted file mode 100644 >index 44151a8a0e3d..000000000000 >--- graphics/opencv/files/patch-modules__ts__src__ts.cpp >+++ /dev/null >@@ -1,20 +0,0 @@ >---- ./modules/ts/src/ts.cpp.orig 2013-10-26 08:01:35.000000000 -0400 >-+++ ./modules/ts/src/ts.cpp 2013-10-26 08:02:28.000000000 -0400 >-@@ -562,7 +562,7 @@ >- for( int i = 0; i < MAX_IDX; i++ ) >- if( (streams & (1 << i)) ) >- { >-- output_buf[i] += std::string(str); >-+ output_buf[i] += ::std::string(str); >- // in the new GTest-based framework we do not use >- // any output files (except for the automatically generated xml report). >- // if a test fails, all the buffers are printed, so we do not want to duplicate the information and >-@@ -617,7 +617,7 @@ >- Scalar s; >- uchar *p = NULL; >- int n = 100/delta; >-- int nR = std::min(n, (img.rows+1)/2), nC = std::min(n, (img.cols+1)/2); >-+ int nR = ::std::min(n, (img.rows+1)/2), nC = std::min(n, (img.cols+1)/2); >- >- int r, c, i; >- for(r=0; r<nR; r++) >diff --git graphics/opencv/files/patch-modules_highgui_src_cap__ffmpeg__impl.hpp graphics/opencv/files/patch-modules_highgui_src_cap__ffmpeg__impl.hpp >deleted file mode 100644 >index a8f6abd38dbc..000000000000 >--- graphics/opencv/files/patch-modules_highgui_src_cap__ffmpeg__impl.hpp >+++ /dev/null >@@ -1,94 +0,0 @@ >-https://github.com/opencv/opencv/commit/99091a62463e >- >---- modules/highgui/src/cap_ffmpeg_impl.hpp.orig 2016-09-16 15:55:58 UTC >-+++ modules/highgui/src/cap_ffmpeg_impl.hpp >-@@ -170,6 +170,10 @@ extern "C" { >- #define AV_PIX_FMT_GRAY16BE PIX_FMT_GRAY16BE >- #endif >- >-+#ifndef PKT_FLAG_KEY >-+#define PKT_FLAG_KEY AV_PKT_FLAG_KEY >-+#endif >-+ >- #if LIBAVUTIL_BUILD >= (LIBAVUTIL_VERSION_MICRO >= 100 \ >- ? CALC_FFMPEG_VERSION(52, 38, 100) : CALC_FFMPEG_VERSION(52, 13, 0)) >- #define USE_AV_FRAME_GET_BUFFER 1 >-@@ -1478,7 +1482,11 @@ static AVStream *icv_add_video_stream_FFMPEG(AVFormatC >- // some formats want stream headers to be seperate >- if(oc->oformat->flags & AVFMT_GLOBALHEADER) >- { >-+#if LIBAVCODEC_BUILD > CALC_FFMPEG_VERSION(56, 35, 0) >-+ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; >-+#else >- c->flags |= CODEC_FLAG_GLOBAL_HEADER; >-+#endif >- } >- #endif >- >-@@ -1502,23 +1510,24 @@ static int icv_av_write_frame_FFMPEG( AVFormatContext >- #endif >- int ret = OPENCV_NO_FRAMES_WRITTEN_CODE; >- >-- if (oc->oformat->flags & AVFMT_RAWPICTURE) { >-+#if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(57, 0, 0) >-+ if (oc->oformat->flags & AVFMT_RAWPICTURE) >-+ { >- /* raw video case. The API will change slightly in the near >- futur for that */ >- AVPacket pkt; >- av_init_packet(&pkt); >- >--#ifndef PKT_FLAG_KEY >--#define PKT_FLAG_KEY AV_PKT_FLAG_KEY >--#endif >-- >- pkt.flags |= PKT_FLAG_KEY; >- pkt.stream_index= video_st->index; >- pkt.data= (uint8_t *)picture; >- pkt.size= sizeof(AVPicture); >- >- ret = av_write_frame(oc, &pkt); >-- } else { >-+ } >-+ else >-+#endif >-+ { >- /* encode the image */ >- AVPacket pkt; >- av_init_packet(&pkt); >-@@ -1676,7 +1685,9 @@ void CvVideoWriter_FFMPEG::close() >- /* write the trailer, if any */ >- if(ok && oc) >- { >-- if( (oc->oformat->flags & AVFMT_RAWPICTURE) == 0 ) >-+#if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(57, 0, 0) >-+ if (!(oc->oformat->flags & AVFMT_RAWPICTURE)) >-+#endif >- { >- for(;;) >- { >-@@ -1910,7 +1921,10 @@ bool CvVideoWriter_FFMPEG::open( const char * filename >- >- outbuf = NULL; >- >-- if (!(oc->oformat->flags & AVFMT_RAWPICTURE)) { >-+#if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(57, 0, 0) >-+ if (!(oc->oformat->flags & AVFMT_RAWPICTURE)) >-+#endif >-+ { >- /* allocate output buffer */ >- /* assume we will never get codec output with more than 4 bytes per pixel... */ >- outbuf_size = width*height*4; >-@@ -2204,7 +2218,11 @@ AVStream* OutputMediaStream_FFMPEG::addVideoStream(AVF >- // some formats want stream headers to be seperate >- if (oc->oformat->flags & AVFMT_GLOBALHEADER) >- { >-- c->flags |= CODEC_FLAG_GLOBAL_HEADER; >-+ #if LIBAVCODEC_BUILD > CALC_FFMPEG_VERSION(56, 35, 0) >-+ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; >-+ #else >-+ c->flags |= CODEC_FLAG_GLOBAL_HEADER; >-+ #endif >- } >- #endif >- >diff --git graphics/opencv/files/patch-samples__cpp__tutorial_code__core__how_to_scan_images__how_to_scan_images.cpp graphics/opencv/files/patch-samples__cpp__tutorial_code__core__how_to_scan_images__how_to_scan_images.cpp >deleted file mode 100644 >index 8c0e72703f52..000000000000 >--- graphics/opencv/files/patch-samples__cpp__tutorial_code__core__how_to_scan_images__how_to_scan_images.cpp >+++ /dev/null >@@ -1,15 +0,0 @@ >---- ./samples/cpp/tutorial_code/core/how_to_scan_images/how_to_scan_images.cpp.orig 2013-10-26 09:51:39.000000000 -0400 >-+++ ./samples/cpp/tutorial_code/core/how_to_scan_images/how_to_scan_images.cpp 2013-10-26 09:51:47.000000000 -0400 >-@@ -1,4 +1,4 @@ >--#include <opencv2/core/core.hpp> >-+#include <opencv2/core/core.hpp> >- #include <opencv2/highgui/highgui.hpp> >- #include <iostream> >- #include <sstream> >-@@ -213,4 +213,4 @@ >- } >- >- return I; >--} >-\ No newline at end of file >-+} >diff --git graphics/opencv/pkg-plist graphics/opencv/pkg-plist >index 2a7e0841340d..1c85948ce347 100644 >--- graphics/opencv/pkg-plist >+++ graphics/opencv/pkg-plist >@@ -1,9 +1,10 @@ > bin/opencv_annotation > bin/opencv_createsamples >-bin/opencv_haartraining >-bin/opencv_performance >+%%EXTRA_MODULES%%bin/opencv_interactive-calibration > 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 >@@ -15,16 +16,77 @@ 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 >+%%EXTRA_MODULES%%include/opencv2/bgsegm.hpp >+%%EXTRA_MODULES%%include/opencv2/bioinspired.hpp >+%%EXTRA_MODULES%%include/opencv2/bioinspired/bioinspired.hpp >+%%EXTRA_MODULES%%include/opencv2/bioinspired/retina.hpp >+%%EXTRA_MODULES%%include/opencv2/bioinspired/retinafasttonemapping.hpp >+%%EXTRA_MODULES%%include/opencv2/bioinspired/transientareassegmentationmodule.hpp > include/opencv2/calib3d.hpp > include/opencv2/calib3d/calib3d.hpp >-include/opencv2/contrib/contrib.hpp >-include/opencv2/contrib/detection_based_tracker.hpp >-include/opencv2/contrib/hybridtracker.hpp >-include/opencv2/contrib/openfabmap.hpp >-include/opencv2/contrib/retina.hpp >-@comment include/opencv2/core.hpp >+include/opencv2/calib3d/calib3d_c.h >+%%EXTRA_MODULES%%include/opencv2/ccalib.hpp >+%%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/datasets/ar_hmdb.hpp >+%%EXTRA_MODULES%%include/opencv2/datasets/ar_sports.hpp >+%%EXTRA_MODULES%%include/opencv2/datasets/dataset.hpp >+%%EXTRA_MODULES%%include/opencv2/datasets/fr_adience.hpp >+%%EXTRA_MODULES%%include/opencv2/datasets/fr_lfw.hpp >+%%EXTRA_MODULES%%include/opencv2/datasets/gr_chalearn.hpp >+%%EXTRA_MODULES%%include/opencv2/datasets/gr_skig.hpp >+%%EXTRA_MODULES%%include/opencv2/datasets/hpe_humaneva.hpp >+%%EXTRA_MODULES%%include/opencv2/datasets/hpe_parse.hpp >+%%EXTRA_MODULES%%include/opencv2/datasets/ir_affine.hpp >+%%EXTRA_MODULES%%include/opencv2/datasets/ir_robot.hpp >+%%EXTRA_MODULES%%include/opencv2/datasets/is_bsds.hpp >+%%EXTRA_MODULES%%include/opencv2/datasets/is_weizmann.hpp >+%%EXTRA_MODULES%%include/opencv2/datasets/msm_epfl.hpp >+%%EXTRA_MODULES%%include/opencv2/datasets/msm_middlebury.hpp >+%%EXTRA_MODULES%%include/opencv2/datasets/or_imagenet.hpp >+%%EXTRA_MODULES%%include/opencv2/datasets/or_mnist.hpp >+%%EXTRA_MODULES%%include/opencv2/datasets/or_pascal.hpp >+%%EXTRA_MODULES%%include/opencv2/datasets/or_sun.hpp >+%%EXTRA_MODULES%%include/opencv2/datasets/pd_caltech.hpp >+%%EXTRA_MODULES%%include/opencv2/datasets/pd_inria.hpp >+%%EXTRA_MODULES%%include/opencv2/datasets/slam_kitti.hpp >+%%EXTRA_MODULES%%include/opencv2/datasets/slam_tumindoor.hpp >+%%EXTRA_MODULES%%include/opencv2/datasets/tr_chars.hpp >+%%EXTRA_MODULES%%include/opencv2/datasets/tr_icdar.hpp >+%%EXTRA_MODULES%%include/opencv2/datasets/tr_svt.hpp >+%%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 >+%%EXTRA_MODULES%%include/opencv2/dpm.hpp >+%%EXTRA_MODULES%%include/opencv2/face.hpp >+%%EXTRA_MODULES%%include/opencv2/face/bif.hpp >+%%EXTRA_MODULES%%include/opencv2/face/face_alignment.hpp >+%%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/facerec.hpp >+%%EXTRA_MODULES%%include/opencv2/face/predict_collector.hpp > include/opencv2/features2d.hpp > include/opencv2/features2d/features2d.hpp >+include/opencv2/features2d/hal/interface.h > include/opencv2/flann.hpp > include/opencv2/flann/all_indices.h > include/opencv2/flann/allocator.h >@@ -62,66 +124,73 @@ include/opencv2/flann/sampling.h > include/opencv2/flann/saving.h > include/opencv2/flann/simplex_downhill.h > include/opencv2/flann/timer.h >-include/opencv2/gpu/device/block.hpp >-include/opencv2/gpu/device/border_interpolate.hpp >-include/opencv2/gpu/device/color.hpp >-include/opencv2/gpu/device/common.hpp >-include/opencv2/gpu/device/datamov_utils.hpp >-include/opencv2/gpu/device/detail/color_detail.hpp >-include/opencv2/gpu/device/detail/reduce.hpp >-include/opencv2/gpu/device/detail/reduce_key_val.hpp >-include/opencv2/gpu/device/detail/transform_detail.hpp >-include/opencv2/gpu/device/detail/type_traits_detail.hpp >-include/opencv2/gpu/device/detail/vec_distance_detail.hpp >-include/opencv2/gpu/device/dynamic_smem.hpp >-include/opencv2/gpu/device/emulation.hpp >-include/opencv2/gpu/device/filters.hpp >-include/opencv2/gpu/device/funcattrib.hpp >-include/opencv2/gpu/device/functional.hpp >-include/opencv2/gpu/device/limits.hpp >-include/opencv2/gpu/device/reduce.hpp >-include/opencv2/gpu/device/saturate_cast.hpp >-include/opencv2/gpu/device/scan.hpp >-include/opencv2/gpu/device/simd_functions.hpp >-include/opencv2/gpu/device/static_check.hpp >-include/opencv2/gpu/device/transform.hpp >-include/opencv2/gpu/device/type_traits.hpp >-include/opencv2/gpu/device/utility.hpp >-include/opencv2/gpu/device/vec_distance.hpp >-include/opencv2/gpu/device/vec_math.hpp >-include/opencv2/gpu/device/vec_traits.hpp >-include/opencv2/gpu/device/warp.hpp >-include/opencv2/gpu/device/warp_reduce.hpp >-include/opencv2/gpu/device/warp_shuffle.hpp >-include/opencv2/gpu/devmem2d.hpp >-include/opencv2/gpu/gpu.hpp >-include/opencv2/gpu/gpumat.hpp >-include/opencv2/gpu/stream_accessor.hpp >+%%EXTRA_MODULES%%include/opencv2/freetype.hpp >+%%EXTRA_MODULES%%include/opencv2/fuzzy.hpp >+%%EXTRA_MODULES%%include/opencv2/fuzzy/fuzzy_F0_math.hpp >+%%EXTRA_MODULES%%include/opencv2/fuzzy/fuzzy_F1_math.hpp >+%%EXTRA_MODULES%%include/opencv2/fuzzy/fuzzy_image.hpp >+%%EXTRA_MODULES%%include/opencv2/fuzzy/types.hpp >+%%EXTRA_MODULES%%include/opencv2/hdf.hpp >+%%EXTRA_MODULES%%include/opencv2/hdf/hdf5.hpp > include/opencv2/highgui.hpp >-include/opencv2/highgui/cap_ios.h > include/opencv2/highgui/highgui.hpp > include/opencv2/highgui/highgui_c.h >-include/opencv2/highgui/ios.h >-@comment include/opencv2/imgproc.hpp >-include/opencv2/legacy/blobtrack.hpp >-include/opencv2/legacy/compat.hpp >-include/opencv2/legacy/legacy.hpp >-include/opencv2/legacy/streams.hpp >+%%EXTRA_MODULES%%include/opencv2/line_descriptor.hpp >+%%EXTRA_MODULES%%include/opencv2/line_descriptor/descriptor.hpp > include/opencv2/ml.hpp > include/opencv2/ml/ml.hpp >-%%NONFREE%%include/opencv2/nonfree/features2d.hpp >-%%NONFREE%%include/opencv2/nonfree/gpu.hpp >-%%NONFREE%%include/opencv2/nonfree/nonfree.hpp >-%%NONFREE%%include/opencv2/nonfree/ocl.hpp > include/opencv2/objdetect.hpp >+include/opencv2/objdetect/detection_based_tracker.hpp > include/opencv2/objdetect/objdetect.hpp >-include/opencv2/ocl/matrix_operations.hpp >-include/opencv2/ocl/ocl.hpp >-include/opencv2/opencv.hpp >-include/opencv2/opencv_modules.hpp >+include/opencv2/objdetect/objdetect_c.h >+%%EXTRA_MODULES%%include/opencv2/optflow.hpp >+%%EXTRA_MODULES%%include/opencv2/optflow/motempl.hpp >+%%EXTRA_MODULES%%include/opencv2/optflow/pcaflow.hpp >+%%EXTRA_MODULES%%include/opencv2/optflow/sparse_matching_gpc.hpp >+%%EXTRA_MODULES%%include/opencv2/phase_unwrapping.hpp >+%%EXTRA_MODULES%%include/opencv2/phase_unwrapping/histogramphaseunwrapping.hpp >+%%EXTRA_MODULES%%include/opencv2/phase_unwrapping/phase_unwrapping.hpp > include/opencv2/photo.hpp >+include/opencv2/photo/cuda.hpp > include/opencv2/photo/photo.hpp > include/opencv2/photo/photo_c.h >+%%EXTRA_MODULES%%include/opencv2/plot.hpp >+%%EXTRA_MODULES%%include/opencv2/reg/map.hpp >+%%EXTRA_MODULES%%include/opencv2/reg/mapaffine.hpp >+%%EXTRA_MODULES%%include/opencv2/reg/mapper.hpp >+%%EXTRA_MODULES%%include/opencv2/reg/mappergradaffine.hpp >+%%EXTRA_MODULES%%include/opencv2/reg/mappergradeuclid.hpp >+%%EXTRA_MODULES%%include/opencv2/reg/mappergradproj.hpp >+%%EXTRA_MODULES%%include/opencv2/reg/mappergradshift.hpp >+%%EXTRA_MODULES%%include/opencv2/reg/mappergradsimilar.hpp >+%%EXTRA_MODULES%%include/opencv2/reg/mapperpyramid.hpp >+%%EXTRA_MODULES%%include/opencv2/reg/mapprojec.hpp >+%%EXTRA_MODULES%%include/opencv2/reg/mapshift.hpp >+%%EXTRA_MODULES%%include/opencv2/rgbd.hpp >+%%EXTRA_MODULES%%include/opencv2/rgbd/linemod.hpp >+%%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 >+include/opencv2/shape.hpp >+include/opencv2/shape/emdL1.hpp >+include/opencv2/shape/hist_cost.hpp >+include/opencv2/shape/shape.hpp >+include/opencv2/shape/shape_distance.hpp >+include/opencv2/shape/shape_transformer.hpp >+%%EXTRA_MODULES%%include/opencv2/stereo.hpp >+%%EXTRA_MODULES%%include/opencv2/stereo/descriptor.hpp >+%%EXTRA_MODULES%%include/opencv2/stereo/matching.hpp >+%%EXTRA_MODULES%%include/opencv2/stereo/stereo.hpp > include/opencv2/stitching.hpp > include/opencv2/stitching/detail/autocalib.hpp > include/opencv2/stitching/detail/blenders.hpp >@@ -130,25 +199,45 @@ include/opencv2/stitching/detail/exposure_compensate.hpp > include/opencv2/stitching/detail/matchers.hpp > include/opencv2/stitching/detail/motion_estimators.hpp > include/opencv2/stitching/detail/seam_finders.hpp >+include/opencv2/stitching/detail/timelapsers.hpp > include/opencv2/stitching/detail/util.hpp > include/opencv2/stitching/detail/util_inl.hpp > include/opencv2/stitching/detail/warpers.hpp > include/opencv2/stitching/detail/warpers_inl.hpp >-include/opencv2/stitching/stitcher.hpp > include/opencv2/stitching/warpers.hpp >+%%EXTRA_MODULES%%include/opencv2/structured_light.hpp >+%%EXTRA_MODULES%%include/opencv2/structured_light/graycodepattern.hpp >+%%EXTRA_MODULES%%include/opencv2/structured_light/sinusoidalpattern.hpp >+%%EXTRA_MODULES%%include/opencv2/structured_light/structured_light.hpp > include/opencv2/superres.hpp > include/opencv2/superres/optical_flow.hpp >-include/opencv2/superres/superres.hpp >-include/opencv2/ts.hpp >-include/opencv2/ts/gpu_perf.hpp >-include/opencv2/ts/gpu_test.hpp >-include/opencv2/ts/ts.hpp >-include/opencv2/ts/ts_gtest.h >-include/opencv2/ts/ts_perf.hpp >+%%EXTRA_MODULES%%include/opencv2/surface_matching.hpp >+%%EXTRA_MODULES%%include/opencv2/surface_matching/icp.hpp >+%%EXTRA_MODULES%%include/opencv2/surface_matching/pose_3d.hpp >+%%EXTRA_MODULES%%include/opencv2/surface_matching/ppf_helpers.hpp >+%%EXTRA_MODULES%%include/opencv2/surface_matching/ppf_match_3d.hpp >+%%EXTRA_MODULES%%include/opencv2/surface_matching/t_hash_int.hpp >+%%EXTRA_MODULES%%include/opencv2/text.hpp >+%%EXTRA_MODULES%%include/opencv2/text/erfilter.hpp >+%%EXTRA_MODULES%%include/opencv2/text/ocr.hpp >+%%EXTRA_MODULES%%include/opencv2/text/textDetector.hpp >+%%EXTRA_MODULES%%include/opencv2/tracking.hpp >+%%EXTRA_MODULES%%include/opencv2/tracking/feature.hpp >+%%EXTRA_MODULES%%include/opencv2/tracking/kalman_filters.hpp >+%%EXTRA_MODULES%%include/opencv2/tracking/onlineBoosting.hpp >+%%EXTRA_MODULES%%include/opencv2/tracking/onlineMIL.hpp >+%%EXTRA_MODULES%%include/opencv2/tracking/tldDataset.hpp >+%%EXTRA_MODULES%%include/opencv2/tracking/tracker.hpp >+%%EXTRA_MODULES%%include/opencv2/tracking/tracking.hpp > include/opencv2/video.hpp > include/opencv2/video/background_segm.hpp > include/opencv2/video/tracking.hpp >+include/opencv2/video/tracking_c.h > include/opencv2/video/video.hpp >+include/opencv2/videoio.hpp >+include/opencv2/videoio/cap_ios.h >+include/opencv2/videoio/videoio.hpp >+include/opencv2/videoio/videoio_c.h > include/opencv2/videostab.hpp > include/opencv2/videostab/deblurring.hpp > include/opencv2/videostab/fast_marching.hpp >@@ -157,60 +246,196 @@ include/opencv2/videostab/frame_source.hpp > include/opencv2/videostab/global_motion.hpp > include/opencv2/videostab/inpainting.hpp > include/opencv2/videostab/log.hpp >+include/opencv2/videostab/motion_core.hpp > include/opencv2/videostab/motion_stabilizing.hpp > include/opencv2/videostab/optical_flow.hpp >+include/opencv2/videostab/outlier_rejection.hpp >+include/opencv2/videostab/ring_buffer.hpp > include/opencv2/videostab/stabilizer.hpp >-include/opencv2/videostab/videostab.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 >+%%EXTRA_MODULES%%include/opencv2/ximgproc.hpp >+%%EXTRA_MODULES%%include/opencv2/ximgproc/brightedges.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/estimated_covariance.hpp >+%%EXTRA_MODULES%%include/opencv2/ximgproc/fast_hough_transform.hpp >+%%EXTRA_MODULES%%include/opencv2/ximgproc/fast_line_detector.hpp >+%%EXTRA_MODULES%%include/opencv2/ximgproc/fourier_descriptors.hpp >+%%EXTRA_MODULES%%include/opencv2/ximgproc/lsc.hpp >+%%EXTRA_MODULES%%include/opencv2/ximgproc/paillou_filter.hpp >+%%EXTRA_MODULES%%include/opencv2/ximgproc/peilin.hpp >+%%EXTRA_MODULES%%include/opencv2/ximgproc/ridgefilter.hpp >+%%EXTRA_MODULES%%include/opencv2/ximgproc/seeds.hpp >+%%EXTRA_MODULES%%include/opencv2/ximgproc/segmentation.hpp >+%%EXTRA_MODULES%%include/opencv2/ximgproc/slic.hpp >+%%EXTRA_MODULES%%include/opencv2/ximgproc/sparse_match_interpolator.hpp >+%%EXTRA_MODULES%%include/opencv2/ximgproc/structured_edge_detection.hpp >+%%EXTRA_MODULES%%include/opencv2/ximgproc/weighted_median_filter.hpp >+%%EXTRA_MODULES%%include/opencv2/xobjdetect.hpp >+%%EXTRA_MODULES%%include/opencv2/xphoto.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/white_balance.hpp >+%%EXTRA_MODULES%%lib/libopencv_aruco.so >+%%EXTRA_MODULES%%lib/libopencv_aruco.so.%%SOVERSION%% >+%%EXTRA_MODULES%%lib/libopencv_aruco.so.%%VERSION%% >+%%EXTRA_MODULES%%lib/libopencv_bgsegm.so >+%%EXTRA_MODULES%%lib/libopencv_bgsegm.so.%%SOVERSION%% >+%%EXTRA_MODULES%%lib/libopencv_bgsegm.so.%%VERSION%% >+%%EXTRA_MODULES%%lib/libopencv_bioinspired.so >+%%EXTRA_MODULES%%lib/libopencv_bioinspired.so.%%SOVERSION%% >+%%EXTRA_MODULES%%lib/libopencv_bioinspired.so.%%VERSION%% > lib/libopencv_calib3d.so >-lib/libopencv_calib3d.so.2 >+lib/libopencv_calib3d.so.%%SOVERSION%% > lib/libopencv_calib3d.so.%%VERSION%% >-lib/libopencv_contrib.so >-lib/libopencv_contrib.so.2 >-lib/libopencv_contrib.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%% >+%%EXTRA_MODULES%%lib/libopencv_dpm.so >+%%EXTRA_MODULES%%lib/libopencv_dpm.so.%%SOVERSION%% >+%%EXTRA_MODULES%%lib/libopencv_dpm.so.%%VERSION%% >+%%EXTRA_MODULES%%lib/libopencv_face.so >+%%EXTRA_MODULES%%lib/libopencv_face.so.%%SOVERSION%% >+%%EXTRA_MODULES%%lib/libopencv_face.so.%%VERSION%% > lib/libopencv_features2d.so >-lib/libopencv_features2d.so.2 >+lib/libopencv_features2d.so.%%SOVERSION%% > lib/libopencv_features2d.so.%%VERSION%% > lib/libopencv_flann.so >-lib/libopencv_flann.so.2 >+lib/libopencv_flann.so.%%SOVERSION%% > lib/libopencv_flann.so.%%VERSION%% >-lib/libopencv_gpu.so >-lib/libopencv_gpu.so.2 >-lib/libopencv_gpu.so.%%VERSION%% >+%%EXTRA_MODULES%%lib/libopencv_freetype.so >+%%EXTRA_MODULES%%lib/libopencv_freetype.so.%%SOVERSION%% >+%%EXTRA_MODULES%%lib/libopencv_freetype.so.%%VERSION%% >+%%EXTRA_MODULES%%lib/libopencv_fuzzy.so >+%%EXTRA_MODULES%%lib/libopencv_fuzzy.so.%%SOVERSION%% >+%%EXTRA_MODULES%%lib/libopencv_fuzzy.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%% > lib/libopencv_highgui.so >-lib/libopencv_highgui.so.2 >+lib/libopencv_highgui.so.%%SOVERSION%% > lib/libopencv_highgui.so.%%VERSION%% >-lib/libopencv_legacy.so >-lib/libopencv_legacy.so.2 >-lib/libopencv_legacy.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 >+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%% > lib/libopencv_ml.so >-lib/libopencv_ml.so.2 >+lib/libopencv_ml.so.%%SOVERSION%% > lib/libopencv_ml.so.%%VERSION%% >-%%NONFREE%%lib/libopencv_nonfree.so >-%%NONFREE%%lib/libopencv_nonfree.so.2 >-%%NONFREE%%lib/libopencv_nonfree.so.%%VERSION%% > lib/libopencv_objdetect.so >-lib/libopencv_objdetect.so.2 >+lib/libopencv_objdetect.so.%%SOVERSION%% > lib/libopencv_objdetect.so.%%VERSION%% >-lib/libopencv_ocl.so >-lib/libopencv_ocl.so.2 >-lib/libopencv_ocl.so.%%VERSION%% >+%%EXTRA_MODULES%%lib/libopencv_optflow.so >+%%EXTRA_MODULES%%lib/libopencv_optflow.so.%%SOVERSION%% >+%%EXTRA_MODULES%%lib/libopencv_optflow.so.%%VERSION%% >+%%EXTRA_MODULES%%lib/libopencv_phase_unwrapping.so >+%%EXTRA_MODULES%%lib/libopencv_phase_unwrapping.so.%%SOVERSION%% >+%%EXTRA_MODULES%%lib/libopencv_phase_unwrapping.so.%%VERSION%% > lib/libopencv_photo.so >-lib/libopencv_photo.so.2 >+lib/libopencv_photo.so.%%SOVERSION%% > lib/libopencv_photo.so.%%VERSION%% >+%%EXTRA_MODULES%%lib/libopencv_plot.so >+%%EXTRA_MODULES%%lib/libopencv_plot.so.%%SOVERSION%% >+%%EXTRA_MODULES%%lib/libopencv_plot.so.%%VERSION%% >+%%EXTRA_MODULES%%lib/libopencv_reg.so >+%%EXTRA_MODULES%%lib/libopencv_reg.so.%%SOVERSION%% >+%%EXTRA_MODULES%%lib/libopencv_reg.so.%%VERSION%% >+%%EXTRA_MODULES%%lib/libopencv_rgbd.so >+%%EXTRA_MODULES%%lib/libopencv_rgbd.so.%%SOVERSION%% >+%%EXTRA_MODULES%%lib/libopencv_rgbd.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%% >+lib/libopencv_shape.so >+lib/libopencv_shape.so.%%SOVERSION%% >+lib/libopencv_shape.so.%%VERSION%% >+%%EXTRA_MODULES%%lib/libopencv_stereo.so >+%%EXTRA_MODULES%%lib/libopencv_stereo.so.%%SOVERSION%% >+%%EXTRA_MODULES%%lib/libopencv_stereo.so.%%VERSION%% > lib/libopencv_stitching.so >-lib/libopencv_stitching.so.2 >+lib/libopencv_stitching.so.%%SOVERSION%% > lib/libopencv_stitching.so.%%VERSION%% >+%%EXTRA_MODULES%%lib/libopencv_structured_light.so >+%%EXTRA_MODULES%%lib/libopencv_structured_light.so.%%SOVERSION%% >+%%EXTRA_MODULES%%lib/libopencv_structured_light.so.%%VERSION%% > lib/libopencv_superres.so >-lib/libopencv_superres.so.2 >+lib/libopencv_superres.so.%%SOVERSION%% > lib/libopencv_superres.so.%%VERSION%% >-lib/libopencv_ts.a >+%%EXTRA_MODULES%%lib/libopencv_surface_matching.so >+%%EXTRA_MODULES%%lib/libopencv_surface_matching.so.%%SOVERSION%% >+%%EXTRA_MODULES%%lib/libopencv_surface_matching.so.%%VERSION%% >+%%EXTRA_MODULES%%lib/libopencv_text.so >+%%EXTRA_MODULES%%lib/libopencv_text.so.%%SOVERSION%% >+%%EXTRA_MODULES%%lib/libopencv_text.so.%%VERSION%% >+%%EXTRA_MODULES%%lib/libopencv_tracking.so >+%%EXTRA_MODULES%%lib/libopencv_tracking.so.%%SOVERSION%% >+%%EXTRA_MODULES%%lib/libopencv_tracking.so.%%VERSION%% > lib/libopencv_video.so >-lib/libopencv_video.so.2 >+lib/libopencv_video.so.%%SOVERSION%% > lib/libopencv_video.so.%%VERSION%% >+lib/libopencv_videoio.so >+lib/libopencv_videoio.so.%%SOVERSION%% >+lib/libopencv_videoio.so.%%VERSION%% > lib/libopencv_videostab.so >-lib/libopencv_videostab.so.2 >+lib/libopencv_videostab.so.%%SOVERSION%% > lib/libopencv_videostab.so.%%VERSION%% >+%%EXTRA_MODULES%%lib/libopencv_xfeatures2d.so >+%%EXTRA_MODULES%%lib/libopencv_xfeatures2d.so.%%SOVERSION%% >+%%EXTRA_MODULES%%lib/libopencv_xfeatures2d.so.%%VERSION%% >+%%EXTRA_MODULES%%lib/libopencv_ximgproc.so >+%%EXTRA_MODULES%%lib/libopencv_ximgproc.so.%%SOVERSION%% >+%%EXTRA_MODULES%%lib/libopencv_ximgproc.so.%%VERSION%% >+%%EXTRA_MODULES%%lib/libopencv_xobjdetect.so >+%%EXTRA_MODULES%%lib/libopencv_xobjdetect.so.%%SOVERSION%% >+%%EXTRA_MODULES%%lib/libopencv_xobjdetect.so.%%VERSION%% >+%%EXTRA_MODULES%%lib/libopencv_xphoto.so >+%%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 > %%DATADIR%%/OpenCVConfig-version.cmake > %%DATADIR%%/OpenCVConfig.cmake > %%DATADIR%%/OpenCVModules-%%CMAKE_BUILD_TYPE%%.cmake >@@ -227,15 +452,6 @@ libdata/pkgconfig/opencv.pc > %%DATADIR%%/haarcascades/haarcascade_lefteye_2splits.xml > %%DATADIR%%/haarcascades/haarcascade_licence_plate_rus_16stages.xml > %%DATADIR%%/haarcascades/haarcascade_lowerbody.xml >-%%DATADIR%%/haarcascades/haarcascade_mcs_eyepair_big.xml >-%%DATADIR%%/haarcascades/haarcascade_mcs_eyepair_small.xml >-%%DATADIR%%/haarcascades/haarcascade_mcs_leftear.xml >-%%DATADIR%%/haarcascades/haarcascade_mcs_lefteye.xml >-%%DATADIR%%/haarcascades/haarcascade_mcs_mouth.xml >-%%DATADIR%%/haarcascades/haarcascade_mcs_nose.xml >-%%DATADIR%%/haarcascades/haarcascade_mcs_rightear.xml >-%%DATADIR%%/haarcascades/haarcascade_mcs_righteye.xml >-%%DATADIR%%/haarcascades/haarcascade_mcs_upperbody.xml > %%DATADIR%%/haarcascades/haarcascade_profileface.xml > %%DATADIR%%/haarcascades/haarcascade_righteye_2splits.xml > %%DATADIR%%/haarcascades/haarcascade_russian_plate_number.xml >@@ -243,5 +459,517 @@ libdata/pkgconfig/opencv.pc > %%DATADIR%%/haarcascades/haarcascade_upperbody.xml > %%DATADIR%%/lbpcascades/lbpcascade_frontalcatface.xml > %%DATADIR%%/lbpcascades/lbpcascade_frontalface.xml >+%%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%%/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 >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/cloning_demo.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/cloning_gui.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/connected_components.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/contours2.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/convexhull.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/cout_mat.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/create_mask.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/dbt_face_detection.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/delaunay2.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/demhist.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/detect_blob.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/detect_mser.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/dft.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/distrans.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/drawing.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/edge.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/em.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/facedetect.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/facial_features.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/falsecolor.cpp >+%%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/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 >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/morphology2.cpp >+%%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/segment_objects.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/select3dobj.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/shape_example.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 >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/stitching_detailed.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/train_HOG.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/train_svmsgd.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/travelsalesman.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/tree_engine.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/tvl1_optical_flow.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/videocapture_basic.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%%/dnn/CMakeLists.txt >+%%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_objdetect/data/README.md >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn_objdetect/data/SqueezeDet_deploy.prototxt >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn_objdetect/data/SqueezeDet_solver.prototxt >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn_objdetect/data/SqueezeDet_train_test.prototxt >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn_objdetect/data/SqueezeNet_deploy.prototxt >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn_objdetect/data/SqueezeNet_solver.prototxt >+%%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%%/face/facemark_demo_aam.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/facemark_demo_lbf.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/facemark_lbf_fitting.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/sampleDetectLandmarks.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/sampleDetectLandmarksvideo.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/sample_config_file.xml >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/sample_face_swapping.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/sample_train_landmark_detector.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/sample_train_landmark_detector2.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/face/samplewriteconfigfile.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hdf/create_groups.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hdf/create_read_write_datasets.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hdf/read_write_attributes.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hfs/CMakeLists.txt >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hfs/data/000.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hfs/data/001.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hfs/data/002.jpg >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hfs/example.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img_hash/hash_samples.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/optflow/dis_opticalflow.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/plot/plot_demo.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/reg/reg_shift.py >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/surface_matching/ppf_icp.py >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/deeptextdetection.py >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/dictnet_demo.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/text_recognition_cnn.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/textbox.prototxt >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text/textbox_demo.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tracking/csrt.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tracking/samples_utility.hpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xfeatures2d/gms_matcher.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/brightedgesexample.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/edgeboxes_demo.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/edgeboxes_demo.py >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/filterdemo.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/fourier_descriptors_demo.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/peilin.cpp >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/peilin_plane.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/peilin_shape.png >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ximgproc/selectivesearchsegmentation_demo.py >diff --git graphics/py-opencv/Makefile graphics/py-opencv/Makefile >index 5578cda4c907..ac05b1d75146 100644 >--- graphics/py-opencv/Makefile >+++ graphics/py-opencv/Makefile >@@ -1,7 +1,7 @@ > # Created by: Martin Matuska <mm@FreeBSD.org> > # $FreeBSD$ > >-PORTREVISION= 3 >+PORTREVISION= 0 > CATEGORIES= graphics python > PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} > >diff --git graphics/py-opencv/pkg-plist graphics/py-opencv/pkg-plist >index cc41f22ca9c3..e76110b9282f 100644 >--- graphics/py-opencv/pkg-plist >+++ graphics/py-opencv/pkg-plist >@@ -1,4 +1 @@ >-%%PYTHON_SITELIBDIR%%/cv.py >-%%PYTHON_SITELIBDIR%%/cv.pyc >-%%PYTHON_SITELIBDIR%%/cv.pyo > %%PYTHON_SITELIBDIR%%/cv2.so >diff --git multimedia/ffmpeg/Makefile multimedia/ffmpeg/Makefile >index ea7766e14708..fb15451b00a8 100644 >--- multimedia/ffmpeg/Makefile >+++ multimedia/ffmpeg/Makefile >@@ -3,7 +3,7 @@ > > PORTNAME= ffmpeg > PORTVERSION= 3.4.2 >-PORTREVISION= 1 >+PORTREVISION= 2 > PORTEPOCH= 1 > CATEGORIES= multimedia audio ipv6 net > MASTER_SITES= https://ffmpeg.org/releases/ >@@ -38,7 +38,7 @@ OPTIONS_DEFINE= ALSA AMR_NB AMR_WB ASS BS2B CACA CDIO CELT CHROMAPRINT DC1394 \ > XVIDEO ZIMG ZMQ ZVBI > > OPTIONS_DEFAULT= FFSERVER FONTCONFIG FREETYPE FREI0R GMP GNUTLS ICONV \ >- OPENCV OPTIMIZED_CFLAGS OPUS RTCPU THEORA V4L VAAPI VDPAU \ >+ OPTIMIZED_CFLAGS OPUS RTCPU THEORA V4L VAAPI VDPAU \ > VORBIS VPX X264 X265 XVID > > OPTIONS_RADIO= RTMP SSL
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=192856">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 210505
:
171727
|
171728
|
171788
|
172552
|
172569
|
172570
|
172597
|
175624
|
178719
|
179617
|
181772
|
181804
|
181817
|
191690
|
192271
|
192856
|
192857
|
192875
|
192885
|
193009
|
193190
|
193196