FreeBSD Bugzilla – Attachment 181804 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]
c #55 fixes
opencv3.2.patch (text/plain), 56.30 KB, created by
Ivan Rozhuk
on 2017-04-15 01:23:36 UTC
(
hide
)
Description:
c #55 fixes
Filename:
MIME Type:
Creator:
Ivan Rozhuk
Created:
2017-04-15 01:23:36 UTC
Size:
56.30 KB
patch
obsolete
>Index: graphics/opencv/Makefile >=================================================================== >--- graphics/opencv/Makefile (revision 438508) >+++ graphics/opencv/Makefile (working copy) >@@ -1,9 +1,9 @@ > # Created by: Marc Abramowitz (http://marc.abramowitz.info) > # $FreeBSD$ > >-PORTNAME?= opencv >-PORTVERSION= 2.4.13.1 >-PORTREVISION?= 6 >+PORTNAME= opencv >+PORTVERSION= 3.2.0 >+PORTREVISION?= 0 > CATEGORIES= graphics > > MAINTAINER= ports@FreeBSD.org >@@ -14,49 +14,98 @@ > > USE_GITHUB= yes > >-USES= cmake pkgconfig >+USES= cmake compiler:c++11-lib localbase:ldflags pkgconfig > USE_LDCONFIG= yes >+USE_CXXSTD= c++11 > > NOT_FOR_ARCHS= sparc64 > NOT_FOR_ARCHS_REASON_sparc64= does not compile on sparc64 > > DATADIR= ${PREFIX}/share/OpenCV >-PLIST_SUB+= VERSION=${DISTVERSION:R} >+PLIST_SUB+= SOVERSION=${DISTVERSION:R} VERSION=${DISTVERSION} > >-CMAKE_ARGS+= -DWITH_CUDA:BOOL=Off \ >- -DWITH_PVAPI:BOOL=Off \ >- -DWITH_UNICAP:BOOL=Off \ >- -DBUILD_TESTS:BOOL=Off \ >- -DBUILD_DOCS:BOOL=Off \ >+CMAKE_ARGS+= -DWITH_VTK:BOOL=OFF \ >+ -DWITH_CUDA:BOOL=OFF \ >+ -DWITH_CUFFT:BOOL=OFF \ >+ -DWITH_CUBLAS:BOOL=OFF \ >+ -DWITH_NVCUVID:BOOL=OFF \ >+ -DWITH_GSTREAMER_0_10:BOOL=OFF \ >+ -DWITH_GTK_2_X:BOOL=ON \ >+ -DWITH_IPP:BOOL=OFF \ >+ -DWITH_PVAPI:BOOL=OFF \ >+ -DWITH_GIGEAPI:BOOL=OFF \ >+ -DWITH_QUICKTIME:BOOL=OFF \ >+ -DWITH_OPENCL_SVM:BOOL=OFF \ >+ -DWITH_INTELPERC:BOOL=OFF \ >+ -DWITH_IPP_A:BOOL=OFF \ >+ -DWITH_MATLAB:BOOL=OFF \ >+ -DWITH_VA:BOOL=OFF \ >+ -DWITH_VA_INTEL:BOOL=OFF \ >+ -DWITH_LAPACK:BOOL=OFF \ >+ -DBUILD_SHARED_LIBS:BOOL=ON \ >+ -DBUILD_ANDROID_EXAMPLES:BOOL=OFF \ >+ -DBUILD_DOCS:BOOL=OFF \ >+ -DBUILD_PACKAGE:BOOL=OFF \ >+ -DBUILD_PERF_TESTS:BOOL=OFF \ >+ -DBUILD_TESTS:BOOL=OFF \ >+ -DBUILD_WITH_DEBUG_INFO:BOOL=OFF \ >+ -DBUILD_WITH_STATIC_CRT:BOOL=OFF \ >+ -DBUILD_WITH_DYNAMIC_IPP:BOOL=OFF \ >+ -DBUILD_FAT_JAVA_LIB:BOOL=OFF \ >+ -DBUILD_ANDROID_SERVICE:BOOL=OFF \ >+ -DBUILD_CUDA_STUBS:BOOL=OFF \ >+ -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_PROTOBUF:BOOL=OFF \ >+ -DBUILD_EXAMPLES:BOOL=OFF \ >+ -DENABLE_OMIT_FRAME_POINTER:BOOL=ON \ >+ -DENABLE_FAST_MATH:BOOL=OFF \ >+ -DENABLE_PRECOMPILED_HEADERS:BOOL=OFF \ >+ -DEOPENCV_WARNINGS_ARE_ERRORS:BOOL=OFF \ >+ -DANDROID_EXAMPLES_WITH_LIBS:BOOL=ON \ >+ -DDOWNLOAD_EXTERNAL_TEST_DATA:BOOL=OFF \ >+ -DBUILD_opencv_apps:BOOL=ON \ >+ -DBUILD_opencv_cnn_3dobj:BOOL=OFF \ >+ -DBUILD_opencv_ts:BOOL=OFF \ >+ -DBUILD_opencv_world:BOOL=OFF \ > -DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_CMD} > > 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 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_i386= SSE SSE2 SSE3 SSSE3 SSE41 SSE42 AVX AVX2 >-OPTIONS_GROUP_VIDEO= FFMPEG GSTREAMER GSTREAMER0 V4L XINE >+OPTIONS_DEFINE= EXAMPLES EXTRA_MODULES OPENGL >+OPTIONS_GROUP= PERFORMANCE IMAGE SIMD VIDEO >+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_i386= SSE SSE2 SSE3 SSSE3 SSE41 SSE42 \ >+ AVX AVX2 FMA3 POPCNT >+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} >+OPTIONS_DEFAULT= EIGEN3 JASPER JPEG PNG TIFF WEBP FFMPEG 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 >@@ -63,28 +112,30 @@ > DC1394_LIB_DEPENDS= libdc1394.so:multimedia/libdc1394 > DC1394_CMAKE_BOOL= WITH_1394 > >+EXAMPLES_CMAKE_BOOL= INSTALL_C_EXAMPLES >+ >+.for _simd in ${OPTIONS_GROUP_SIMD} >+${_simd}_DESC= ${MMX_DESC:S/MMX/${_simd}/} >+${_simd}_CMAKE_BOOL= ENABLE_${_simd} >+.endfor >+ >+PERFORMANCE_DESC= Performance enhancing libraries >+ > EIGEN3_DESC= Eigen 3 support > EIGEN3_BUILD_DEPENDS= ${LOCALBASE}/include/eigen3/Eigen/Eigen:math/eigen3 > EIGEN3_CMAKE_BOOL= WITH_EIGEN > >-. if !defined(OCV_SLAVE) >-EXAMPLES_CMAKE_BOOL= BUILD_EXAMPLES INSTALL_C_EXAMPLES >-. endif >-EXAMPLES_PORTEXAMPLES= * >+OPENCL_DESC= OpenCL support >+OPENCL_BUILD_DEPENDS= opencl>=0:devel/opencl >+OPENCL_RUN_DEPENDS= opencl>=0:devel/opencl >+OPENCL_CMAKE_BOOL= WITH_OPENCL > >-FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg >-FFMPEG_CMAKE_BOOL= WITH_FFMPEG >+TBB_DESC= TBB support >+TBB_LIB_DEPENDS= libtbb.so:devel/tbb >+TBB_CMAKE_BOOL= WITH_TBB > >-GSTREAMER0_DESC= ${GSTREAMER_DESC} 0.10 >-GSTREAMER0_USE= GSTREAMER=yes >-GSTREAMER0_CMAKE_BOOL= WITH_GSTREAMER_0_10 >+IMAGE_DESC= Image format support > >-GSTREAMER_USE= GSTREAMER1=yes >-GSTREAMER_CMAKE_BOOL= WITH_GSTREAMER >- >-GTK2_USE= GNOME=gtk20 >-GTK2_CMAKE_BOOL= WITH_GTK >- > JASPER_LIB_DEPENDS= libjasper.so:graphics/jasper > JASPER_CMAKE_BOOL= WITH_JASPER > >@@ -91,87 +142,135 @@ > 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+= libtesseract.so:graphics/tesseract > >+EXTRA_MODULES_DESC= Extra modules >+EXTRA_MODULES_GH_PROJECT= opencv_contrib:extra_mod \ >+ opencv_3rdparty:extra_mod_boostdesc \ >+ opencv_3rdparty:extra_mod_vgg >+EXTRA_MODULES_GH_TAGNAME= ${PORTVERSION}:extra_mod \ >+ 34e4206aef44d50e6bbcd0ab06354b52e7466d26:extra_mod_boostdesc \ >+ fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d:extra_mod_vgg >+EXTRA_MODULES_LIB_DEPENDS= libgflags.so:devel/gflags \ >+ libglog.so:devel/glog \ >+ libhdf5.so:science/hdf5 \ >+ libprotobuf.so:devel/protobuf >+# libceres.so:math/ceres-solver >+EXTRA_MODULES_EXTRA_PATCHES= ${FILESDIR}/extra-patch-modules_sfm_CMakeLists.txt >+ >+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_ml.so.${PORTVERSION}:graphics/opencv > BUILD_DEPENDS+= ${PYNUMPY} > RUN_DEPENDS+= ${PYNUMPY} > USES+= python:2.7 >-CMAKE_ARGS+= -DBUILD_opencv_python:BOOL=On >+CMAKE_ARGS+= -DBUILD_opencv_python: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 > .elif defined(OCV_JAVA) > BUILD_DEPENDS+= ant:devel/apache-ant >-LIB_DEPENDS+= libopencv_legacy.so:graphics/opencv >+LIB_DEPENDS+= libopencv_ml.so.${PORTVERSION}: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 > .else >-LIB_DEPENDS+= libopencv_core.so:graphics/opencv-core >+LIB_DEPENDS+= libopencv_core.so.${PORTVERSION}: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 > >+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/ >+ @${MV} ${WRKSRC_extra_mod_boostdesc}/* ${WRKSRC}/modules/xfeatures2d/src/ >+ @${MV} ${WRKSRC_extra_mod_vgg}/* ${WRKSRC}/modules/xfeatures2d/src/ >+ >+pre-build-EXTRA_MODULES-on: >+ 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-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} {} \; > .if defined(OCV_CORE) > @${REINPLACE_CMD} -e 's|opencv.pc|opencv-core.pc|g' \ > ${WRKSRC}/cmake/OpenCVGenPkgconfig.cmake >@@ -182,6 +281,8 @@ > @${REINPLACE_CMD} -e 's|add_subdirectory(data)||g' \ > ${WRKSRC}/CMakeLists.txt > .endif >+ #@${FIND} ${WRKSRC} -name '*.orig' -exec ${RM} {} \; >+ @${FIND} ${WRKSRC} -name '*.bak' -exec ${RM} {} \; > > post-install: > .if !defined(OCV_SLAVE) >Index: graphics/opencv/distinfo >=================================================================== >--- graphics/opencv/distinfo (revision 438508) >+++ graphics/opencv/distinfo (working copy) >@@ -1,3 +1,8 @@ >-TIMESTAMP = 1475482010 >-SHA256 (opencv-opencv-2.4.13.1_GH0.tar.gz) = 0d5ce5e0973e3a745f927d1ee097aaf909aae59f787be6d27a03d639e2d96bd7 >-SIZE (opencv-opencv-2.4.13.1_GH0.tar.gz) = 91773677 >+SHA256 (opencv-opencv-3.2.0_GH0.tar.gz) = b9d62dfffb8130d59d587627703d5f3e6252dce4a94c1955784998da7a39dd35 >+SIZE (opencv-opencv-3.2.0_GH0.tar.gz) = 78861546 >+SHA256 (opencv-opencv_contrib-3.2.0_GH0.tar.gz) = 1e2bb6c9a41c602904cc7df3f8fb8f98363a88ea564f2a087240483426bf8cbe >+SIZE (opencv-opencv_contrib-3.2.0_GH0.tar.gz) = 54765210 >+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 >Index: graphics/opencv/pkg-plist >=================================================================== >--- graphics/opencv/pkg-plist (revision 438508) >+++ graphics/opencv/pkg-plist (working copy) >@@ -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,14 +16,66 @@ > include/opencv/cxmisc.h > include/opencv/highgui.h > include/opencv/ml.h >+%%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 >+include/opencv2/cvconfig.h >+%%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/blob.hpp >+%%EXTRA_MODULES%%include/opencv2/dnn/blob.inl.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.hpp >+%%EXTRA_MODULES%%include/opencv2/dnn/shape_utils.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/facerec.hpp >+%%EXTRA_MODULES%%include/opencv2/face/predict_collector.hpp > include/opencv2/features2d.hpp > include/opencv2/features2d/features2d.hpp > include/opencv2/flann.hpp >@@ -62,66 +115,78 @@ > 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_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 >+include/opencv2/imgcodecs.hpp >+include/opencv2/imgcodecs/imgcodecs.hpp >+include/opencv2/imgcodecs/imgcodecs_c.h >+include/opencv2/imgcodecs/ios.h >+%%EXTRA_MODULES%%include/opencv2/line_descriptor.hpp >+%%EXTRA_MODULES%%include/opencv2/line_descriptor/descriptor.hpp > include/opencv2/ml.hpp > include/opencv2/ml/ml.hpp >-%%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/objdetect/objdetect_c.h > include/opencv2/opencv.hpp > include/opencv2/opencv_modules.hpp >+%%EXTRA_MODULES%%include/opencv2/optflow.hpp >+%%EXTRA_MODULES%%include/opencv2/optflow/motempl.hpp >+%%EXTRA_MODULES%%include/opencv2/optflow/pcaflow.hpp >+%%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 +195,44 @@ > 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/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 +241,167 @@ > 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 >+%%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/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/lsc.hpp >+%%EXTRA_MODULES%%include/opencv2/ximgproc/paillou_filter.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%% >+%%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_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_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%% >+lib/libopencv_imgcodecs.so >+lib/libopencv_imgcodecs.so.%%SOVERSION%% >+lib/libopencv_imgcodecs.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 +418,6 @@ > %%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 >@@ -245,3 +427,216 @@ > %%DATADIR%%/lbpcascades/lbpcascade_frontalface.xml > %%DATADIR%%/lbpcascades/lbpcascade_profileface.xml > %%DATADIR%%/lbpcascades/lbpcascade_silverware.xml >+%%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%%/bgsegm/bgfg_gmg.cpp >+%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bioinspired/OpenEXRimages_HDR_Retina_toneMapping.cpp >+%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bioinspired/basicRetina.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/VGG_VOC0712_SSD_300x300_iter_60000.prototxt >+%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn/bvlc_googlenet.prototxt >+%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn/caffe_googlenet.cpp >+%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn/fcn32s-heavy-pascal.prototxt >+%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn/fcn8s-heavy-pascal.prototxt >+%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn/fcn_semsegm.cpp >+%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn/googlenet_python.py >+%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn/pascal-classes.txt >+%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn/rgb.jpg >+%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn/space_shuttle.jpg >+%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn/ssd_object_detection.cpp >+%%EXTRA_MODULES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnn/synset_words.txt >+%%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 >Index: graphics/opencv-core/Makefile >=================================================================== >--- graphics/opencv-core/Makefile (revision 438508) >+++ graphics/opencv-core/Makefile (working copy) >@@ -1,7 +1,7 @@ > # Created by: Martin Matuska <mm@FreeBSD.org> > # $FreeBSD$ > >-PORTREVISION= 1 >+PORTREVISION= 0 > PKGNAMESUFFIX= -${OCV_SLAVE} > > COMMENT= OpenCV core libraries >Index: graphics/opencv-core/pkg-plist >=================================================================== >--- graphics/opencv-core/pkg-plist (revision 438508) >+++ graphics/opencv-core/pkg-plist (working copy) >@@ -1,30 +1,91 @@ > include/opencv2/core.hpp > include/opencv2/core/affine.hpp >+include/opencv2/core/base.hpp >+include/opencv2/core/bufferpool.hpp > include/opencv2/core/core.hpp > include/opencv2/core/core_c.h >-include/opencv2/core/cuda_devptrs.hpp >-include/opencv2/core/devmem2d.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.hpp >+include/opencv2/core/cuda/detail/reduce_key_val.hpp >+include/opencv2/core/cuda/detail/transform_detail.hpp >+include/opencv2/core/cuda/detail/type_traits_detail.hpp >+include/opencv2/core/cuda/detail/vec_distance_detail.hpp >+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.hpp >+include/opencv2/core/cuda/warp_reduce.hpp >+include/opencv2/core/cuda/warp_shuffle.hpp >+include/opencv2/core/cuda_stream_accessor.hpp >+include/opencv2/core/cuda_types.hpp >+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.hpp >+include/opencv2/core/hal/intrin_cpp.hpp >+include/opencv2/core/hal/intrin_neon.hpp >+include/opencv2/core/hal/intrin_sse.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.hpp >+include/opencv2/core/ocl_genbase.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/private.cuda.hpp >+include/opencv2/core/private.hpp >+include/opencv2/core/ptr.inl.hpp >+include/opencv2/core/saturate.hpp >+include/opencv2/core/sse_utils.hpp >+include/opencv2/core/traits.hpp >+include/opencv2/core/types.hpp > include/opencv2/core/types_c.h >+include/opencv2/core/utility.hpp >+include/opencv2/core/va_intel.hpp > include/opencv2/core/version.hpp > include/opencv2/core/wimage.hpp > include/opencv2/imgproc.hpp >+include/opencv2/imgproc/detail/distortion_model.hpp >+include/opencv2/imgproc/hal/hal.hpp >+include/opencv2/imgproc/hal/interface.h > include/opencv2/imgproc/imgproc.hpp > include/opencv2/imgproc/imgproc_c.h > 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
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=181804">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