diff --git a/MOVED b/MOVED index d3e976baa65d..60a4302e2748 100644 --- a/MOVED +++ b/MOVED @@ -16029,3 +16029,6 @@ security/py-rekall-core||2021-01-28|Has expired: Unmaintained upstream www/kurly||2021-01-28|Has expired: Upstream is gone security/regripper||2021-01-28|Has expired: Upstream repo disappeared ftp/bbftp||2021-01-30|Was split into client and server ports, install as needed +graphics/opencv-core|graphics/opencv|2021-01-30|Reintegrated into a simple, maintainable port +graphics/py-opencv|graphics/opencv|2021-01-30|Reintegrated into a simple, maintainable port +graphics/opencv-java|graphics/opencv|2021-01-30|Reintegrated into a simple, maintainable port diff --git a/astro/siril/Makefile b/astro/siril/Makefile index d9d9f0cbae3d..68445437447e 100644 --- a/astro/siril/Makefile +++ b/astro/siril/Makefile @@ -2,7 +2,7 @@ PORTNAME= siril DISTVERSION= 0.99.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= astro graphics MASTER_SITES= https://free-astro.org/download/ @@ -25,7 +25,7 @@ LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \ libfftw3f.so:math/fftw3-float \ libgsl.so:math/gsl \ liblcms2.so:graphics/lcms2 \ - libopencv_core.so:graphics/opencv-core \ + libopencv_core.so:graphics/opencv \ libpng.so:graphics/png \ libraw.so:graphics/libraw \ libtiff.so:graphics/tiff diff --git a/graphics/Makefile b/graphics/Makefile index 3b1cc012e357..f9784588d075 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -584,8 +584,6 @@ SUBDIR += opencolorio-tools SUBDIR += opencsg SUBDIR += opencv - SUBDIR += opencv-core - SUBDIR += opencv-java SUBDIR += opendx SUBDIR += openexr SUBDIR += openfx-arena @@ -855,7 +853,6 @@ SUBDIR += py-nwdiag SUBDIR += py-open3d-python SUBDIR += py-opencolorio - SUBDIR += py-opencv SUBDIR += py-openimageio SUBDIR += py-openshadinglanguage SUBDIR += py-photocollage diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile index 5af9d8c45279..cfd764a659c1 100644 --- a/graphics/cimg/Makefile +++ b/graphics/cimg/Makefile @@ -4,7 +4,7 @@ PORTNAME= cimg DISTVERSIONPREFIX= v. DISTVERSION= 2.9.4 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 3 CATEGORIES= graphics devel @@ -55,8 +55,7 @@ LIB_DEPENDS+= libcurl.so:ftp/curl \ libIlmImf.so:graphics/openexr \ libgimp-2.0.so:graphics/gimp-app \ libfftw3.so:math/fftw3 \ - libopencv_video.so:graphics/opencv \ - libopencv_core.so:graphics/opencv-core \ + libopencv_core.so:graphics/opencv \ libGraphicsMagick.so:graphics/GraphicsMagick USES+= jpeg ALL_TARGET= Mlinux diff --git a/graphics/cimg/files/patch-examples__Makefile b/graphics/cimg/files/patch-examples__Makefile index 05eaeacbbaaf..0a406c49bbf4 100644 --- a/graphics/cimg/files/patch-examples__Makefile +++ b/graphics/cimg/files/patch-examples__Makefile @@ -1,4 +1,4 @@ ---- examples/Makefile.orig 2020-06-10 08:03:38 UTC +--- examples/Makefile.orig 2020-11-23 20:31:46 UTC +++ examples/Makefile @@ -89,7 +89,7 @@ VERSION2 = $(shell grep 'cimg_version\ ' ../CImg.h | t VERSION3 = $(shell grep 'cimg_version\ ' ../CImg.h | tail -c2 | head -c1) @@ -30,6 +30,18 @@ endif ifdef IS_ICPC OPT_CFLAGS = -fast +@@ -172,9 +172,9 @@ endif + + # Flags to enable OpenCV support. + OPENCV_DEFINE = -Dcimg_use_opencv +-OPENCV_INCDIR = $(shell pkg-config opencv --cflags || echo -I/usr/include/opencv) -I/usr/include/opencv ++OPENCV_INCDIR = $(shell pkg-config opencv4 --cflags || echo -I/usr/include/opencv) -I/usr/include/opencv + OPENCV_CFLAGS = $(OPENCV_DEFINE) $(OPENCV_INCDIR) +-OPENCV_LIBS = $(shell pkg-config opencv --libs || echo -lopencv_core -lopencv_highgui) ++OPENCV_LIBS = $(shell pkg-config opencv4 --libs || echo -lopencv_core -lopencv_highgui) + + # Flags used to disable display capablities of CImg + NODISPLAY_CFLAGS = -Dcimg_display=0 @@ -224,7 +224,7 @@ JPEG_LIBS = -ljpeg TIFF_DEFINE = -Dcimg_use_tiff TIFF_INCDIR = diff --git a/graphics/dbow2/Makefile b/graphics/dbow2/Makefile index 9e2a3da06291..d5b6217a99c6 100644 --- a/graphics/dbow2/Makefile +++ b/graphics/dbow2/Makefile @@ -4,6 +4,7 @@ PORTNAME= dbow2 DISTVERSIONPREFIX= v DISTVERSION= 1.1-free-23 DISTVERSIONSUFFIX= -g3924753 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org @@ -13,7 +14,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libopencv_photo.so:graphics/opencv \ - libopencv_core.so:graphics/opencv-core + libopencv_core.so:graphics/opencv USES= cmake compiler:c++11-lang USE_LDCONFIG= yes diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile index e5cb334cbd5d..3ae8a52e5dcb 100644 --- a/graphics/digikam/Makefile +++ b/graphics/digikam/Makefile @@ -2,7 +2,7 @@ PORTNAME= digikam DISTVERSION= 7.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION} DIST_SUBDIR= KDE/digikam/${PORTVERSION} @@ -24,8 +24,7 @@ LIB_DEPENDS= libKF5Sane.so:graphics/libksane \ liblcms2.so:graphics/lcms2 \ liblensfun.so:graphics/lensfun \ liblqr-1.so:graphics/liblqr-1 \ - libopencv_video.so:graphics/opencv \ - libopencv_core.so:graphics/opencv-core \ + libopencv_core.so:graphics/opencv \ libpgf.so:graphics/libpgf \ libpng.so:graphics/png \ libtiff.so:graphics/tiff \ diff --git a/graphics/frei0r/Makefile b/graphics/frei0r/Makefile index f773a620e99c..adb344af820f 100644 --- a/graphics/frei0r/Makefile +++ b/graphics/frei0r/Makefile @@ -4,7 +4,7 @@ PORTNAME= frei0r PORTVERSION= 1.7.0 DISTVERSIONPREFIX= plugins- -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= graphics MASTER_SITES?= https://files.dyne.org/frei0r/releases/ @@ -32,7 +32,7 @@ USES+= localbase PORTREVISION= 0 COMMENT= Frei0r OpenCV plugins PKGNAMESUFFIX= -plugins-opencv -LIB_DEPENDS+= libopencv_core.so:graphics/opencv-core \ +LIB_DEPENDS+= libopencv_core.so:graphics/opencv \ libopencv_video.so:graphics/opencv FREI0R_PLUGINS= facebl0r facedetect diff --git a/graphics/gimp-gmic-plugin/Makefile b/graphics/gimp-gmic-plugin/Makefile index ffb826661611..514b3b19ae79 100644 --- a/graphics/gimp-gmic-plugin/Makefile +++ b/graphics/gimp-gmic-plugin/Makefile @@ -2,7 +2,7 @@ PORTNAME= gmic PORTVERSION= 1.6.9 -PORTREVISION= 28 +PORTREVISION= 29 CATEGORIES= graphics MASTER_SITES= http://gmic.eu/files/source/ PKGNAMEPREFIX= gimp- @@ -12,6 +12,8 @@ DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= rm@FreeBSD.org COMMENT= GREYC's Magic Image Converter +BROKEN= OpenCV4 no longer ships OpencCV-1.0 headers + LIB_DEPENDS= libGraphicsMagick++.so:graphics/GraphicsMagick \ libIlmImf.so:graphics/openexr \ libopencv_video.so:graphics/opencv \ diff --git a/graphics/gmic/Makefile b/graphics/gmic/Makefile index 7a248e67f8b3..85cb01e7cf82 100644 --- a/graphics/gmic/Makefile +++ b/graphics/gmic/Makefile @@ -2,7 +2,7 @@ PORTNAME= gmic DISTVERSION= 2.9.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= https://gmic.eu/files/source/ DISTNAME= ${PORTNAME}_${DISTVERSION} @@ -21,8 +21,7 @@ LIB_DEPENDS= libfftw3.so:math/fftw3 \ libGraphicsMagick++.so:graphics/GraphicsMagick \ libIlmImf.so:graphics/openexr \ libImath.so:graphics/ilmbase \ - libopencv_core.so:graphics/opencv-core \ - libopencv_video.so:graphics/opencv \ + libopencv_core.so:graphics/opencv \ libpng.so:graphics/png \ libtiff.so:graphics/tiff diff --git a/graphics/gstreamer-plugins-opencv/Makefile b/graphics/gstreamer-plugins-opencv/Makefile index 6edd2aea9f81..f008b670a63d 100644 --- a/graphics/gstreamer-plugins-opencv/Makefile +++ b/graphics/gstreamer-plugins-opencv/Makefile @@ -1,7 +1,7 @@ # Created by: Koop Mast # $FreeBSD$ -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics COMMENT= Gstreamer opencv real time computer vision plugin diff --git a/graphics/gstreamer1-plugins-opencv/Makefile b/graphics/gstreamer1-plugins-opencv/Makefile index a1ed0400ccd3..39afd68b0e5f 100644 --- a/graphics/gstreamer1-plugins-opencv/Makefile +++ b/graphics/gstreamer1-plugins-opencv/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics COMMENT= GStreamer opencv real time computer vision plugin diff --git a/graphics/nomacs/Makefile b/graphics/nomacs/Makefile index 0dfd3c5a2f34..82b7412dc74d 100644 --- a/graphics/nomacs/Makefile +++ b/graphics/nomacs/Makefile @@ -3,7 +3,7 @@ PORTNAME= nomacs PORTVERSION= 3.16 DISTVERSIONSUFFIX= .224 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics PATCH_SITES= https://github.com/nomacs/nomacs/commit/ @@ -16,7 +16,7 @@ LICENSE= GPLv3 LIB_DEPENDS= libexiv2.so:graphics/exiv2 \ libopencv_highgui.so:graphics/opencv \ - libopencv_core.so:graphics/opencv-core \ + libopencv_core.so:graphics/opencv \ liblcms2.so:graphics/lcms2 \ libquazip1-qt5.so:archivers/quazip diff --git a/graphics/opencv-core/Makefile b/graphics/opencv-core/Makefile deleted file mode 100644 index c80b3ff8edb2..000000000000 --- a/graphics/opencv-core/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# Created by: Martin Matuska -# $FreeBSD$ - -PORTREVISION= 4 -PKGNAMESUFFIX= -${OCV_SLAVE} - -COMMENT= OpenCV core libraries - -OCV_SLAVE= core -OCV_CORE= yes -MASTERDIR= ${.CURDIR:H}/opencv -PLIST= ${.CURDIR}/pkg-plist - -.include "${MASTERDIR}/Makefile" diff --git a/graphics/opencv-core/pkg-plist b/graphics/opencv-core/pkg-plist deleted file mode 100644 index 9efdefdc99a8..000000000000 --- a/graphics/opencv-core/pkg-plist +++ /dev/null @@ -1,119 +0,0 @@ -include/opencv2/core.hpp -include/opencv2/core/affine.hpp -include/opencv2/core/base.hpp -include/opencv2/core/bufferpool.hpp -include/opencv2/core/core_c.h -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/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/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/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.%%SOVERSION%% -lib/libopencv_core.so.%%VERSION%% -lib/libopencv_imgproc.so -lib/libopencv_imgproc.so.%%SOVERSION%% -lib/libopencv_imgproc.so.%%VERSION%% -libdata/pkgconfig/opencv-core.pc -share/cmake/Modules/FindOpenCVCore.cmake diff --git a/graphics/opencv-java/Makefile b/graphics/opencv-java/Makefile deleted file mode 100644 index 13aa183ce149..000000000000 --- a/graphics/opencv-java/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# $FreeBSD$ - -PORTREVISION= 5 -CATEGORIES= graphics java -PKGNAMESUFFIX= -${OCV_SLAVE} - -COMMENT= OpenCV Java library - -OCV_SLAVE= java -OCV_JAVA= yes -MASTERDIR= ${.CURDIR:H}/opencv -PLIST= ${.CURDIR}/pkg-plist - -PLIST_SUB+= OCV_VER=${DISTVERSION:S|.||g} - -.include "${MASTERDIR}/Makefile" diff --git a/graphics/opencv-java/pkg-plist b/graphics/opencv-java/pkg-plist deleted file mode 100644 index 107f21febc9e..000000000000 --- a/graphics/opencv-java/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -%%DATADIR%%/java/libopencv_java%%OCV_VER%%.so -%%DATADIR%%/java/opencv-%%OCV_VER%%.jar diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index b5411dea9c26..b1e0da9c117f 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -1,9 +1,7 @@ -# Created by: Marc Abramowitz (http://marc.abramowitz.info) # $FreeBSD$ PORTNAME= opencv -PORTVERSION= 3.4.1 -PORTREVISION= 40 +DISTVERSION= 4.5.1 CATEGORIES= graphics MAINTAINER= tcberner@FreeBSD.org @@ -12,390 +10,79 @@ COMMENT= Open Source Computer Vision library LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -NOT_FOR_ARCHS= sparc64 -NOT_FOR_ARCHS_REASON_sparc64= does not compile on sparc64 - -.if defined(OCV_CORE) -BUILD_DEPENDS= protoc:devel/protobuf -.else -LIB_DEPENDS= libprotobuf.so:devel/protobuf \ - libtesseract.so:graphics/tesseract -.endif - -USES= cmake compiler:c++14-lang localbase:ldflags pkgconfig +BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers \ + opencl>=0:devel/opencl +RUN_DEPENDS= opencl>=0:devel/opencl +LIB_DEPENDS= \ + libIlmImf.so:graphics/openexr \ + libavcodec.so:multimedia/ffmpeg \ + libfreetype.so:print/freetype2 \ + libgflags.so:devel/gflags \ + libglog.so:devel/glog \ + libgphoto2.so:graphics/libgphoto2 \ + libharfbuzz.so:print/harfbuzz \ + libhdf5.so:science/hdf5 \ + libopenblas.so:math/openblas \ + libpng16.so:graphics/png \ + libtbb.so:devel/tbb \ + libtiff.so:graphics/tiff \ + libwebp.so:graphics/webp \ +USES= cmake compiler:c++14-lang eigen:3 jpeg localbase:ldflags pkgconfig python:3.6+,build USE_GITHUB= yes -USE_LDCONFIG= yes -USE_CXXSTD= c++11 +GH_PROJECT= opencv_contrib:contrib \ + ade:ade \ + opencv_3rdparty:extra_mod_3rdparty_boost_descr \ + opencv_3rdparty:extra_mod_3rdparty_vgg_descr +GH_TAGNAME= v0.1.1f:ade \ + 34e4206aef44d50e6bbcd0ab06354b52e7466d26:extra_mod_3rdparty_boost_descr \ + fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d:extra_mod_3rdparty_vgg_descr -DATADIR= ${PREFIX}/share/OpenCV -PLIST_SUB+= SOVERSION=${DISTVERSION:R} VERSION=${DISTVERSION} +CMAKE_ON= \ + WITH_EIGEN \ + WITH_GDAL \ + WITH_GDCM \ + WITH_GPHOTO2 \ + WITH_JASPER \ + WITH_JPEG \ + WITH_OPENCL \ + WITH_OPENEXR \ + WITH_OPENGL \ + WITH_PNG \ + WITH_TBB \ + WITH_TIFF \ + WITH_VULKAN \ + WITH_WEBP \ + OPENCV_GENERATE_PKGCONFIG \ + OPENCV_ENABLE_NONFREE +CMAKE_OFF= OPENCV_GENERATE_SETUPVARS \ + BUILD_opencv_python2 \ + BUILD_TESTS +CMAKE_ARGS= -DOPENCV_EXTRA_MODULES_PATH="${WRKSRC}/contrib/modules" \ + -DOPENCV_PYTHON3_INSTALL_PATH=${PYTHON_SITELIBDIR} \ + -DVULKAN_INCLUDE_DIRS=${LOCALBASE}/include -# 3rd party libs -CMAKE_ON= ENABLE_CXX11 -CMAKE_OFF= BUILD_ZLIB BUILD_TIFF BUILD_JASPER BUILD_JPEG BUILD_PNG BUILD_OPENEXR BUILD_TBB BUILD_IPP_IW BUILD_ITT BUILD_PROTOBUF -# Optional 3rd party components -CMAKE_ARGS+= -DWITH_1394:BOOL=OFF \ - -DWITH_CAROTENE:BOOL=OFF \ - -DWITH_CPUFEATURES:BOOL=OFF \ - -DWITH_VTK:BOOL=OFF \ - -DWITH_CUDA:BOOL=OFF \ - -DWITH_CUFFT:BOOL=OFF \ - -DWITH_CUBLAS:BOOL=OFF \ - -DWITH_NVCUVID:BOOL=OFF \ - -DWITH_EIGEN:BOOL=OFF \ - -DWITH_VFW:BOOL=OFF \ - -DWITH_FFMPEG:BOOL=OFF \ - -DWITH_GSTREAMER:BOOL=OFF \ - -DWITH_GSTREAMER_0_10:BOOL=OFF \ - -DWITH_GTK:BOOL=OFF \ - -DWITH_GTK_2_X:BOOL=ON \ - -DWITH_IPP:BOOL=OFF \ - -DWITH_IPP_A:BOOL=OFF \ - -DWITH_HALIDE:BOOL=OFF \ - -DWITH_JASPER:BOOL=OFF \ - -DWITH_JPEG:BOOL=OFF \ - -DWITH_WEBP:BOOL=OFF \ - -DWITH_OPENEXR:BOOL=OFF \ - -DWITH_OPENGL:BOOL=OFF \ - -DWITH_OPENVX:BOOL=OFF \ - -DWITH_OPENNI:BOOL=OFF \ - -DWITH_OPENNI2:BOOL=OFF \ - -DWITH_PNG:BOOL=OFF \ - -DWITH_GDCM:BOOL=OFF \ - -DWITH_PVAPI:BOOL=OFF \ - -DWITH_GIGEAPI:BOOL=OFF \ - -DWITH_ARAVIS:BOOL=OFF \ - -DWITH_QT:BOOL=OFF \ - -DWITH_WIN32UI:BOOL=OFF \ - -DWITH_TBB:BOOL=OFF \ - -DWITH_OPENMP:BOOL=OFF \ - -DWITH_CSTRIPES:BOOL=ON \ - -DWITH_PTHREADS_PF:BOOL=OFF \ - -DWITH_TIFF:BOOL=OFF \ - -DWITH_UNICAP:BOOL=OFF \ - -DWITH_V4L:BOOL=OFF \ - -DWITH_LIBV4L:BOOL=OFF \ - -DWITH_DSHOW:BOOL=OFF \ - -DWITH_MSMF:BOOL=OFF \ - -DWITH_XIMEA:BOOL=OFF \ - -DWITH_XINE:BOOL=OFF \ - -DWITH_CLP:BOOL=OFF \ - -DWITH_OPENCL:BOOL=OFF \ - -DWITH_OPENCL_SVM:BOOL=OFF \ - -DWITH_OPENCLAMDFFT:BOOL=OFF \ - -DWITH_OPENCLAMDBLAS:BOOL=OFF \ - -DWITH_DIRECTX:BOOL=OFF \ - -DWITH_INTELPERC:BOOL=OFF \ - -DWITH_MATLAB:BOOL=OFF \ - -DWITH_VA:BOOL=OFF \ - -DWITH_VA_INTEL:BOOL=OFF \ - -DWITH_GDAL:BOOL=OFF \ - -DWITH_GPHOTO2:BOOL=OFF \ - -DWITH_LAPACK:BOOL=OFF \ - -DWITH_ITT:BOOL=OFF -# 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 +DATADIR= ${PREFIX}/share/${PORTNAME}4 -SUB_FILES= FindOpenCVCore.cmake -SUB_LIST= OCV_VERSION=${DISTVERSION} - -OCV_CORE_MODS= core imgproc -OCV_MODS= apps calib3d contrib dnn features2d flann highgui \ - imgcodecs ml objdetect photo shape stitching \ - superres ts video videoio videostab -OCV_JAVA_MODS= java -OCV_PYTHON_MODS= python${PYTHON_MAJOR_VER} - -OPTIONS_DEFINE= EXAMPLES EXTRA_MODULES OPENGL GTK2 -OPTIONS_GROUP= PERFORMANCE IMAGE VIDEO -OPTIONS_GROUP_PERFORMANCE= EIGEN3 OPENCL # TBB -OPTIONS_GROUP_IMAGE= GDAL GDCM JASPER JPEG OPENEXR PNG TIFF WEBP -OPTIONS_GROUP_VIDEO= ARAVIS DC1394 FFMPEG GPHOTO2 GSTREAMER MFX V4L XINE -# EXTRA_MODULES required for libopencv_dnn which is required by py-opencv -OPTIONS_DEFAULT= EIGEN3 EXTRA_MODULES FFMPEG JASPER JPEG PNG TIFF WEBP V4L \ - ${MACHINE_CPU:tu} +OPTIONS_DEFINE= PYTHON JAVA +OPTIONS_DEFAULT= PYTHON OPTIONS_SUB= yes -.if defined(OCV_CORE) -OPTIONS_EXCLUDE= ARAVIS DC1394 EXAMPLES EXTRA_MODULES FFMPEG \ - GDAL GDCM GPHOTO2 GSTREAMER GTK2 JASPER JPEG \ - OPENEXR OPENGL PNG TIFF WEBP V4L XINE -.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 +JAVA_CMAKE_BOOL= BUILD_openv_java +JAVA_BUILD_DEPENDS= ant:devel/apache-ant -EXAMPLES_CMAKE_BOOL= INSTALL_C_EXAMPLES +PYTHON_BUILD_DEPENDS= ${PYNUMPY} +PYTHON_RUN_DEPENDS= ${PYNUMPY} +PYTHON_USES= python:3.6+ +PYTHON_USE_PYTHON= noflavors +PYTHON_CMAKE_BOOL= BUILD_opencv_python3 -PERFORMANCE_DESC= Performance enhancing libraries +post-extract: + ${MV} ${WRKSRC_contrib} ${WRKSRC}/contrib + ${MKDIR} ${BUILD_WRKSRC}/3rdparty/ade + ${MV} ${WRKSRC_ade} ${BUILD_WRKSRC}/3rdparty/ade + ${MKDIR} ${WRKSRC}/contrib/modules/xfeatures2d/src + ${MV} ${WRKSRC_extra_mod_3rdparty_boost_descr}/* ${WRKSRC}/contrib/modules/xfeatures2d/src + ${MV} ${WRKSRC_extra_mod_3rdparty_vgg_descr}/* ${WRKSRC}/contrib/modules/xfeatures2d/src -EIGEN3_DESC= Eigen 3 support -EIGEN3_USES= eigen:3 -EIGEN3_CMAKE_BOOL= WITH_EIGEN - -OPENCL_DESC= OpenCL support -OPENCL_BUILD_DEPENDS= opencl>=0:devel/opencl -OPENCL_RUN_DEPENDS= opencl>=0:devel/opencl -OPENCL_CMAKE_BOOL= WITH_OPENCL - -TBB_DESC= TBB support -TBB_LIB_DEPENDS= libtbb.so:devel/tbb -TBB_CMAKE_BOOL= WITH_TBB -TBB_BROKEN= Not oneTBB-compatible - -IMAGE_DESC= Image format support - -JASPER_LIB_DEPENDS= libjasper.so:graphics/jasper -JASPER_CMAKE_BOOL= WITH_JASPER - -JPEG_USES= jpeg -JPEG_CMAKE_BOOL= WITH_JPEG - -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 - -MFX_DESC= Intel MediaSDK (aka Quick Sync Video) -MFX_LIB_DEPENDS= libmfx.so:multimedia/intel-media-sdk \ - libva-drm.so:multimedia/libva -MFX_CONFIGURE_ENV= MFX_HOME="${LOCALBASE}" -MFX_CMAKE_BOOL= WITH_MFX - -OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr -OPENEXR_CMAKE_BOOL= WITH_OPENEXR - -PNG_LIB_DEPENDS= libpng.so:graphics/png -PNG_CMAKE_BOOL= WITH_PNG - -TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff -TIFF_CMAKE_BOOL= WITH_TIFF - -WEBP_LIB_DEPENDS= libwebp.so:graphics/webp -WEBP_CMAKE_BOOL= WITH_WEBP - -VIDEO_DESC= Video support - -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 WITH_LIBV4L -V4L_CMAKE_ON= CMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include" - -XINE_LIB_DEPENDS= libxine.so:multimedia/libxine -XINE_CMAKE_BOOL= WITH_XINE - -EXTRA_MODULES_DESC= Extra modules -EXTRA_MODULES_GH_ACCOUNT= tiny-dnn:extra_mod_3rdparty_tiny_dnn -EXTRA_MODULES_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 \ - ${FILESDIR}/extra-patch-modules_stereo_src_descriptor.cpp - -OPENGL_DESC= OpenGL (requires GTK2) -OPENGL_CMAKE_BOOL= WITH_OPENGL -OPENGL_LIB_DEPENDS= ${PORT_OPTIONS:MGTK2:C,.+,libgtkglext-x11-1.0.so:x11-toolkits/gtkglext,} - -# GUI - -GTK2_USES= gnome -GTK2_USE= GNOME=cairo,gdkpixbuf2,gtk20 -GTK2_CMAKE_BOOL= WITH_GTK -GTK2_LIB_DEPENDS= libfreetype.so:print/freetype2 \ - libharfbuzz.so:print/harfbuzz \ - libsz.so:science/szip \ - libfontconfig.so:x11-fonts/fontconfig \ - liblept.so:graphics/leptonica - -.if defined(OCV_CORE) -. for module in ${OCV_MODS} ${OCV_JAVA_MODS} ${OCV_PYTHON_MODS} -CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=OFF -. endfor -.elif defined(OCV_PYTHON) -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+= python:3.6+ -USE_PYTHON= flavors -CMAKE_ARGS+= -DBUILD_opencv_python${PYTHON_MAJOR_VER}:BOOL=ON -. for module in apps java stitching superres videostab -CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=OFF -. endfor -INSTALL_WRKSRC= ${WRKDIR}/.build/modules/python${PYTHON_MAJOR_VER} -.elif defined(OCV_JAVA) -BUILD_DEPENDS+= ant:devel/apache-ant -LIB_DEPENDS+= libopencv_ml.so:graphics/opencv -USES+= python:3.6+,build -USE_JAVA= yes -CMAKE_ARGS+= -DBUILD_opencv_java:BOOL=ON -. for module in apps python stitching superres videostab -CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=OFF -. endfor -CONFIGURE_ENV+= JAVA_HOME="${JAVA_HOME}" -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 -. 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: - @${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 - @${REINPLACE_CMD} -e 's|||g' \ - ${WRKSRC}/modules/dnn/src/torch/THGeneral.cpp -.if defined(OCV_CORE) - @${REINPLACE_CMD} -e 's|opencv.pc|opencv-core.pc|g' \ - ${WRKSRC}/cmake/OpenCVGenPkgconfig.cmake - @${REINPLACE_CMD} -e 's|Name:.*|Name: OpenCV-core|' \ - ${WRKSRC}/cmake/templates/opencv-XXX.pc.in -.endif -.if defined(OCV_SLAVE) - @${REINPLACE_CMD} -e 's|add_subdirectory(data)||g' \ - ${WRKSRC}/CMakeLists.txt -.endif - @${FIND} ${WRKSRC} -name '*.bak' -exec ${RM} {} \; - -pre-build: - protoc --proto_path=${WRKSRC}/modules/dnn/src/caffe/ --cpp_out=${WRKSRC}/modules/dnn/misc/caffe/ ${WRKSRC}/modules/dnn/src/caffe/*.proto - protoc --proto_path=${WRKSRC}/modules/dnn/src/tensorflow/ --cpp_out=${WRKSRC}/modules/dnn/misc/tensorflow/ ${WRKSRC}/modules/dnn/src/tensorflow/*.proto - -post-install: -.if !defined(OCV_SLAVE) - (cd ${STAGEDIR}${PREFIX} && \ - ${RM} -r include/opencv2/core include/opencv2/core.hpp include/opencv2/imgproc \ - 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 - ${RM} -r ${STAGEDIR}${DATADIR} - ${MKDIR} ${STAGEDIR}${PREFIX}/share/cmake/Modules - ${INSTALL_DATA} ${WRKDIR}/FindOpenCVCore.cmake ${STAGEDIR}${PREFIX}/share/cmake/Modules -.endif -.if defined(OCV_PYTHON) - (cd ${STAGEDIR}${PREFIX} && \ - ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ - -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S|${PREFIX}/||} && \ - ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ - -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S|${PREFIX}/||}) - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - cd ${WRKSRC}/samples/python && \ - ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/python -.endif -.if defined(OCV_JAVA) - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - cd ${WRKSRC}/samples/java && \ - ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/java -.endif - -.include - -.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 +.include diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo index c27031efb0c3..9bbbe5176e5f 100644 --- a/graphics/opencv/distinfo +++ b/graphics/opencv/distinfo @@ -1,12 +1,10 @@ -TIMESTAMP = 1524780757 -SHA256 (opencv-opencv-3.4.1_GH0.tar.gz) = f1b87684d75496a1054405ae3ee0b6573acaf3dad39eaf4f1d66fdd7e03dc852 -SIZE (opencv-opencv-3.4.1_GH0.tar.gz) = 87051748 -SHA256 (tiny-dnn-tiny-dnn-2a2b50caa437a5964a61e45ffc83e70558e2bc68_GH0.tar.gz) = 03ff06b154a1a6a0f53d6f24a128727e533355d68164c509303e2da14062e97f -SIZE (tiny-dnn-tiny-dnn-2a2b50caa437a5964a61e45ffc83e70558e2bc68_GH0.tar.gz) = 12885594 -SHA256 (opencv-opencv_contrib-3.4.1_GH0.tar.gz) = 298c69ee006d7675e1ff9d371ba8b0d9e7e88374bb7ba0f9d0789851d352ec6e -SIZE (opencv-opencv_contrib-3.4.1_GH0.tar.gz) = 57126844 -SHA256 (opencv-opencv_3rdparty-8afa57abc8229d611c4937165d20e2a2d9fc5a12_GH0.tar.gz) = 0ae1f2d2a619ab177d96024e253e142d15dea27236510aaf1a65c7b529ee6677 -SIZE (opencv-opencv_3rdparty-8afa57abc8229d611c4937165d20e2a2d9fc5a12_GH0.tar.gz) = 63301261 +TIMESTAMP = 1612010514 +SHA256 (opencv-opencv-4.5.1_GH0.tar.gz) = e27fe5b168918ab60d58d7ace2bd82dd14a4d0bd1d3ae182952c2113f5637513 +SIZE (opencv-opencv-4.5.1_GH0.tar.gz) = 88245766 +SHA256 (opencv-opencv_contrib-4.5.1_GH0.tar.gz) = 12c3b1ddd0b8c1a7da5b743590a288df0934e5cef243e036ca290c2e45e425f5 +SIZE (opencv-opencv_contrib-4.5.1_GH0.tar.gz) = 60602431 +SHA256 (opencv-ade-v0.1.1f_GH0.tar.gz) = c316680efbb5dd3ac4e10bb8cea345cf26a6a25ebc22418f8f0b8ca931a550e9 +SIZE (opencv-ade-v0.1.1f_GH0.tar.gz) = 116074 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 diff --git a/graphics/opencv/files/FindOpenCVCore.cmake.in b/graphics/opencv/files/FindOpenCVCore.cmake.in deleted file mode 100644 index ee278d78fcd6..000000000000 --- a/graphics/opencv/files/FindOpenCVCore.cmake.in +++ /dev/null @@ -1,38 +0,0 @@ -# Module for finding the core components of OpenCV installed by -# graphics/opencv-core. Use for projects that require only -# opencv_core or opencv_imgproc. Others should use the -# standard OpenCV CMake find routines provided by graphics/opencv. -# -# This module provides: -# OPENCVCORE_FOUND - defined if the required OpenCV components are found -# OpenCV_INCLUDE_DIRS - the path to the OpenCV headers -# OpenCV_LIBS - the OpenCV libraries to link to -# OpenCV_VERSION - the version of OpenCV -# -# Example usage: find_package( OpenCVCore COMPONENTS core imgproc REQUIRED ) - -include( FindPackageHandleStandardArgs ) - -set( OpenCV_VERSION %%OCV_VERSION%% ) - -find_path( OpenCV_INCLUDE_DIRS NAMES opencv2/core/core.hpp ) - -if( OpenCVCore_FIND_COMPONENTS ) - foreach( component ${OpenCVCore_FIND_COMPONENTS} ) - string( TOUPPER ${component} _COMPONENT ) - set( OPENCV_USE_${_COMPONENT} 1 ) - endforeach() -endif() - -# opencv_core is always required -find_library( OPENCV_CORE_LIBRARY NAMES opencv_core ) - -if( OPENCV_USE_IMGPROC OR NOT OpenCVCore_FIND_COMPONENTS ) - find_library( OPENCV_IMGPROC_LIBRARY NAMES opencv_imgproc ) -endif() - -set( OpenCV_LIBS ${OPENCV_CORE_LIBRARY} ${OPENCV_IMGPROC_LIBRARY} ) - -find_package_handle_standard_args( OpenCVCore DEFAULT_MSG OpenCV_LIBS OpenCV_INCLUDE_DIRS ) - -mark_as_advanced( ${OpenCV_LIBS} ${OpenCV_INCLUDE_DIRS} ${OpenCV_VERSION} ) diff --git a/graphics/opencv/files/extra-patch-modules_dnn__modern_CMakeLists.txt b/graphics/opencv/files/extra-patch-modules_dnn__modern_CMakeLists.txt deleted file mode 100644 index cd478f415543..000000000000 --- a/graphics/opencv/files/extra-patch-modules_dnn__modern_CMakeLists.txt +++ /dev/null @@ -1,37 +0,0 @@ ---- modules/dnn_modern/CMakeLists.txt.orig 2017-12-22 19:15:17.000000000 +0300 -+++ modules/dnn_modern/CMakeLists.txt 2018-01-17 02:29:23.382430000 +0300 -@@ -15,20 +15,20 @@ - - set(TINY_DNN_CPP_PATH "${OpenCV_BINARY_DIR}/3rdparty/tinydnn") - set(TINY_DNN_CPP_ROOT "${TINY_DNN_CPP_PATH}/tiny-dnn-1.0.0a3") --ocv_download(FILENAME "v1.0.0a3.tar.gz" -- HASH "adb1c512e09ca2c7a6faef36f9c53e59" -- URL -- "${OPENCV_TINY_DNN_URL}" -- "$ENV{OPENCV_TINY_DNN_URL}" -- "https://github.com/tiny-dnn/tiny-dnn/archive/" -- DESTINATION_DIR "${TINY_DNN_CPP_PATH}" -- STATUS TINY_DNN_DOWNLOAD_SUCCESS -- ID "tiny-dnn" -- UNPACK RELATIVE_URL) -- --if(NOT TINY_DNN_DOWNLOAD_SUCCESS) -- message(STATUS "Failed to download tiny-dnn sources") --endif() -+#ocv_download(FILENAME "v1.0.0a3.tar.gz" -+# HASH "adb1c512e09ca2c7a6faef36f9c53e59" -+# URL -+# "${OPENCV_TINY_DNN_URL}" -+# "$ENV{OPENCV_TINY_DNN_URL}" -+# "https://github.com/tiny-dnn/tiny-dnn/archive/" -+# DESTINATION_DIR "${TINY_DNN_CPP_PATH}" -+# STATUS TINY_DNN_DOWNLOAD_SUCCESS -+# ID "tiny-dnn" -+# UNPACK RELATIVE_URL) -+# -+#if(NOT TINY_DNN_DOWNLOAD_SUCCESS) -+# message(STATUS "Failed to download tiny-dnn sources") -+#endif() - - find_package(TinyDNN QUIET) - diff --git a/graphics/opencv/files/extra-patch-modules_sfm_CMakeLists.txt b/graphics/opencv/files/extra-patch-modules_sfm_CMakeLists.txt deleted file mode 100644 index c2fa1ba870a5..000000000000 --- a/graphics/opencv/files/extra-patch-modules_sfm_CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ ---- modules/sfm/CMakeLists.txt.orig 2015-12-17 20:11:31.000000000 +0300 -+++ modules/sfm/CMakeLists.txt 2016-10-10 18:28:05.556797000 +0300 -@@ -1,25 +1,30 @@ - set(the_description "SFM algorithms") -+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) - - - ### LIBMV LIGHT EXTERNAL DEPENDENCIES ### - - find_package(Gflags QUIET) --find_package(Ceres QUIET) --if(NOT Ceres_FOUND) # Looks like Ceres find glog on the own, so separate search isn't necessary -+#find_package(Ceres QUIET) -+#if(NOT Ceres_FOUND) # Looks like Ceres find glog on the own, so separate search isn't necessary - find_package(Glog QUIET) --endif() -+#endif() - - if((gflags_FOUND OR GFLAGS_FOUND) AND (glog_FOUND OR GLOG_FOUND)) - set(_fname "${CMAKE_CURRENT_BINARY_DIR}/test_sfm_deps.cpp") - file(WRITE "${_fname}" "#include \n#include \nint main() { (void)(0); return 0; }\n") -- try_compile(SFM_DEPS_OK "${CMAKE_BINARY_DIR}" "${_fname}" -- CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${GLOG_INCLUDE_DIRS};${GFLAGS_INCLUDE_DIRS}" -- LINK_LIBRARIES ${GLOG_LIBRARIES} ${GFLAGS_LIBRARIES} -- OUTPUT_VARIABLE OUTPUT -+ try_compile(SFM_DEPS_OK "${CMAKE_CURRENT_BINARY_DIR}" "${_fname}" -+ CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${GLOG_INCLUDE_DIRS};${GFLAGS_INCLUDE_DIRS} -DLINK_LIBRARIES:STRING=${GLOG_LIBRARIES};${GFLAGS_LIBRARIES}" - ) - file(REMOVE "${_fname}") - message(STATUS "Checking SFM deps... ${SFM_DEPS_OK}") - else() -+ if(NOT gflags_FOUND AND NOT GFLAGS_FOUND) -+ message(STATUS "gflags not found") -+ endif() -+ if(NOT glog_FOUND AND NOT GLOG_FOUND) -+ message(STATUS "glog not found") -+ endif() - set(SFM_DEPS_OK FALSE) - endif() - diff --git a/graphics/opencv/files/extra-patch-modules_sfm_src_libmv__light_libmv_numeric_numeric.cc b/graphics/opencv/files/extra-patch-modules_sfm_src_libmv__light_libmv_numeric_numeric.cc deleted file mode 100644 index 6e94e48d9660..000000000000 --- a/graphics/opencv/files/extra-patch-modules_sfm_src_libmv__light_libmv_numeric_numeric.cc +++ /dev/null @@ -1,35 +0,0 @@ ---- modules/sfm/src/libmv_light/libmv/numeric/numeric.cc.orig 2018-04-27 13:11:58.957812000 +0000 -+++ modules/sfm/src/libmv_light/libmv/numeric/numeric.cc 2018-04-27 15:52:13.702374000 +0000 -@@ -24,8 +24,8 @@ - namespace libmv { - - Mat3 RotationAroundX(double angle) { -- double c, s; -- sincos(angle, &s, &c); -+ double c = cos(angle); -+ double s = sin(angle); - Mat3 R; - R << 1, 0, 0, - 0, c, -s, -@@ -34,8 +34,8 @@ Mat3 RotationAroundX(double angle) { - } - - Mat3 RotationAroundY(double angle) { -- double c, s; -- sincos(angle, &s, &c); -+ double c = cos(angle); -+ double s = sin(angle); - Mat3 R; - R << c, 0, s, - 0, 1, 0, -@@ -44,8 +44,8 @@ Mat3 RotationAroundY(double angle) { - } - - Mat3 RotationAroundZ(double angle) { -- double c, s; -- sincos(angle, &s, &c); -+ double c = cos(angle); -+ double s = sin(angle); - Mat3 R; - R << c, -s, 0, - s, c, 0, diff --git a/graphics/opencv/files/extra-patch-modules_stereo_src_descriptor.cpp b/graphics/opencv/files/extra-patch-modules_stereo_src_descriptor.cpp deleted file mode 100644 index 49805ec35396..000000000000 --- a/graphics/opencv/files/extra-patch-modules_stereo_src_descriptor.cpp +++ /dev/null @@ -1,15 +0,0 @@ -https://github.com/opencv/opencv_contrib/commit/4e10bc5dae62 - ---- modules/stereo/src/descriptor.cpp.orig 2018-02-22 13:38:31 UTC -+++ modules/stereo/src/descriptor.cpp -@@ -226,8 +226,8 @@ namespace cv - //integral image computation used in the Mean Variation Census Transform - void imageMeanKernelSize(const Mat &image, int windowSize, Mat &cost) - { -- CV_Assert(image.size > 0); -- CV_Assert(cost.size > 0); -+ CV_Assert(!image.empty()); -+ CV_Assert(!cost.empty()); - CV_Assert(windowSize % 2 != 0); - int win = windowSize / 2; - float scalling = ((float) 1) / (windowSize * windowSize); diff --git a/graphics/opencv/files/patch-cmake_OpenCVDetectMediaSDK.cmake b/graphics/opencv/files/patch-cmake_OpenCVDetectMediaSDK.cmake deleted file mode 100644 index 60d999701d7e..000000000000 --- a/graphics/opencv/files/patch-cmake_OpenCVDetectMediaSDK.cmake +++ /dev/null @@ -1,14 +0,0 @@ ---- cmake/OpenCVDetectMediaSDK.cmake.orig 2018-02-23 08:38:33 UTC -+++ cmake/OpenCVDetectMediaSDK.cmake -@@ -19,9 +19,9 @@ else() - # ??? - endif() - --find_path(MFX_INCLUDE mfxdefs.h PATHS "${root}/include" NO_DEFAULT_PATH) -+find_path(MFX_INCLUDE mfxdefs.h PATHS "${root}" PATH_SUFFIXES "include" "include/mfx" NO_DEFAULT_PATH) - message(STATUS "MFX_INCLUDE: ${MFX_INCLUDE} (${root}/include)") --find_library(MFX_LIBRARY NAMES mfx PATHS "${root}/lib/${arch}" NO_DEFAULT_PATH) -+find_library(MFX_LIBRARY NAMES mfx PATHS "${root}" PATH_SUFFIXES "lib" "lib/${arch}" NO_DEFAULT_PATH) - if(MSVC) - if(MSVC14) - find_library(MFX_LIBRARY NAMES libmfx_vs2015.lib PATHS "${root}/lib/${arch}" NO_DEFAULT_PATH) diff --git a/graphics/opencv/files/extra-patch-modules_sfm_src__libmv__light_libmv_numeric_numeric.h b/graphics/opencv/files/patch-contrib_modules_sfm_src_libmv__light_libmv_numeric_numeric.h similarity index 59% rename from graphics/opencv/files/extra-patch-modules_sfm_src__libmv__light_libmv_numeric_numeric.h rename to graphics/opencv/files/patch-contrib_modules_sfm_src_libmv__light_libmv_numeric_numeric.h index 6ba8d996322c..47f4a8c59730 100644 --- a/graphics/opencv/files/extra-patch-modules_sfm_src__libmv__light_libmv_numeric_numeric.h +++ b/graphics/opencv/files/patch-contrib_modules_sfm_src_libmv__light_libmv_numeric_numeric.h @@ -1,5 +1,5 @@ ---- modules/sfm/src/libmv_light/libmv/numeric/numeric.h.orig 2017-12-22 19:15:17.000000000 +0300 -+++ modules/sfm/src/libmv_light/libmv/numeric/numeric.h 2018-01-15 01:06:23.742535000 +0300 +--- contrib/modules/sfm/src/libmv_light/libmv/numeric/numeric.h.orig 2021-01-30 07:20:50 UTC ++++ contrib/modules/sfm/src/libmv_light/libmv/numeric/numeric.h @@ -35,7 +35,7 @@ #if !defined(__MINGW64__) diff --git a/graphics/opencv/files/patch-modules_core_include_opencv2_core_cv__cpu__dispatch.h b/graphics/opencv/files/patch-modules_core_include_opencv2_core_cv__cpu__dispatch.h deleted file mode 100644 index 72ac65b848ae..000000000000 --- a/graphics/opencv/files/patch-modules_core_include_opencv2_core_cv__cpu__dispatch.h +++ /dev/null @@ -1,26 +0,0 @@ ---- modules/core/include/opencv2/core/cv_cpu_dispatch.h.orig 2020-10-23 01:17:26 UTC -+++ modules/core/include/opencv2/core/cv_cpu_dispatch.h -@@ -108,10 +108,10 @@ - #endif - - #if defined(__VSX__) && defined(__PPC64__) && defined(__LITTLE_ENDIAN__) --# include - # undef vector - # undef pixel - # undef bool -+# include - # define CV_VSX 1 - #endif - -@@ -152,10 +152,10 @@ struct VZeroUpperGuard { - # include - # define CV_NEON 1 - #elif defined(__VSX__) && defined(__PPC64__) && defined(__LITTLE_ENDIAN__) --# include - # undef vector - # undef pixel - # undef bool -+# include - # define CV_VSX 1 - #endif - diff --git a/graphics/opencv/files/patch-modules_core_include_opencv2_core_cvdef.h b/graphics/opencv/files/patch-modules_core_include_opencv2_core_cvdef.h deleted file mode 100644 index 0713c9c42675..000000000000 --- a/graphics/opencv/files/patch-modules_core_include_opencv2_core_cvdef.h +++ /dev/null @@ -1,20 +0,0 @@ ---- modules/core/include/opencv2/core/cvdef.h.orig 2018-02-23 08:38:33 UTC -+++ modules/core/include/opencv2/core/cvdef.h -@@ -452,6 +452,7 @@ Cv64suf; - # endif - #endif - -+#if defined __cplusplus - - // Integer types portatibility - #ifdef OPENCV_STDINT_HEADER -@@ -493,6 +494,9 @@ typedef ::int64_t int64_t; - typedef ::uint64_t uint64_t; - } - #endif -+#endif -+#else -+#include - #endif - - diff --git a/graphics/opencv/files/patch-modules_core_include_opencv2_core_types__c.h b/graphics/opencv/files/patch-modules_core_include_opencv2_core_types__c.h deleted file mode 100644 index 1970421b4437..000000000000 --- a/graphics/opencv/files/patch-modules_core_include_opencv2_core_types__c.h +++ /dev/null @@ -1,49 +0,0 @@ ---- modules/core/include/opencv2/core/types_c.h.orig 2018-02-23 08:38:33 UTC -+++ modules/core/include/opencv2/core/types_c.h -@@ -63,6 +63,7 @@ - #include - #include - #include -+#include - #endif // SKIP_INCLUDES - - #if defined _WIN32 -@@ -196,6 +197,38 @@ enum { - - #define cvInvSqrt(value) ((float)(1./sqrt(value))) - #define cvSqrt(value) ((float)sqrt(value)) -+ -+#ifndef __cplusplus -+CV_INLINE int cvRound(float value) -+{ -+#if ((defined _MSC_VER && defined _M_X64) || ((defined __GNUC__ || defined __clang__) && defined __x86_64__ && \ -+ defined __SSE2__ && !defined __APPLE__)) && !defined(__CUDACC__) -+ __m128 t = _mm_set_ss( value ); -+ return _mm_cvtss_si32(t); -+#elif defined _MSC_VER && defined _M_IX86 -+ int t; -+ __asm -+ { -+ fld value; -+ fistp t; -+ } -+ return t; -+#elif ((defined _MSC_VER && defined _M_ARM) || defined CV_ICC || \ -+ defined __GNUC__ || defined __clang__) && defined HAVE_TEGRA_OPTIMIZATION -+ TEGRA_ROUND_FLT(value); -+#elif defined CV_ICC || defined __GNUC__ || defined __clang__ -+# if CV_VFP -+ ARM_ROUND_FLT(value); -+# else -+ return (int)lrintf(value); -+# endif -+#else -+ /* it's ok if round does not comply with IEEE754 standard; -+ the tests should allow +/-1 difference when the tested functions use round */ -+ return (int)(value + (value >= 0 ? 0.5f : -0.5f)); -+#endif -+} -+#endif - - - /*************** Random number generation *******************/ diff --git a/graphics/opencv/files/patch-modules_core_src_utils_filesystem.cpp b/graphics/opencv/files/patch-modules_core_src_utils_filesystem.cpp deleted file mode 100644 index a835bdf8abc7..000000000000 --- a/graphics/opencv/files/patch-modules_core_src_utils_filesystem.cpp +++ /dev/null @@ -1,47 +0,0 @@ ---- modules/core/src/utils/filesystem.cpp.orig 2017-12-22 22:46:21.000000000 +0300 -+++ modules/core/src/utils/filesystem.cpp 2018-01-14 12:05:05.454427000 +0300 -@@ -33,7 +33,7 @@ - #include - #include - #include --#elif defined __linux__ || defined __APPLE__ -+#elif defined __linux__ || defined __APPLE__ || defined(__FreeBSD__) - #include - #include - #include -@@ -156,7 +156,7 @@ - sz = GetCurrentDirectoryA((DWORD)buf.size(), (char*)buf); - return cv::String((char*)buf, (size_t)sz); - #endif --#elif defined __linux__ || defined __APPLE__ -+#elif defined __linux__ || defined __APPLE__ || defined(__FreeBSD__) - for(;;) - { - char* p = ::getcwd((char*)buf, buf.size()); -@@ -190,7 +190,7 @@ - #else - int result = _mkdir(path.c_str()); - #endif --#elif defined __linux__ || defined __APPLE__ -+#elif defined __linux__ || defined __APPLE__ || defined(__FreeBSD__) - int result = mkdir(path.c_str(), 0777); - #else - int result = -1; -@@ -305,7 +305,7 @@ - Impl& operator=(const Impl&); // disabled - }; - --#elif defined __linux__ || defined __APPLE__ -+#elif defined __linux__ || defined __APPLE__ || defined(__FreeBSD__) - - struct FileLock::Impl - { -@@ -408,7 +408,7 @@ - } - #elif defined __ANDROID__ - // no defaults --#elif defined __APPLE__ -+#elif defined __APPLE__ || defined(__FreeBSD__) - const char* tmpdir_env = getenv("TMPDIR"); - if (tmpdir_env && utils::fs::isDirectory(tmpdir_env)) - { diff --git a/graphics/opencv/files/patch-modules_dnn_src_vkcom_vulkan_vk__loader.cpp b/graphics/opencv/files/patch-modules_dnn_src_vkcom_vulkan_vk__loader.cpp new file mode 100644 index 000000000000..83154b92ed11 --- /dev/null +++ b/graphics/opencv/files/patch-modules_dnn_src_vkcom_vulkan_vk__loader.cpp @@ -0,0 +1,11 @@ +--- modules/dnn/src/vkcom/vulkan/vk_loader.cpp.orig 2021-01-30 08:42:05 UTC ++++ modules/dnn/src/vkcom/vulkan/vk_loader.cpp +@@ -21,7 +21,7 @@ typedef HMODULE VulkanHandle; + (PFN_vkGetInstanceProcAddr)GetProcAddress(handle, "vkGetInstanceProcAddr"); + #endif // _WIN32 + +-#if defined(__linux__) ++#if defined(__linux__) || defined(__FreeBSD__) + #include + #include + typedef void* VulkanHandle; diff --git a/graphics/opencv/files/patch-modules_gapi_cmake_DownloadADE.cmake b/graphics/opencv/files/patch-modules_gapi_cmake_DownloadADE.cmake new file mode 100644 index 000000000000..3027477e2615 --- /dev/null +++ b/graphics/opencv/files/patch-modules_gapi_cmake_DownloadADE.cmake @@ -0,0 +1,30 @@ +The ade distdata is downloaded and moved to the proper location by the ports +framework. + +--- modules/gapi/cmake/DownloadADE.cmake.orig 2020-12-21 20:01:38 UTC ++++ modules/gapi/cmake/DownloadADE.cmake +@@ -1,23 +1,9 @@ + set(ade_src_dir "${OpenCV_BINARY_DIR}/3rdparty/ade") + set(ade_filename "v0.1.1f.zip") + set(ade_subdir "ade-0.1.1f") +-set(ade_md5 "b624b995ec9c439cbc2e9e6ee940d3a2") +-ocv_download(FILENAME ${ade_filename} +- HASH ${ade_md5} +- URL +- "${OPENCV_ADE_URL}" +- "$ENV{OPENCV_ADE_URL}" +- "https://github.com/opencv/ade/archive/" +- DESTINATION_DIR ${ade_src_dir} +- ID ADE +- STATUS res +- UNPACK RELATIVE_URL) + +-if (NOT res) +- return() +-endif() +- + set(ADE_root "${ade_src_dir}/${ade_subdir}/sources/ade") ++ + file(GLOB_RECURSE ADE_sources "${ADE_root}/source/*.cpp") + file(GLOB_RECURSE ADE_include "${ADE_root}/include/ade/*.hpp") + add_library(ade STATIC ${ADE_include} ${ADE_sources}) diff --git a/graphics/opencv/files/patch-modules_highgui_include_opencv2_highgui_highgui__c.h b/graphics/opencv/files/patch-modules_highgui_include_opencv2_highgui_highgui__c.h deleted file mode 100644 index 026268502290..000000000000 --- a/graphics/opencv/files/patch-modules_highgui_include_opencv2_highgui_highgui__c.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ./modules/highgui/include/opencv2/highgui/highgui_c.h.orig 2018-05-02 14:30:32.736476000 -0400 -+++ ./modules/highgui/include/opencv2/highgui/highgui_c.h 2018-05-02 14:33:46.169249000 -0400 -@@ -136,7 +136,7 @@ CVAPI(void) cvSetWindowProperty(const char* name, int - CVAPI(double) cvGetWindowProperty(const char* name, int prop_id); - - /* Get window image rectangle coordinates, width and height */ --CVAPI(cv::Rect)cvGetWindowImageRect(const char* name); -+CVAPI(CvRect)cvGetWindowImageRect(const char* name); - - /* display image within window (highgui windows remember their content) */ - CVAPI(void) cvShowImage( const char* name, const CvArr* image ); diff --git a/graphics/opencv/files/patch-modules_highgui_src_window.cpp b/graphics/opencv/files/patch-modules_highgui_src_window.cpp deleted file mode 100644 index 241840e3edb0..000000000000 --- a/graphics/opencv/files/patch-modules_highgui_src_window.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- ./modules/highgui/src/window.cpp.orig 2018-05-02 14:34:06.721814000 -0400 -+++ ./modules/highgui/src/window.cpp 2018-05-02 14:34:25.980873000 -0400 -@@ -165,7 +165,7 @@ CV_IMPL double cvGetWindowProperty(const char* name, i - } - } - --cv::Rect cvGetWindowImageRect(const char* name) -+CvRect cvGetWindowImageRect(const char* name) - { - if (!name) - return cv::Rect(-1, -1, -1, -1); diff --git a/graphics/opencv/files/patch-modules_highgui_src_window__gtk.cpp b/graphics/opencv/files/patch-modules_highgui_src_window__gtk.cpp deleted file mode 100644 index 114c824b815a..000000000000 --- a/graphics/opencv/files/patch-modules_highgui_src_window__gtk.cpp +++ /dev/null @@ -1,16 +0,0 @@ ---- modules/highgui/src/window_gtk.cpp.orig 2016-12-23 12:54:44 UTC -+++ modules/highgui/src/window_gtk.cpp -@@ -46,10 +46,12 @@ - - #if defined (HAVE_GTK) - -+#include -+#include - #include -+#include - #include - #include --#include - - #if (GTK_MAJOR_VERSION == 3) - #define GTK_VERSION3 1 diff --git a/graphics/opencv/files/patch-modules_imgcodecs_src_grfmt__jpeg2000.cpp b/graphics/opencv/files/patch-modules_imgcodecs_src_grfmt__jpeg2000.cpp deleted file mode 100644 index fcabcdbe4ba0..000000000000 --- a/graphics/opencv/files/patch-modules_imgcodecs_src_grfmt__jpeg2000.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- modules/imgcodecs/src/grfmt_jpeg2000.cpp.orig 2018-02-23 08:38:33 UTC -+++ modules/imgcodecs/src/grfmt_jpeg2000.cpp -@@ -337,7 +337,7 @@ bool Jpeg2KDecoder::readComponent8u( uchar *data, voi - - for( y = 0; y < yend - ystart; ) - { -- jas_seqent_t* pix_row = &jas_matrix_get( buffer, y / ystep, 0 ); -+ jas_seqent_t* pix_row = jas_matrix_getref( buffer, y / ystep, 0 ); - uchar* dst = data + (y - yoffset) * step - xoffset; - - if( xstep == 1 ) -@@ -401,7 +401,7 @@ bool Jpeg2KDecoder::readComponent16u( unsigned short - - for( y = 0; y < yend - ystart; ) - { -- jas_seqent_t* pix_row = &jas_matrix_get( buffer, y / ystep, 0 ); -+ jas_seqent_t* pix_row = jas_matrix_getref( buffer, y / ystep, 0 ); - ushort* dst = data + (y - yoffset) * step - xoffset; - - if( xstep == 1 ) diff --git a/graphics/opencv/files/patch-modules_python_src2_cv2.cpp b/graphics/opencv/files/patch-modules_python_src2_cv2.cpp deleted file mode 100644 index c2727519aaac..000000000000 --- a/graphics/opencv/files/patch-modules_python_src2_cv2.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/python/src2/cv2.cpp.orig 2018-02-23 08:38:33 UTC -+++ modules/python/src2/cv2.cpp -@@ -886,7 +886,7 @@ bool pyopencv_to(PyObject* obj, String& value, const c - (void)name; - if(!obj || obj == Py_None) - return true; -- char* str = PyString_AsString(obj); -+ const char* str = PyString_AsString(obj); - if(!str) - return false; - value = String(str); diff --git a/graphics/opencv/files/patch-modules_videoio_src_cap__libv4l.cpp b/graphics/opencv/files/patch-modules_videoio_src_cap__libv4l.cpp deleted file mode 100644 index 4744276df79c..000000000000 --- a/graphics/opencv/files/patch-modules_videoio_src_cap__libv4l.cpp +++ /dev/null @@ -1,76 +0,0 @@ ---- modules/videoio/src/cap_libv4l.cpp.orig 2016-12-23 12:54:44 UTC -+++ modules/videoio/src/cap_libv4l.cpp -@@ -251,7 +251,9 @@ make & enjoy! - #include - #include - #include -+#ifdef __linux__ - #include /* for videodev2.h */ -+#endif - #include - #include - #include -@@ -298,12 +300,12 @@ static unsigned int n_buffers = 0; - /* TODO: Consider at program exit return controls to the initial values - See v4l2_free_ranges function */ - /* TODO: Consider at program exit reset the device to default values - See v4l2_free_ranges function */ - typedef struct v4l2_ctrl_range { -- __u32 ctrl_id; -- __s32 initial_value; -- __s32 current_value; -- __s32 minimum; -- __s32 maximum; -- __s32 default_value; -+ uint32_t ctrl_id; -+ int32_t initial_value; -+ int32_t current_value; -+ int32_t minimum; -+ int32_t maximum; -+ int32_t default_value; - } v4l2_ctrl_range; - - typedef struct CvCaptureCAM_V4L -@@ -542,7 +544,7 @@ static void v4l2_add_ctrl_range(CvCaptur - capture->v4l2_ctrl_ranges = (v4l2_ctrl_range**)realloc((v4l2_ctrl_range**)capture->v4l2_ctrl_ranges, (capture->v4l2_ctrl_count + 1) * sizeof(v4l2_ctrl_range*)); - } - --static int v4l2_get_ctrl_default(CvCaptureCAM_V4L* capture, __u32 id) { -+static int v4l2_get_ctrl_default(CvCaptureCAM_V4L* capture, uint32_t id) { - int i; - for (i = 0; i < capture->v4l2_ctrl_count; i++) { - if (id == capture->v4l2_ctrl_ranges[i]->ctrl_id) { -@@ -552,7 +554,7 @@ static int v4l2_get_ctrl_default(CvCaptu - return -1; - } - --static int v4l2_get_ctrl_min(CvCaptureCAM_V4L* capture, __u32 id) { -+static int v4l2_get_ctrl_min(CvCaptureCAM_V4L* capture, uint32_t id) { - int i; - for (i = 0; i < capture->v4l2_ctrl_count; i++) { - if (id == capture->v4l2_ctrl_ranges[i]->ctrl_id) { -@@ -562,7 +564,7 @@ static int v4l2_get_ctrl_min(CvCaptureCA - return -1; - } - --static int v4l2_get_ctrl_max(CvCaptureCAM_V4L* capture, __u32 id) { -+static int v4l2_get_ctrl_max(CvCaptureCAM_V4L* capture, uint32_t id) { - int i; - for (i = 0; i < capture->v4l2_ctrl_count; i++) { - if (id == capture->v4l2_ctrl_ranges[i]->ctrl_id) { -@@ -575,7 +577,7 @@ static int v4l2_get_ctrl_max(CvCaptureCA - - 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); -@@ -1653,7 +1655,7 @@ static int icvSetVideoSize( CvCaptureCAM - - static int icvSetControl (CvCaptureCAM_V4L* capture, int property_id, double value) { - struct v4l2_control c; -- __s32 ctrl_value; -+ int32_t ctrl_value; - char name[32]; - int is_v4l2 = 1; - int v4l2_min = 0; diff --git a/graphics/opencv/files/patch-modules_videoio_src_cap__mfx__reader.cpp b/graphics/opencv/files/patch-modules_videoio_src_cap__mfx__reader.cpp deleted file mode 100644 index 8e4375eddbc4..000000000000 --- a/graphics/opencv/files/patch-modules_videoio_src_cap__mfx__reader.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- modules/videoio/src/cap_mfx_reader.cpp.orig 2018-02-23 08:38:33 UTC -+++ modules/videoio/src/cap_mfx_reader.cpp -@@ -6,6 +6,9 @@ - #include "opencv2/core/base.hpp" - #include "cap_mfx_common.hpp" - #include "opencv2/imgproc/hal/hal.hpp" -+#ifndef _WIN32 -+#include // sleep -+#endif - - using namespace cv; - using namespace std; diff --git a/graphics/opencv/files/patch-modules_videoio_src_cap__mfx__writer.cpp b/graphics/opencv/files/patch-modules_videoio_src_cap__mfx__writer.cpp deleted file mode 100644 index 554bf42f2f77..000000000000 --- a/graphics/opencv/files/patch-modules_videoio_src_cap__mfx__writer.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- modules/videoio/src/cap_mfx_writer.cpp.orig 2018-02-23 08:38:33 UTC -+++ modules/videoio/src/cap_mfx_writer.cpp -@@ -6,6 +6,9 @@ - #include "opencv2/core/base.hpp" - #include "cap_mfx_common.hpp" - #include "opencv2/imgproc/hal/hal.hpp" -+#ifndef _WIN32 -+#include // sleep -+#endif - - using namespace std; - using namespace cv; diff --git a/graphics/opencv/files/patch-modules_videoio_src_cap__v4l.cpp b/graphics/opencv/files/patch-modules_videoio_src_cap__v4l.cpp new file mode 100644 index 000000000000..ff6dbd235b52 --- /dev/null +++ b/graphics/opencv/files/patch-modules_videoio_src_cap__v4l.cpp @@ -0,0 +1,12 @@ +--- modules/videoio/src/cap_v4l.cpp.orig 2021-01-30 06:58:09 UTC ++++ modules/videoio/src/cap_v4l.cpp +@@ -231,7 +231,9 @@ make & enjoy! + #include + + #ifdef HAVE_CAMV4L2 ++#ifdef __linux__ + #include /* for videodev2.h */ ++#endif + #include + #endif + diff --git a/graphics/opencv/pkg-plist b/graphics/opencv/pkg-plist index 1c85948ce347..09f019e270be 100644 --- a/graphics/opencv/pkg-plist +++ b/graphics/opencv/pkg-plist @@ -1,445 +1,701 @@ bin/opencv_annotation -bin/opencv_createsamples -%%EXTRA_MODULES%%bin/opencv_interactive-calibration -bin/opencv_traincascade +bin/opencv_interactive-calibration bin/opencv_version bin/opencv_visualisation -%%EXTRA_MODULES%%bin/opencv_waldboost_detector -include/opencv/cv.h -include/opencv/cv.hpp -include/opencv/cvaux.h -include/opencv/cvaux.hpp -include/opencv/cvwimage.h -include/opencv/cxcore.h -include/opencv/cxcore.hpp -include/opencv/cxeigen.hpp -include/opencv/cxmisc.h -include/opencv/highgui.h -include/opencv/ml.h -include/opencv2/ml/ml.inl.hpp -include/opencv2/opencv.hpp -include/opencv2/opencv_modules.hpp -include/opencv2/core_detect.hpp -include/opencv2/hfs.hpp -%%EXTRA_MODULES%%include/opencv2/aruco.hpp -%%EXTRA_MODULES%%include/opencv2/aruco/charuco.hpp -%%EXTRA_MODULES%%include/opencv2/aruco/dictionary.hpp -%%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/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 -include/opencv2/flann/any.h -include/opencv2/flann/autotuned_index.h -include/opencv2/flann/composite_index.h -include/opencv2/flann/config.h -include/opencv2/flann/defines.h -include/opencv2/flann/dist.h -include/opencv2/flann/dummy.h -include/opencv2/flann/dynamic_bitset.h -include/opencv2/flann/flann.hpp -include/opencv2/flann/flann_base.hpp -include/opencv2/flann/general.h -include/opencv2/flann/ground_truth.h -include/opencv2/flann/hdf5.h -include/opencv2/flann/heap.h -include/opencv2/flann/hierarchical_clustering_index.h -include/opencv2/flann/index_testing.h -include/opencv2/flann/kdtree_index.h -include/opencv2/flann/kdtree_single_index.h -include/opencv2/flann/kmeans_index.h -include/opencv2/flann/linear_index.h -include/opencv2/flann/logger.h -include/opencv2/flann/lsh_index.h -include/opencv2/flann/lsh_table.h -include/opencv2/flann/matrix.h -include/opencv2/flann/miniflann.hpp -include/opencv2/flann/nn_index.h -include/opencv2/flann/object_factory.h -include/opencv2/flann/params.h -include/opencv2/flann/random.h -include/opencv2/flann/result_set.h -include/opencv2/flann/sampling.h -include/opencv2/flann/saving.h -include/opencv2/flann/simplex_downhill.h -include/opencv2/flann/timer.h -%%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/highgui.hpp -include/opencv2/highgui/highgui_c.h -%%EXTRA_MODULES%%include/opencv2/line_descriptor.hpp -%%EXTRA_MODULES%%include/opencv2/line_descriptor/descriptor.hpp -include/opencv2/ml.hpp -include/opencv2/ml/ml.hpp -include/opencv2/objdetect.hpp -include/opencv2/objdetect/detection_based_tracker.hpp -include/opencv2/objdetect/objdetect.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 -include/opencv2/stitching/detail/camera.hpp -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/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 -%%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 -include/opencv2/videostab/fast_marching_inl.hpp -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/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%% +bin/opencv_waldboost_detector +include/opencv4/opencv2/alphamat.hpp +include/opencv4/opencv2/aruco.hpp +include/opencv4/opencv2/aruco/charuco.hpp +include/opencv4/opencv2/aruco/dictionary.hpp +include/opencv4/opencv2/bgsegm.hpp +include/opencv4/opencv2/bioinspired.hpp +include/opencv4/opencv2/bioinspired/bioinspired.hpp +include/opencv4/opencv2/bioinspired/retina.hpp +include/opencv4/opencv2/bioinspired/retinafasttonemapping.hpp +include/opencv4/opencv2/bioinspired/transientareassegmentationmodule.hpp +include/opencv4/opencv2/calib3d.hpp +include/opencv4/opencv2/calib3d/calib3d.hpp +include/opencv4/opencv2/calib3d/calib3d_c.h +include/opencv4/opencv2/ccalib.hpp +include/opencv4/opencv2/ccalib/multicalib.hpp +include/opencv4/opencv2/ccalib/omnidir.hpp +include/opencv4/opencv2/ccalib/randpattern.hpp +include/opencv4/opencv2/core.hpp +include/opencv4/opencv2/core/affine.hpp +include/opencv4/opencv2/core/async.hpp +include/opencv4/opencv2/core/base.hpp +include/opencv4/opencv2/core/bindings_utils.hpp +include/opencv4/opencv2/core/bufferpool.hpp +include/opencv4/opencv2/core/check.hpp +include/opencv4/opencv2/core/core.hpp +include/opencv4/opencv2/core/core_c.h +include/opencv4/opencv2/core/cuda.hpp +include/opencv4/opencv2/core/cuda.inl.hpp +include/opencv4/opencv2/core/cuda/block.hpp +include/opencv4/opencv2/core/cuda/border_interpolate.hpp +include/opencv4/opencv2/core/cuda/color.hpp +include/opencv4/opencv2/core/cuda/common.hpp +include/opencv4/opencv2/core/cuda/datamov_utils.hpp +include/opencv4/opencv2/core/cuda/detail/color_detail.hpp +include/opencv4/opencv2/core/cuda/detail/reduce.hpp +include/opencv4/opencv2/core/cuda/detail/reduce_key_val.hpp +include/opencv4/opencv2/core/cuda/detail/transform_detail.hpp +include/opencv4/opencv2/core/cuda/detail/type_traits_detail.hpp +include/opencv4/opencv2/core/cuda/detail/vec_distance_detail.hpp +include/opencv4/opencv2/core/cuda/dynamic_smem.hpp +include/opencv4/opencv2/core/cuda/emulation.hpp +include/opencv4/opencv2/core/cuda/filters.hpp +include/opencv4/opencv2/core/cuda/funcattrib.hpp +include/opencv4/opencv2/core/cuda/functional.hpp +include/opencv4/opencv2/core/cuda/limits.hpp +include/opencv4/opencv2/core/cuda/reduce.hpp +include/opencv4/opencv2/core/cuda/saturate_cast.hpp +include/opencv4/opencv2/core/cuda/scan.hpp +include/opencv4/opencv2/core/cuda/simd_functions.hpp +include/opencv4/opencv2/core/cuda/transform.hpp +include/opencv4/opencv2/core/cuda/type_traits.hpp +include/opencv4/opencv2/core/cuda/utility.hpp +include/opencv4/opencv2/core/cuda/vec_distance.hpp +include/opencv4/opencv2/core/cuda/vec_math.hpp +include/opencv4/opencv2/core/cuda/vec_traits.hpp +include/opencv4/opencv2/core/cuda/warp.hpp +include/opencv4/opencv2/core/cuda/warp_reduce.hpp +include/opencv4/opencv2/core/cuda/warp_shuffle.hpp +include/opencv4/opencv2/core/cuda_stream_accessor.hpp +include/opencv4/opencv2/core/cuda_types.hpp +include/opencv4/opencv2/core/cv_cpu_dispatch.h +include/opencv4/opencv2/core/cv_cpu_helper.h +include/opencv4/opencv2/core/cvdef.h +include/opencv4/opencv2/core/cvstd.hpp +include/opencv4/opencv2/core/cvstd.inl.hpp +include/opencv4/opencv2/core/cvstd_wrapper.hpp +include/opencv4/opencv2/core/detail/async_promise.hpp +include/opencv4/opencv2/core/detail/exception_ptr.hpp +include/opencv4/opencv2/core/directx.hpp +include/opencv4/opencv2/core/eigen.hpp +include/opencv4/opencv2/core/fast_math.hpp +include/opencv4/opencv2/core/hal/hal.hpp +include/opencv4/opencv2/core/hal/interface.h +include/opencv4/opencv2/core/hal/intrin.hpp +include/opencv4/opencv2/core/hal/intrin_avx.hpp +include/opencv4/opencv2/core/hal/intrin_avx512.hpp +include/opencv4/opencv2/core/hal/intrin_cpp.hpp +include/opencv4/opencv2/core/hal/intrin_forward.hpp +include/opencv4/opencv2/core/hal/intrin_msa.hpp +include/opencv4/opencv2/core/hal/intrin_neon.hpp +include/opencv4/opencv2/core/hal/intrin_rvv.hpp +include/opencv4/opencv2/core/hal/intrin_sse.hpp +include/opencv4/opencv2/core/hal/intrin_sse_em.hpp +include/opencv4/opencv2/core/hal/intrin_vsx.hpp +include/opencv4/opencv2/core/hal/intrin_wasm.hpp +include/opencv4/opencv2/core/hal/msa_macros.h +include/opencv4/opencv2/core/hal/simd_utils.impl.hpp +include/opencv4/opencv2/core/mat.hpp +include/opencv4/opencv2/core/mat.inl.hpp +include/opencv4/opencv2/core/matx.hpp +include/opencv4/opencv2/core/neon_utils.hpp +include/opencv4/opencv2/core/ocl.hpp +include/opencv4/opencv2/core/ocl_genbase.hpp +include/opencv4/opencv2/core/opencl/ocl_defs.hpp +include/opencv4/opencv2/core/opencl/opencl_info.hpp +include/opencv4/opencv2/core/opencl/opencl_svm.hpp +include/opencv4/opencv2/core/opencl/runtime/autogenerated/opencl_clamdblas.hpp +include/opencv4/opencv2/core/opencl/runtime/autogenerated/opencl_clamdfft.hpp +include/opencv4/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp +include/opencv4/opencv2/core/opencl/runtime/autogenerated/opencl_core_wrappers.hpp +include/opencv4/opencv2/core/opencl/runtime/autogenerated/opencl_gl.hpp +include/opencv4/opencv2/core/opencl/runtime/autogenerated/opencl_gl_wrappers.hpp +include/opencv4/opencv2/core/opencl/runtime/opencl_clamdblas.hpp +include/opencv4/opencv2/core/opencl/runtime/opencl_clamdfft.hpp +include/opencv4/opencv2/core/opencl/runtime/opencl_core.hpp +include/opencv4/opencv2/core/opencl/runtime/opencl_core_wrappers.hpp +include/opencv4/opencv2/core/opencl/runtime/opencl_gl.hpp +include/opencv4/opencv2/core/opencl/runtime/opencl_gl_wrappers.hpp +include/opencv4/opencv2/core/opencl/runtime/opencl_svm_20.hpp +include/opencv4/opencv2/core/opencl/runtime/opencl_svm_definitions.hpp +include/opencv4/opencv2/core/opencl/runtime/opencl_svm_hsa_extension.hpp +include/opencv4/opencv2/core/opengl.hpp +include/opencv4/opencv2/core/operations.hpp +include/opencv4/opencv2/core/optim.hpp +include/opencv4/opencv2/core/ovx.hpp +include/opencv4/opencv2/core/persistence.hpp +include/opencv4/opencv2/core/quaternion.hpp +include/opencv4/opencv2/core/quaternion.inl.hpp +include/opencv4/opencv2/core/saturate.hpp +include/opencv4/opencv2/core/simd_intrinsics.hpp +include/opencv4/opencv2/core/softfloat.hpp +include/opencv4/opencv2/core/sse_utils.hpp +include/opencv4/opencv2/core/traits.hpp +include/opencv4/opencv2/core/types.hpp +include/opencv4/opencv2/core/types_c.h +include/opencv4/opencv2/core/utility.hpp +include/opencv4/opencv2/core/utils/allocator_stats.hpp +include/opencv4/opencv2/core/utils/allocator_stats.impl.hpp +include/opencv4/opencv2/core/utils/filesystem.hpp +include/opencv4/opencv2/core/utils/instrumentation.hpp +include/opencv4/opencv2/core/utils/logger.defines.hpp +include/opencv4/opencv2/core/utils/logger.hpp +include/opencv4/opencv2/core/utils/logtag.hpp +include/opencv4/opencv2/core/utils/tls.hpp +include/opencv4/opencv2/core/utils/trace.hpp +include/opencv4/opencv2/core/va_intel.hpp +include/opencv4/opencv2/core/version.hpp +include/opencv4/opencv2/core/vsx_utils.hpp +include/opencv4/opencv2/core_detect.hpp +include/opencv4/opencv2/cvconfig.h +include/opencv4/opencv2/datasets/ar_hmdb.hpp +include/opencv4/opencv2/datasets/ar_sports.hpp +include/opencv4/opencv2/datasets/dataset.hpp +include/opencv4/opencv2/datasets/fr_adience.hpp +include/opencv4/opencv2/datasets/fr_lfw.hpp +include/opencv4/opencv2/datasets/gr_chalearn.hpp +include/opencv4/opencv2/datasets/gr_skig.hpp +include/opencv4/opencv2/datasets/hpe_humaneva.hpp +include/opencv4/opencv2/datasets/hpe_parse.hpp +include/opencv4/opencv2/datasets/ir_affine.hpp +include/opencv4/opencv2/datasets/ir_robot.hpp +include/opencv4/opencv2/datasets/is_bsds.hpp +include/opencv4/opencv2/datasets/is_weizmann.hpp +include/opencv4/opencv2/datasets/msm_epfl.hpp +include/opencv4/opencv2/datasets/msm_middlebury.hpp +include/opencv4/opencv2/datasets/or_imagenet.hpp +include/opencv4/opencv2/datasets/or_mnist.hpp +include/opencv4/opencv2/datasets/or_pascal.hpp +include/opencv4/opencv2/datasets/or_sun.hpp +include/opencv4/opencv2/datasets/pd_caltech.hpp +include/opencv4/opencv2/datasets/pd_inria.hpp +include/opencv4/opencv2/datasets/slam_kitti.hpp +include/opencv4/opencv2/datasets/slam_tumindoor.hpp +include/opencv4/opencv2/datasets/sr_bsds.hpp +include/opencv4/opencv2/datasets/sr_div2k.hpp +include/opencv4/opencv2/datasets/sr_general100.hpp +include/opencv4/opencv2/datasets/tr_chars.hpp +include/opencv4/opencv2/datasets/tr_icdar.hpp +include/opencv4/opencv2/datasets/tr_svt.hpp +include/opencv4/opencv2/datasets/track_alov.hpp +include/opencv4/opencv2/datasets/track_vot.hpp +include/opencv4/opencv2/datasets/util.hpp +include/opencv4/opencv2/dnn.hpp +include/opencv4/opencv2/dnn/all_layers.hpp +include/opencv4/opencv2/dnn/dict.hpp +include/opencv4/opencv2/dnn/dnn.hpp +include/opencv4/opencv2/dnn/dnn.inl.hpp +include/opencv4/opencv2/dnn/layer.details.hpp +include/opencv4/opencv2/dnn/layer.hpp +include/opencv4/opencv2/dnn/shape_utils.hpp +include/opencv4/opencv2/dnn/utils/inference_engine.hpp +include/opencv4/opencv2/dnn/version.hpp +include/opencv4/opencv2/dnn_superres.hpp +include/opencv4/opencv2/dpm.hpp +include/opencv4/opencv2/face.hpp +include/opencv4/opencv2/face/bif.hpp +include/opencv4/opencv2/face/face_alignment.hpp +include/opencv4/opencv2/face/facemark.hpp +include/opencv4/opencv2/face/facemarkAAM.hpp +include/opencv4/opencv2/face/facemarkLBF.hpp +include/opencv4/opencv2/face/facemark_train.hpp +include/opencv4/opencv2/face/facerec.hpp +include/opencv4/opencv2/face/mace.hpp +include/opencv4/opencv2/face/predict_collector.hpp +include/opencv4/opencv2/features2d.hpp +include/opencv4/opencv2/features2d/features2d.hpp +include/opencv4/opencv2/features2d/hal/interface.h +include/opencv4/opencv2/flann.hpp +include/opencv4/opencv2/flann/all_indices.h +include/opencv4/opencv2/flann/allocator.h +include/opencv4/opencv2/flann/any.h +include/opencv4/opencv2/flann/autotuned_index.h +include/opencv4/opencv2/flann/composite_index.h +include/opencv4/opencv2/flann/config.h +include/opencv4/opencv2/flann/defines.h +include/opencv4/opencv2/flann/dist.h +include/opencv4/opencv2/flann/dummy.h +include/opencv4/opencv2/flann/dynamic_bitset.h +include/opencv4/opencv2/flann/flann.hpp +include/opencv4/opencv2/flann/flann_base.hpp +include/opencv4/opencv2/flann/general.h +include/opencv4/opencv2/flann/ground_truth.h +include/opencv4/opencv2/flann/hdf5.h +include/opencv4/opencv2/flann/heap.h +include/opencv4/opencv2/flann/hierarchical_clustering_index.h +include/opencv4/opencv2/flann/index_testing.h +include/opencv4/opencv2/flann/kdtree_index.h +include/opencv4/opencv2/flann/kdtree_single_index.h +include/opencv4/opencv2/flann/kmeans_index.h +include/opencv4/opencv2/flann/linear_index.h +include/opencv4/opencv2/flann/logger.h +include/opencv4/opencv2/flann/lsh_index.h +include/opencv4/opencv2/flann/lsh_table.h +include/opencv4/opencv2/flann/matrix.h +include/opencv4/opencv2/flann/miniflann.hpp +include/opencv4/opencv2/flann/nn_index.h +include/opencv4/opencv2/flann/object_factory.h +include/opencv4/opencv2/flann/params.h +include/opencv4/opencv2/flann/random.h +include/opencv4/opencv2/flann/result_set.h +include/opencv4/opencv2/flann/sampling.h +include/opencv4/opencv2/flann/saving.h +include/opencv4/opencv2/flann/simplex_downhill.h +include/opencv4/opencv2/flann/timer.h +include/opencv4/opencv2/freetype.hpp +include/opencv4/opencv2/fuzzy.hpp +include/opencv4/opencv2/fuzzy/fuzzy_F0_math.hpp +include/opencv4/opencv2/fuzzy/fuzzy_F1_math.hpp +include/opencv4/opencv2/fuzzy/fuzzy_image.hpp +include/opencv4/opencv2/fuzzy/types.hpp +include/opencv4/opencv2/gapi.hpp +include/opencv4/opencv2/gapi/core.hpp +include/opencv4/opencv2/gapi/cpu/core.hpp +include/opencv4/opencv2/gapi/cpu/gcpukernel.hpp +include/opencv4/opencv2/gapi/cpu/imgproc.hpp +include/opencv4/opencv2/gapi/cpu/video.hpp +include/opencv4/opencv2/gapi/fluid/core.hpp +include/opencv4/opencv2/gapi/fluid/gfluidbuffer.hpp +include/opencv4/opencv2/gapi/fluid/gfluidkernel.hpp +include/opencv4/opencv2/gapi/fluid/imgproc.hpp +include/opencv4/opencv2/gapi/garg.hpp +include/opencv4/opencv2/gapi/garray.hpp +include/opencv4/opencv2/gapi/gasync_context.hpp +include/opencv4/opencv2/gapi/gcall.hpp +include/opencv4/opencv2/gapi/gcommon.hpp +include/opencv4/opencv2/gapi/gcompiled.hpp +include/opencv4/opencv2/gapi/gcompiled_async.hpp +include/opencv4/opencv2/gapi/gcompoundkernel.hpp +include/opencv4/opencv2/gapi/gcomputation.hpp +include/opencv4/opencv2/gapi/gcomputation_async.hpp +include/opencv4/opencv2/gapi/gframe.hpp +include/opencv4/opencv2/gapi/gkernel.hpp +include/opencv4/opencv2/gapi/gmat.hpp +include/opencv4/opencv2/gapi/gmetaarg.hpp +include/opencv4/opencv2/gapi/gopaque.hpp +include/opencv4/opencv2/gapi/gproto.hpp +include/opencv4/opencv2/gapi/gpu/core.hpp +include/opencv4/opencv2/gapi/gpu/ggpukernel.hpp +include/opencv4/opencv2/gapi/gpu/imgproc.hpp +include/opencv4/opencv2/gapi/gscalar.hpp +include/opencv4/opencv2/gapi/gstreaming.hpp +include/opencv4/opencv2/gapi/gtransform.hpp +include/opencv4/opencv2/gapi/gtype_traits.hpp +include/opencv4/opencv2/gapi/gtyped.hpp +include/opencv4/opencv2/gapi/imgproc.hpp +include/opencv4/opencv2/gapi/infer.hpp +include/opencv4/opencv2/gapi/infer/bindings_ie.hpp +include/opencv4/opencv2/gapi/infer/ie.hpp +include/opencv4/opencv2/gapi/infer/onnx.hpp +include/opencv4/opencv2/gapi/infer/parsers.hpp +include/opencv4/opencv2/gapi/media.hpp +include/opencv4/opencv2/gapi/ocl/core.hpp +include/opencv4/opencv2/gapi/ocl/goclkernel.hpp +include/opencv4/opencv2/gapi/ocl/imgproc.hpp +include/opencv4/opencv2/gapi/opencv_includes.hpp +include/opencv4/opencv2/gapi/operators.hpp +include/opencv4/opencv2/gapi/own/assert.hpp +include/opencv4/opencv2/gapi/own/convert.hpp +include/opencv4/opencv2/gapi/own/cvdefs.hpp +include/opencv4/opencv2/gapi/own/exports.hpp +include/opencv4/opencv2/gapi/own/mat.hpp +include/opencv4/opencv2/gapi/own/saturate.hpp +include/opencv4/opencv2/gapi/own/scalar.hpp +include/opencv4/opencv2/gapi/own/types.hpp +include/opencv4/opencv2/gapi/plaidml/core.hpp +include/opencv4/opencv2/gapi/plaidml/gplaidmlkernel.hpp +include/opencv4/opencv2/gapi/plaidml/plaidml.hpp +include/opencv4/opencv2/gapi/render.hpp +include/opencv4/opencv2/gapi/render/render.hpp +include/opencv4/opencv2/gapi/render/render_types.hpp +include/opencv4/opencv2/gapi/rmat.hpp +include/opencv4/opencv2/gapi/s11n.hpp +include/opencv4/opencv2/gapi/s11n/base.hpp +include/opencv4/opencv2/gapi/streaming/cap.hpp +include/opencv4/opencv2/gapi/streaming/desync.hpp +include/opencv4/opencv2/gapi/streaming/format.hpp +include/opencv4/opencv2/gapi/streaming/meta.hpp +include/opencv4/opencv2/gapi/streaming/source.hpp +include/opencv4/opencv2/gapi/util/any.hpp +include/opencv4/opencv2/gapi/util/compiler_hints.hpp +include/opencv4/opencv2/gapi/util/copy_through_move.hpp +include/opencv4/opencv2/gapi/util/optional.hpp +include/opencv4/opencv2/gapi/util/throw.hpp +include/opencv4/opencv2/gapi/util/type_traits.hpp +include/opencv4/opencv2/gapi/util/util.hpp +include/opencv4/opencv2/gapi/util/variant.hpp +include/opencv4/opencv2/gapi/video.hpp +include/opencv4/opencv2/hdf.hpp +include/opencv4/opencv2/hdf/hdf5.hpp +include/opencv4/opencv2/hfs.hpp +include/opencv4/opencv2/highgui.hpp +include/opencv4/opencv2/highgui/highgui.hpp +include/opencv4/opencv2/highgui/highgui_c.h +include/opencv4/opencv2/img_hash.hpp +include/opencv4/opencv2/img_hash/average_hash.hpp +include/opencv4/opencv2/img_hash/block_mean_hash.hpp +include/opencv4/opencv2/img_hash/color_moment_hash.hpp +include/opencv4/opencv2/img_hash/img_hash_base.hpp +include/opencv4/opencv2/img_hash/marr_hildreth_hash.hpp +include/opencv4/opencv2/img_hash/phash.hpp +include/opencv4/opencv2/img_hash/radial_variance_hash.hpp +include/opencv4/opencv2/imgcodecs.hpp +include/opencv4/opencv2/imgcodecs/imgcodecs.hpp +include/opencv4/opencv2/imgcodecs/imgcodecs_c.h +include/opencv4/opencv2/imgcodecs/ios.h +include/opencv4/opencv2/imgcodecs/legacy/constants_c.h +include/opencv4/opencv2/imgcodecs/macosx.h +include/opencv4/opencv2/imgproc.hpp +include/opencv4/opencv2/imgproc/detail/gcgraph.hpp +include/opencv4/opencv2/imgproc/hal/hal.hpp +include/opencv4/opencv2/imgproc/hal/interface.h +include/opencv4/opencv2/imgproc/imgproc.hpp +include/opencv4/opencv2/imgproc/imgproc_c.h +include/opencv4/opencv2/imgproc/types_c.h +include/opencv4/opencv2/intensity_transform.hpp +include/opencv4/opencv2/line_descriptor.hpp +include/opencv4/opencv2/line_descriptor/descriptor.hpp +include/opencv4/opencv2/mcc.hpp +include/opencv4/opencv2/mcc/ccm.hpp +include/opencv4/opencv2/mcc/checker_detector.hpp +include/opencv4/opencv2/mcc/checker_model.hpp +include/opencv4/opencv2/ml.hpp +include/opencv4/opencv2/ml/ml.hpp +include/opencv4/opencv2/ml/ml.inl.hpp +include/opencv4/opencv2/objdetect.hpp +include/opencv4/opencv2/objdetect/detection_based_tracker.hpp +include/opencv4/opencv2/objdetect/objdetect.hpp +include/opencv4/opencv2/opencv.hpp +include/opencv4/opencv2/opencv_modules.hpp +include/opencv4/opencv2/optflow.hpp +include/opencv4/opencv2/optflow/motempl.hpp +include/opencv4/opencv2/optflow/pcaflow.hpp +include/opencv4/opencv2/optflow/rlofflow.hpp +include/opencv4/opencv2/optflow/sparse_matching_gpc.hpp +include/opencv4/opencv2/phase_unwrapping.hpp +include/opencv4/opencv2/phase_unwrapping/histogramphaseunwrapping.hpp +include/opencv4/opencv2/phase_unwrapping/phase_unwrapping.hpp +include/opencv4/opencv2/photo.hpp +include/opencv4/opencv2/photo/cuda.hpp +include/opencv4/opencv2/photo/legacy/constants_c.h +include/opencv4/opencv2/photo/photo.hpp +include/opencv4/opencv2/plot.hpp +include/opencv4/opencv2/quality.hpp +include/opencv4/opencv2/quality/quality_utils.hpp +include/opencv4/opencv2/quality/qualitybase.hpp +include/opencv4/opencv2/quality/qualitybrisque.hpp +include/opencv4/opencv2/quality/qualitygmsd.hpp +include/opencv4/opencv2/quality/qualitymse.hpp +include/opencv4/opencv2/quality/qualitypsnr.hpp +include/opencv4/opencv2/quality/qualityssim.hpp +include/opencv4/opencv2/rapid.hpp +include/opencv4/opencv2/reg/map.hpp +include/opencv4/opencv2/reg/mapaffine.hpp +include/opencv4/opencv2/reg/mapper.hpp +include/opencv4/opencv2/reg/mappergradaffine.hpp +include/opencv4/opencv2/reg/mappergradeuclid.hpp +include/opencv4/opencv2/reg/mappergradproj.hpp +include/opencv4/opencv2/reg/mappergradshift.hpp +include/opencv4/opencv2/reg/mappergradsimilar.hpp +include/opencv4/opencv2/reg/mapperpyramid.hpp +include/opencv4/opencv2/reg/mapprojec.hpp +include/opencv4/opencv2/reg/mapshift.hpp +include/opencv4/opencv2/rgbd.hpp +include/opencv4/opencv2/rgbd/depth.hpp +include/opencv4/opencv2/rgbd/dynafu.hpp +include/opencv4/opencv2/rgbd/intrinsics.hpp +include/opencv4/opencv2/rgbd/kinfu.hpp +include/opencv4/opencv2/rgbd/large_kinfu.hpp +include/opencv4/opencv2/rgbd/linemod.hpp +include/opencv4/opencv2/rgbd/volume.hpp +include/opencv4/opencv2/saliency.hpp +include/opencv4/opencv2/saliency/saliencyBaseClasses.hpp +include/opencv4/opencv2/saliency/saliencySpecializedClasses.hpp +include/opencv4/opencv2/sfm.hpp +include/opencv4/opencv2/sfm/conditioning.hpp +include/opencv4/opencv2/sfm/fundamental.hpp +include/opencv4/opencv2/sfm/io.hpp +include/opencv4/opencv2/sfm/numeric.hpp +include/opencv4/opencv2/sfm/projection.hpp +include/opencv4/opencv2/sfm/reconstruct.hpp +include/opencv4/opencv2/sfm/robust.hpp +include/opencv4/opencv2/sfm/simple_pipeline.hpp +include/opencv4/opencv2/sfm/triangulation.hpp +include/opencv4/opencv2/shape.hpp +include/opencv4/opencv2/shape/emdL1.hpp +include/opencv4/opencv2/shape/hist_cost.hpp +include/opencv4/opencv2/shape/shape.hpp +include/opencv4/opencv2/shape/shape_distance.hpp +include/opencv4/opencv2/shape/shape_transformer.hpp +include/opencv4/opencv2/stereo.hpp +include/opencv4/opencv2/stereo/descriptor.hpp +include/opencv4/opencv2/stereo/quasi_dense_stereo.hpp +include/opencv4/opencv2/stereo/stereo.hpp +include/opencv4/opencv2/stitching.hpp +include/opencv4/opencv2/stitching/detail/autocalib.hpp +include/opencv4/opencv2/stitching/detail/blenders.hpp +include/opencv4/opencv2/stitching/detail/camera.hpp +include/opencv4/opencv2/stitching/detail/exposure_compensate.hpp +include/opencv4/opencv2/stitching/detail/matchers.hpp +include/opencv4/opencv2/stitching/detail/motion_estimators.hpp +include/opencv4/opencv2/stitching/detail/seam_finders.hpp +include/opencv4/opencv2/stitching/detail/timelapsers.hpp +include/opencv4/opencv2/stitching/detail/util.hpp +include/opencv4/opencv2/stitching/detail/util_inl.hpp +include/opencv4/opencv2/stitching/detail/warpers.hpp +include/opencv4/opencv2/stitching/detail/warpers_inl.hpp +include/opencv4/opencv2/stitching/warpers.hpp +include/opencv4/opencv2/structured_light.hpp +include/opencv4/opencv2/structured_light/graycodepattern.hpp +include/opencv4/opencv2/structured_light/sinusoidalpattern.hpp +include/opencv4/opencv2/structured_light/structured_light.hpp +include/opencv4/opencv2/superres.hpp +include/opencv4/opencv2/superres/optical_flow.hpp +include/opencv4/opencv2/surface_matching.hpp +include/opencv4/opencv2/surface_matching/icp.hpp +include/opencv4/opencv2/surface_matching/pose_3d.hpp +include/opencv4/opencv2/surface_matching/ppf_helpers.hpp +include/opencv4/opencv2/surface_matching/ppf_match_3d.hpp +include/opencv4/opencv2/surface_matching/t_hash_int.hpp +include/opencv4/opencv2/text.hpp +include/opencv4/opencv2/text/erfilter.hpp +include/opencv4/opencv2/text/ocr.hpp +include/opencv4/opencv2/text/swt_text_detection.hpp +include/opencv4/opencv2/text/textDetector.hpp +include/opencv4/opencv2/tracking.hpp +include/opencv4/opencv2/tracking/feature.hpp +include/opencv4/opencv2/tracking/kalman_filters.hpp +include/opencv4/opencv2/tracking/onlineBoosting.hpp +include/opencv4/opencv2/tracking/tldDataset.hpp +include/opencv4/opencv2/tracking/tracking.hpp +include/opencv4/opencv2/tracking/tracking_by_matching.hpp +include/opencv4/opencv2/tracking/tracking_internals.hpp +include/opencv4/opencv2/tracking/tracking_legacy.hpp +include/opencv4/opencv2/video.hpp +include/opencv4/opencv2/video/background_segm.hpp +include/opencv4/opencv2/video/legacy/constants_c.h +include/opencv4/opencv2/video/tracking.hpp +include/opencv4/opencv2/video/video.hpp +include/opencv4/opencv2/videoio.hpp +include/opencv4/opencv2/videoio/cap_ios.h +include/opencv4/opencv2/videoio/legacy/constants_c.h +include/opencv4/opencv2/videoio/registry.hpp +include/opencv4/opencv2/videoio/videoio.hpp +include/opencv4/opencv2/videoio/videoio_c.h +include/opencv4/opencv2/videostab.hpp +include/opencv4/opencv2/videostab/deblurring.hpp +include/opencv4/opencv2/videostab/fast_marching.hpp +include/opencv4/opencv2/videostab/fast_marching_inl.hpp +include/opencv4/opencv2/videostab/frame_source.hpp +include/opencv4/opencv2/videostab/global_motion.hpp +include/opencv4/opencv2/videostab/inpainting.hpp +include/opencv4/opencv2/videostab/log.hpp +include/opencv4/opencv2/videostab/motion_core.hpp +include/opencv4/opencv2/videostab/motion_stabilizing.hpp +include/opencv4/opencv2/videostab/optical_flow.hpp +include/opencv4/opencv2/videostab/outlier_rejection.hpp +include/opencv4/opencv2/videostab/ring_buffer.hpp +include/opencv4/opencv2/videostab/stabilizer.hpp +include/opencv4/opencv2/videostab/wobble_suppression.hpp +include/opencv4/opencv2/xfeatures2d.hpp +include/opencv4/opencv2/xfeatures2d/cuda.hpp +include/opencv4/opencv2/xfeatures2d/nonfree.hpp +include/opencv4/opencv2/ximgproc.hpp +include/opencv4/opencv2/ximgproc/brightedges.hpp +include/opencv4/opencv2/ximgproc/color_match.hpp +include/opencv4/opencv2/ximgproc/deriche_filter.hpp +include/opencv4/opencv2/ximgproc/disparity_filter.hpp +include/opencv4/opencv2/ximgproc/edge_filter.hpp +include/opencv4/opencv2/ximgproc/edgeboxes.hpp +include/opencv4/opencv2/ximgproc/edgepreserving_filter.hpp +include/opencv4/opencv2/ximgproc/estimated_covariance.hpp +include/opencv4/opencv2/ximgproc/fast_hough_transform.hpp +include/opencv4/opencv2/ximgproc/fast_line_detector.hpp +include/opencv4/opencv2/ximgproc/fourier_descriptors.hpp +include/opencv4/opencv2/ximgproc/lsc.hpp +include/opencv4/opencv2/ximgproc/paillou_filter.hpp +include/opencv4/opencv2/ximgproc/peilin.hpp +include/opencv4/opencv2/ximgproc/ridgefilter.hpp +include/opencv4/opencv2/ximgproc/run_length_morphology.hpp +include/opencv4/opencv2/ximgproc/seeds.hpp +include/opencv4/opencv2/ximgproc/segmentation.hpp +include/opencv4/opencv2/ximgproc/slic.hpp +include/opencv4/opencv2/ximgproc/sparse_match_interpolator.hpp +include/opencv4/opencv2/ximgproc/structured_edge_detection.hpp +include/opencv4/opencv2/ximgproc/weighted_median_filter.hpp +include/opencv4/opencv2/xobjdetect.hpp +include/opencv4/opencv2/xphoto.hpp +include/opencv4/opencv2/xphoto/bm3d_image_denoising.hpp +include/opencv4/opencv2/xphoto/dct_image_denoising.hpp +include/opencv4/opencv2/xphoto/inpainting.hpp +include/opencv4/opencv2/xphoto/oilpainting.hpp +include/opencv4/opencv2/xphoto/tonemap.hpp +include/opencv4/opencv2/xphoto/white_balance.hpp +lib/cmake/opencv4/OpenCVConfig-version.cmake +lib/cmake/opencv4/OpenCVConfig.cmake +lib/cmake/opencv4/OpenCVModules-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/opencv4/OpenCVModules.cmake +lib/libopencv_alphamat.so +lib/libopencv_alphamat.so.4.5 +lib/libopencv_alphamat.so.4.5.1 +lib/libopencv_aruco.so +lib/libopencv_aruco.so.4.5 +lib/libopencv_aruco.so.4.5.1 +lib/libopencv_bgsegm.so +lib/libopencv_bgsegm.so.4.5 +lib/libopencv_bgsegm.so.4.5.1 +lib/libopencv_bioinspired.so +lib/libopencv_bioinspired.so.4.5 +lib/libopencv_bioinspired.so.4.5.1 lib/libopencv_calib3d.so -lib/libopencv_calib3d.so.%%SOVERSION%% -lib/libopencv_calib3d.so.%%VERSION%% +lib/libopencv_calib3d.so.4.5 +lib/libopencv_calib3d.so.4.5.1 +lib/libopencv_ccalib.so +lib/libopencv_ccalib.so.4.5 +lib/libopencv_ccalib.so.4.5.1 +lib/libopencv_core.so +lib/libopencv_core.so.4.5 +lib/libopencv_core.so.4.5.1 +lib/libopencv_datasets.so +lib/libopencv_datasets.so.4.5 +lib/libopencv_datasets.so.4.5.1 +lib/libopencv_dnn.so +lib/libopencv_dnn.so.4.5 +lib/libopencv_dnn.so.4.5.1 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_dnn_objdetect.so.4.5 +lib/libopencv_dnn_objdetect.so.4.5.1 +lib/libopencv_dnn_superres.so +lib/libopencv_dnn_superres.so.4.5 +lib/libopencv_dnn_superres.so.4.5.1 +lib/libopencv_dpm.so +lib/libopencv_dpm.so.4.5 +lib/libopencv_dpm.so.4.5.1 +lib/libopencv_face.so +lib/libopencv_face.so.4.5 +lib/libopencv_face.so.4.5.1 lib/libopencv_features2d.so -lib/libopencv_features2d.so.%%SOVERSION%% -lib/libopencv_features2d.so.%%VERSION%% +lib/libopencv_features2d.so.4.5 +lib/libopencv_features2d.so.4.5.1 lib/libopencv_flann.so -lib/libopencv_flann.so.%%SOVERSION%% -lib/libopencv_flann.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_flann.so.4.5 +lib/libopencv_flann.so.4.5.1 +lib/libopencv_freetype.so +lib/libopencv_freetype.so.4.5 +lib/libopencv_freetype.so.4.5.1 +lib/libopencv_fuzzy.so +lib/libopencv_fuzzy.so.4.5 +lib/libopencv_fuzzy.so.4.5.1 +lib/libopencv_gapi.so +lib/libopencv_gapi.so.4.5 +lib/libopencv_gapi.so.4.5.1 +lib/libopencv_hdf.so +lib/libopencv_hdf.so.4.5 +lib/libopencv_hdf.so.4.5.1 lib/libopencv_hfs.so -lib/libopencv_hfs.so.%%SOVERSION%% -lib/libopencv_hfs.so.%%VERSION%% +lib/libopencv_hfs.so.4.5 +lib/libopencv_hfs.so.4.5.1 lib/libopencv_highgui.so -lib/libopencv_highgui.so.%%SOVERSION%% -lib/libopencv_highgui.so.%%VERSION%% -include/opencv2/imgcodecs.hpp -include/opencv2/imgcodecs/imgcodecs.hpp -include/opencv2/imgcodecs/imgcodecs_c.h -include/opencv2/imgcodecs/ios.h -include/opencv2/img_hash.hpp -include/opencv2/img_hash/average_hash.hpp -include/opencv2/img_hash/block_mean_hash.hpp -include/opencv2/img_hash/color_moment_hash.hpp -include/opencv2/img_hash/img_hash_base.hpp -include/opencv2/img_hash/marr_hildreth_hash.hpp -include/opencv2/img_hash/phash.hpp -include/opencv2/img_hash/radial_variance_hash.hpp -lib/libopencv_imgcodecs.so -lib/libopencv_imgcodecs.so.%%SOVERSION%% -lib/libopencv_imgcodecs.so.%%VERSION%% +lib/libopencv_highgui.so.4.5 +lib/libopencv_highgui.so.4.5.1 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_img_hash.so.4.5 +lib/libopencv_img_hash.so.4.5.1 +lib/libopencv_imgcodecs.so +lib/libopencv_imgcodecs.so.4.5 +lib/libopencv_imgcodecs.so.4.5.1 +lib/libopencv_imgproc.so +lib/libopencv_imgproc.so.4.5 +lib/libopencv_imgproc.so.4.5.1 +lib/libopencv_intensity_transform.so +lib/libopencv_intensity_transform.so.4.5 +lib/libopencv_intensity_transform.so.4.5.1 +lib/libopencv_line_descriptor.so +lib/libopencv_line_descriptor.so.4.5 +lib/libopencv_line_descriptor.so.4.5.1 +lib/libopencv_mcc.so +lib/libopencv_mcc.so.4.5 +lib/libopencv_mcc.so.4.5.1 lib/libopencv_ml.so -lib/libopencv_ml.so.%%SOVERSION%% -lib/libopencv_ml.so.%%VERSION%% +lib/libopencv_ml.so.4.5 +lib/libopencv_ml.so.4.5.1 lib/libopencv_objdetect.so -lib/libopencv_objdetect.so.%%SOVERSION%% -lib/libopencv_objdetect.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_objdetect.so.4.5 +lib/libopencv_objdetect.so.4.5.1 +lib/libopencv_optflow.so +lib/libopencv_optflow.so.4.5 +lib/libopencv_optflow.so.4.5.1 +lib/libopencv_phase_unwrapping.so +lib/libopencv_phase_unwrapping.so.4.5 +lib/libopencv_phase_unwrapping.so.4.5.1 lib/libopencv_photo.so -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_photo.so.4.5 +lib/libopencv_photo.so.4.5.1 +lib/libopencv_plot.so +lib/libopencv_plot.so.4.5 +lib/libopencv_plot.so.4.5.1 +lib/libopencv_quality.so +lib/libopencv_quality.so.4.5 +lib/libopencv_quality.so.4.5.1 +lib/libopencv_rapid.so +lib/libopencv_rapid.so.4.5 +lib/libopencv_rapid.so.4.5.1 +lib/libopencv_reg.so +lib/libopencv_reg.so.4.5 +lib/libopencv_reg.so.4.5.1 +lib/libopencv_rgbd.so +lib/libopencv_rgbd.so.4.5 +lib/libopencv_rgbd.so.4.5.1 +lib/libopencv_saliency.so +lib/libopencv_saliency.so.4.5 +lib/libopencv_saliency.so.4.5.1 +lib/libopencv_sfm.so +lib/libopencv_sfm.so.4.5 +lib/libopencv_sfm.so.4.5.1 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_shape.so.4.5 +lib/libopencv_shape.so.4.5.1 +lib/libopencv_stereo.so +lib/libopencv_stereo.so.4.5 +lib/libopencv_stereo.so.4.5.1 lib/libopencv_stitching.so -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_stitching.so.4.5 +lib/libopencv_stitching.so.4.5.1 +lib/libopencv_structured_light.so +lib/libopencv_structured_light.so.4.5 +lib/libopencv_structured_light.so.4.5.1 lib/libopencv_superres.so -lib/libopencv_superres.so.%%SOVERSION%% -lib/libopencv_superres.so.%%VERSION%% -%%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_superres.so.4.5 +lib/libopencv_superres.so.4.5.1 +lib/libopencv_surface_matching.so +lib/libopencv_surface_matching.so.4.5 +lib/libopencv_surface_matching.so.4.5.1 +lib/libopencv_text.so +lib/libopencv_text.so.4.5 +lib/libopencv_text.so.4.5.1 +lib/libopencv_tracking.so +lib/libopencv_tracking.so.4.5 +lib/libopencv_tracking.so.4.5.1 lib/libopencv_video.so -lib/libopencv_video.so.%%SOVERSION%% -lib/libopencv_video.so.%%VERSION%% +lib/libopencv_video.so.4.5 +lib/libopencv_video.so.4.5.1 lib/libopencv_videoio.so -lib/libopencv_videoio.so.%%SOVERSION%% -lib/libopencv_videoio.so.%%VERSION%% +lib/libopencv_videoio.so.4.5 +lib/libopencv_videoio.so.4.5.1 lib/libopencv_videostab.so -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 -%%DATADIR%%/OpenCVModules.cmake +lib/libopencv_videostab.so.4.5 +lib/libopencv_videostab.so.4.5.1 +lib/libopencv_xfeatures2d.so +lib/libopencv_xfeatures2d.so.4.5 +lib/libopencv_xfeatures2d.so.4.5.1 +lib/libopencv_ximgproc.so +lib/libopencv_ximgproc.so.4.5 +lib/libopencv_ximgproc.so.4.5.1 +lib/libopencv_xobjdetect.so +lib/libopencv_xobjdetect.so.4.5 +lib/libopencv_xobjdetect.so.4.5.1 +lib/libopencv_xphoto.so +lib/libopencv_xphoto.so.4.5 +lib/libopencv_xphoto.so.4.5.1 +lib/opencv4/3rdparty/libcorrespondence.a +lib/opencv4/3rdparty/libmultiview.a +lib/opencv4/3rdparty/libnumeric.a +libdata/pkgconfig/opencv4.pc %%DATADIR%%/haarcascades/haarcascade_eye.xml %%DATADIR%%/haarcascades/haarcascade_eye_tree_eyeglasses.xml %%DATADIR%%/haarcascades/haarcascade_frontalcatface.xml @@ -462,514 +718,15 @@ libdata/pkgconfig/opencv.pc %%DATADIR%%/lbpcascades/lbpcascade_frontalface_improved.xml %%DATADIR%%/lbpcascades/lbpcascade_profileface.xml %%DATADIR%%/lbpcascades/lbpcascade_silverware.xml +%%DATADIR%%/quality/brisque_model_live.yml +%%DATADIR%%/quality/brisque_range_live.yml %%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 +%%JAVA%%share/java/opencv4/libopencv_java451.so +%%JAVA%%share/java/opencv4/opencv-451.jar +%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/__init__.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/config-%%PYTHON_VER%%.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/config.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/load_config_py2.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/load_config_py3.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/python-%%PYTHON_VER%%/cv2.so diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile index fe2af4515501..d05aa1d2855d 100644 --- a/graphics/openimageio/Makefile +++ b/graphics/openimageio/Makefile @@ -8,7 +8,7 @@ DISTVERSION= 2.2.10.1 # py-openimageio's PORTREVISION. # Also, just to be on the safe side, when resetting, # best keep PORTREVISION?= 0. -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= graphics multimedia MAINTAINER?= FreeBSD@Shaneware.biz @@ -72,7 +72,7 @@ OCIO_LIB_DEPENDS= libOpenColorIO.so:graphics/opencolorio OPENCV_CMAKE_BOOL= USE_OPENCV OPENCV_LIB_DEPENDS= libopencv_highgui.so:graphics/opencv \ - libopencv_core.so:graphics/opencv-core \ + libopencv_core.so:graphics/opencv \ libopenjpeg.so:graphics/openjpeg15 OPENJPEG_CMAKE_BOOL= USE_OPENJPEG diff --git a/graphics/p5-Image-ObjectDetect/Makefile b/graphics/p5-Image-ObjectDetect/Makefile index 7e525901f8e1..31fd5f4bb04c 100644 --- a/graphics/p5-Image-ObjectDetect/Makefile +++ b/graphics/p5-Image-ObjectDetect/Makefile @@ -3,7 +3,7 @@ PORTNAME= Image-ObjectDetect PORTVERSION= 0.12 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -14,6 +14,8 @@ COMMENT= Detects objects from picture using opencv LICENSE= ART10 GPLv1+ LICENSE_COMB= dual +BROKEN= OpenCV4 no longer ships OpencCV-1.0 headers + BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/opencv.pc:graphics/opencv diff --git a/graphics/pfstools/Makefile b/graphics/pfstools/Makefile index 68b6e374d236..f3769651e784 100644 --- a/graphics/pfstools/Makefile +++ b/graphics/pfstools/Makefile @@ -3,7 +3,7 @@ PORTNAME= pfstools DISTVERSION= 2.1.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= SF diff --git a/graphics/php-facedetect/Makefile b/graphics/php-facedetect/Makefile index a71e8e22d301..49118da38e23 100644 --- a/graphics/php-facedetect/Makefile +++ b/graphics/php-facedetect/Makefile @@ -3,7 +3,7 @@ PORTNAME= facedetect PORTVERSION= 1.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} diff --git a/graphics/py-opencv/Makefile b/graphics/py-opencv/Makefile deleted file mode 100644 index cbf57d6b2a48..000000000000 --- a/graphics/py-opencv/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# Created by: Martin Matuska -# $FreeBSD$ - -PORTREVISION= 7 -CATEGORIES= graphics python -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} - -COMMENT= OpenCV Python library - -BROKEN_armv7= fails to build: make[1]: cannot open Makefile - -OCV_SLAVE= python -OCV_PYTHON= yes -MASTERDIR= ${.CURDIR:H}/opencv -PLIST= ${.CURDIR}/pkg-plist - -.include "${MASTERDIR}/Makefile" diff --git a/graphics/py-opencv/pkg-plist b/graphics/py-opencv/pkg-plist deleted file mode 100644 index e76110b9282f..000000000000 --- a/graphics/py-opencv/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -%%PYTHON_SITELIBDIR%%/cv2.so diff --git a/graphics/rubygem-objectdetect/Makefile b/graphics/rubygem-objectdetect/Makefile index 1a4b14493c93..9383177345de 100644 --- a/graphics/rubygem-objectdetect/Makefile +++ b/graphics/rubygem-objectdetect/Makefile @@ -3,7 +3,7 @@ PORTNAME= objectdetect PORTVERSION= 0.0.3 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics rubygems MASTER_SITES= RG @@ -12,6 +12,8 @@ COMMENT= Simple library for detecting objects in pictures LICENSE= MIT +BROKEN= OpenCV4 no longer ships OpencCV-1.0 headers + LIB_DEPENDS= libopencv_video.so:graphics/opencv USE_RUBY= yes diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile index 2b5266d590ec..48aa58e17e0f 100644 --- a/graphics/shotwell/Makefile +++ b/graphics/shotwell/Makefile @@ -3,7 +3,7 @@ PORTNAME= shotwell PORTVERSION= 0.30.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics gnome MASTER_SITES= GNOME @@ -57,7 +57,7 @@ OPENMP_DESC= libraw uses OpenMP (implies GCC) FACED_CONFIGURE_ON= -Dface-detection=true FACED_CONFIGURE_OFF= -Dface-detection=false -FACED_LIB_DEPENDS= libopencv_core.so:graphics/opencv-core \ +FACED_LIB_DEPENDS= libopencv_core.so:graphics/opencv \ libopencv_photo.so:graphics/opencv OPENMP_USES= compiler:openmp OPENMP_USES_OFF= compiler:c++11-lib diff --git a/graphics/waifu2x-converter-cpp/Makefile b/graphics/waifu2x-converter-cpp/Makefile index d220b1ac4ace..15281dbab84e 100644 --- a/graphics/waifu2x-converter-cpp/Makefile +++ b/graphics/waifu2x-converter-cpp/Makefile @@ -3,6 +3,7 @@ PORTNAME= waifu2x-converter-cpp DISTVERSIONPREFIX= v DISTVERSION= 5.3.4 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org @@ -14,10 +15,9 @@ LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/include/picojson_LICENSE.txt LICENSE_FILE_MIT= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/include/CL/opencl.h:devel/opencl -LIB_DEPENDS= libopencv_imgcodecs.so:graphics/opencv \ - libopencv_imgproc.so:graphics/opencv-core +LIB_DEPENDS= libopencv_imgcodecs.so:graphics/opencv -USES= cmake compiler:c++17-lang +USES= cmake compiler:c++17-lang localbase:ldflags USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= DeadSix27 diff --git a/graphics/yafaray/Makefile b/graphics/yafaray/Makefile index e6abe08423ea..d6261de39469 100644 --- a/graphics/yafaray/Makefile +++ b/graphics/yafaray/Makefile @@ -4,7 +4,7 @@ PORTNAME= yafaray DISTVERSIONPREFIX= v DISTVERSION= 3.5.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org @@ -23,7 +23,7 @@ LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libHalf.so:graphics/ilmbase \ libIlmImf.so:graphics/openexr \ libopencv_photo.so:graphics/opencv \ - libopencv_core.so:graphics/opencv-core \ + libopencv_core.so:graphics/opencv \ libpng.so:graphics/png \ libtiff.so:graphics/tiff diff --git a/math/saga/Makefile b/math/saga/Makefile index 03380e244231..56cbe44a035e 100644 --- a/math/saga/Makefile +++ b/math/saga/Makefile @@ -3,6 +3,7 @@ PORTNAME= saga PORTVERSION= 7.9.0 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION} @@ -21,8 +22,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libjasper.so:graphics/jasper \ liblas12.so:devel/liblas12 \ libodbc.so:databases/unixODBC \ - libopencv_core.so:graphics/opencv-core \ - libopencv_ml.so:graphics/opencv \ + libopencv_core.so:graphics/opencv \ libpdal_base.so:math/pdal \ libproj.so:graphics/proj \ libsvm.so:science/libsvm \ diff --git a/math/saga/files/patch-src_tools_imagery_imagery__opencv_Makefile.am b/math/saga/files/patch-src_tools_imagery_imagery__opencv_Makefile.am deleted file mode 100644 index 2a6c505a52e0..000000000000 --- a/math/saga/files/patch-src_tools_imagery_imagery__opencv_Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ ---- src/tools/imagery/imagery_opencv/Makefile.am.orig 2020-09-28 15:32:31 UTC -+++ src/tools/imagery/imagery_opencv/Makefile.am -@@ -7,9 +7,9 @@ endif - - if HAVE_CV - DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD --CXX_INCS = -I$(top_srcdir)/src/saga_core `pkg-config opencv4 --cflags` -+CXX_INCS = -I$(top_srcdir)/src/saga_core `pkg-config opencv --cflags` - AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS) --AM_LDFLAGS = -fPIC -shared -avoid-version `pkg-config opencv4 --libs` -+AM_LDFLAGS = -fPIC -shared -avoid-version `pkg-config opencv --libs` - pkglib_LTLIBRARIES = libimagery_opencv.la - libimagery_opencv_la_SOURCES =\ - MLB_Interface.cpp\ diff --git a/misc/actiona/Makefile b/misc/actiona/Makefile index ea489233b63a..eb1df0c03d04 100644 --- a/misc/actiona/Makefile +++ b/misc/actiona/Makefile @@ -3,6 +3,7 @@ PORTNAME= actiona DISTVERSIONPREFIX= v DISTVERSION= 3.10.1 +PORTREVISION= 1 CATEGORIES= misc MAINTAINER= yuri@FreeBSD.org @@ -13,8 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/include/boost/property_tree/ini_parser.hpp:devel/boost-libs LIB_DEPENDS= libnotify.so:devel/libnotify \ - libopencv_core.so:graphics/opencv-core \ - libopencv_video.so:graphics/opencv + libopencv_core.so:graphics/opencv USES= compiler:c++11-lang desktop-file-utils gl pkgconfig qmake \ gnome qt:5 shared-mime-info xorg @@ -26,6 +26,8 @@ USE_GNOME= gdkpixbuf2 glib20 USE_GL= gl USE_XORG= x11 xtst +QMAKE_ARGS= PKGCONFIG_OPENCV=opencv4 + OPTIONS_DEFINE= NLS OPTIONS_SUB= yes diff --git a/misc/darknet/Makefile b/misc/darknet/Makefile index 95bb701a7b78..8d899b6db5af 100644 --- a/misc/darknet/Makefile +++ b/misc/darknet/Makefile @@ -2,6 +2,7 @@ PORTNAME= darknet PORTVERSION= 3.20200507 # the upstream doesn't maintain a meaningful versioning schema, so have to use a date here +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= misc # machine-learning @@ -38,7 +39,7 @@ OPTIONS_DEFAULT_i386= SSE2 OPENCV_USES= pkgconfig OPENCV_CMAKE_BOOL= ENABLE_OPENCV OPENCV_LIB_DEPENDS= libopencv_video.so:graphics/opencv \ - libopencv_core.so:graphics/opencv-core + libopencv_core.so:graphics/opencv SSE2_DESC= Use SSE2 instructions SSE2_CMAKE_ON= -DFREEBSD_SIMD="-msse2" diff --git a/misc/mxnet/Makefile b/misc/mxnet/Makefile index bc14e1ebbe6b..e9b83a313042 100644 --- a/misc/mxnet/Makefile +++ b/misc/mxnet/Makefile @@ -2,7 +2,7 @@ PORTNAME= mxnet DISTVERSION= 1.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc # machine-learning MAINTAINER= yuri@FreeBSD.org @@ -39,7 +39,7 @@ CPP_USES= python:build CPP_VARS= BINARY_ALIAS=python=${PYTHON_CMD} OPENCV_CMAKE_BOOL= USE_OPENCV -OPENCV_LIB_DEPENDS= libopencv_core.so:graphics/opencv-core \ +OPENCV_LIB_DEPENDS= libopencv_core.so:graphics/opencv \ libopencv_videoio.so:graphics/opencv .include diff --git a/misc/visp/Makefile b/misc/visp/Makefile index 42306533d1a3..bd481d53260c 100644 --- a/misc/visp/Makefile +++ b/misc/visp/Makefile @@ -2,7 +2,7 @@ PORTNAME= visp DISTVERSION= 3.3.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= misc MASTER_SITES= http://gforge.inria.fr/frs/download.php/latestfile/475/ @@ -19,7 +19,7 @@ LIB_DEPENDS= libblas.so:math/blas \ libgsl.so:math/gsl \ liblapack.so:math/lapack \ libopenblas.so:math/openblas \ - libopencv_core.so:graphics/opencv-core \ + libopencv_core.so:graphics/opencv \ libopencv_videoio.so:graphics/opencv \ libpcl_common.so:graphics/pcl-pointclouds \ libqhull.so:math/qhull \ diff --git a/misc/visp/files/patch-modules_vision_src_key-point_vpKeyPoint.cpp b/misc/visp/files/patch-modules_vision_src_key-point_vpKeyPoint.cpp new file mode 100644 index 000000000000..958b9f6b764c --- /dev/null +++ b/misc/visp/files/patch-modules_vision_src_key-point_vpKeyPoint.cpp @@ -0,0 +1,20 @@ +--- modules/vision/src/key-point/vpKeyPoint.cpp.orig 2021-01-30 15:50:44 UTC ++++ modules/vision/src/key-point/vpKeyPoint.cpp +@@ -2269,7 +2269,7 @@ void vpKeyPoint::initDetector(const std::string &detec + + if (detectorNameTmp == "SIFT") { + #ifdef VISP_HAVE_OPENCV_XFEATURES2D +- cv::Ptr siftDetector = cv::xfeatures2d::SIFT::create(); ++ cv::Ptr siftDetector = cv::SIFT::create(); + if (!usePyramid) { + m_detectors[detectorNameTmp] = siftDetector; + } else { +@@ -2447,7 +2447,7 @@ void vpKeyPoint::initExtractor(const std::string &extr + #else + if (extractorName == "SIFT") { + #ifdef VISP_HAVE_OPENCV_XFEATURES2D +- m_extractors[extractorName] = cv::xfeatures2d::SIFT::create(); ++ m_extractors[extractorName] = cv::SIFT::create(); + #else + std::stringstream ss_msg; + ss_msg << "Fail to initialize the extractor: SIFT. OpenCV version " << std::hex << VISP_HAVE_OPENCV_VERSION diff --git a/multimedia/ccextractor/Makefile b/multimedia/ccextractor/Makefile index fc937324c57d..4a3f6915cb96 100644 --- a/multimedia/ccextractor/Makefile +++ b/multimedia/ccextractor/Makefile @@ -3,7 +3,7 @@ PORTNAME= ccextractor DISTVERSIONPREFIX= v DISTVERSION= 0.85 -PORTREVISION= 19 +PORTREVISION= 20 CATEGORIES= multimedia MAINTAINER= oz@nixil.net @@ -16,7 +16,7 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libgmp.so:math/gmp \ libgnutls.so:security/gnutls \ libogg.so:audio/libogg \ - libopencv_core.so:graphics/opencv-core \ + libopencv_core.so:graphics/opencv \ libpng.so:graphics/png \ libschroedinger-1.0.so:multimedia/schroedinger \ libtheoraenc.so:multimedia/libtheora \ diff --git a/multimedia/chilitags/Makefile b/multimedia/chilitags/Makefile index 3f704d28d834..9615c13790d4 100644 --- a/multimedia/chilitags/Makefile +++ b/multimedia/chilitags/Makefile @@ -3,7 +3,7 @@ PORTNAME= chilitags DISTVERSION= 2.0.0-169 DISTVERSIONSUFFIX= -g0d9854f -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MAINTAINER= yuri@FreeBSD.org @@ -12,8 +12,7 @@ COMMENT= Robust fiducial markers for augmented reality and robotics LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/gpl.txt -LIB_DEPENDS= libopencv_imgproc.so:graphics/opencv-core \ - libopencv_video.so:graphics/opencv +LIB_DEPENDS= libopencv_video.so:graphics/opencv USES= cmake compiler:c++11-lang USE_GITHUB= yes diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index dc824526ab82..069dd0451b3d 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -39,7 +39,7 @@ OPTIONS_DEFINE= ALSA AMR_NB AMR_WB AOM ARIBB24 ASM ASS BS2B CACA CDIO CELT \ CODEC2 DAV1D DAVS2 DC1394 DEBUG DOCS DRM FDK_AAC FLITE \ FONTCONFIG FREETYPE FREI0R FRIBIDI GLSLANG GME GSM ICONV ILBC JACK \ KLVANC KVAZAAR LADSPA LAME LENSFUN LIBBLURAY LIBRSVG2 LIBXML2 \ - LTO LV2 MFX MODPLUG MYSOFA OPENAL OPENCL OPENCV OPENGL OPENH264 \ + LTO LV2 MFX MODPLUG MYSOFA OPENAL OPENCL OPENGL OPENH264 \ OPENJPEG OPENMPT OPTIMIZED_CFLAGS OPUS POCKETSPHINX PULSEAUDIO \ RAV1E RABBITMQ RTCPU RUBBERBAND SDL SMB SNAPPY SNDIO SOXR SPEEX SRT SSH \ SVTAV1 SVTHEVC SVTVP9 TENSORFLOW TESSERACT THEORA TWOLAME V4L \ @@ -47,7 +47,7 @@ OPTIONS_DEFINE= ALSA AMR_NB AMR_WB AOM ARIBB24 ASM ASS BS2B CACA CDIO CELT \ WAVPACK WEBP X264 X265 XAVS2 XCB XVID XVIDEO ZIMG ZMQ ZVBI OPTIONS_DEFAULT= AOM ASM ASS DAV1D DRM FONTCONFIG FREETYPE FREI0R GMP GNUTLS ICONV \ - LAME LIBXML2 OPENCV OPTIMIZED_CFLAGS OPUS RTCPU THEORA V4L VAAPI \ + LAME LIBXML2 OPTIMIZED_CFLAGS OPUS RTCPU THEORA V4L VAAPI \ VDPAU VORBIS VPX X264 X265 XCB XVID .if !exists(${.CURDIR:H:H}/multimedia/aribb24) @@ -356,10 +356,6 @@ OPENCL_BUILD_DEPENDS= ${LOCALBASE}/include/CL/opencl.h:devel/opencl OPENCL_LIB_DEPENDS= libOpenCL.so:devel/ocl-icd OPENCL_CONFIGURE_ENABLE= opencl -# opencv -OPENCV_LIB_DEPENDS= libopencv_imgproc.so:graphics/opencv-core -OPENCV_CONFIGURE_ENABLE= libopencv - # opengl OPENGL_USES= gl OPENGL_USE= GL=gl @@ -636,12 +632,6 @@ PORTDOCS= * USE_GCC= yes .endif -post-patch: -# {C,LD}FLAGS safeness - @${REINPLACE_CMD} -E \ - -e 's|require_pkg_config opencv|require_pkg_config opencv-core|g' \ - ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} - post-install: (cd ${WRKSRC} && ${COPYTREE_SHARE} \ "${DOC_FILES}" ${STAGEDIR}${DOCSDIR}) diff --git a/multimedia/gstreamer1-plugins/Makefile.common b/multimedia/gstreamer1-plugins/Makefile.common index a96507b898f0..26cd314c3b90 100644 --- a/multimedia/gstreamer1-plugins/Makefile.common +++ b/multimedia/gstreamer1-plugins/Makefile.common @@ -380,8 +380,7 @@ gst_neon_PLIST_FILES= ${GST_LIB_DIR}/libgstneonhttpsrc.so gst_ogg_LIB_DEPENDS= libogg.so:audio/libogg # opencv -gst_opencv_LIB_DEPENDS= libopencv_core.so:graphics/opencv-core \ - libopencv_highgui.so:graphics/opencv +gst_opencv_LIB_DEPENDS= libopencv_highgui.so:graphics/opencv gst_opencv_GST_PLUGIN_DIR= gst-libs/gst/opencv ext/opencv gst_opencv_PLIST_FILES= # gst_opencv_USES= compiler:c++11-lib diff --git a/multimedia/libav/Makefile b/multimedia/libav/Makefile index 39e616990454..e7bb5e75cd8f 100644 --- a/multimedia/libav/Makefile +++ b/multimedia/libav/Makefile @@ -15,8 +15,7 @@ BROKEN_aarch64= fails to link: can't create dynamic relocation R_AARCH64_ABS64 BROKEN_armv6= fails to compile: cc: warning: joined argument expects additional value: -mcpu= BUILD_DEPENDS= yasm:devel/yasm -LIB_DEPENDS= libopencv_core.so:graphics/opencv-core \ - libgmp.so:math/gmp \ +LIB_DEPENDS= libgmp.so:math/gmp \ libvdpau.so:multimedia/libvdpau \ libhogweed.so:security/nettle @@ -43,11 +42,11 @@ CONFIGURE_ARGS= --prefix="${PREFIX}" \ --cc="${CC}" OPTIONS_DEFINE= ALSA AMR_NB AMR_WB BZIP2 CDIO FAAC FDK_AAC DC1394 DOCS FREETYPE \ - FREI0R GNUTLS GSM ILBC JACK LAME OPENCV OPENJPEG OPENSSL \ + FREI0R GNUTLS GSM ILBC JACK LAME OPENJPEG OPENSSL \ OPUS PULSEAUDIO RTMP SCHROEDINGER SDL SPEEX THEORA V4L VAAPI \ VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX WAVPACK WEBP X11GRAB \ X264 XVID ZLIB -OPTIONS_DEFAULT=BZIP2 FREETYPE FREI0R GNUTLS OPENCV SCHROEDINGER \ +OPTIONS_DEFAULT=BZIP2 FREETYPE FREI0R GNUTLS SCHROEDINGER \ THEORA VAAPI VDPAU VO_AACENC VORBIS VPX X264 XVID ZLIB FDK_AAC_DESC= AAC audio encoding via Fraunhofer FDK @@ -106,9 +105,6 @@ JACK_CONFIGURE_OFF= --disable-indev=jack LAME_LIB_DEPENDS= libmp3lame.so:audio/lame LAME_CONFIGURE_ENABLE= libmp3lame -OPENCV_LIB_DEPENDS= libopencv_video.so:graphics/opencv -OPENCV_CONFIGURE_ENABLE= libopencv - OPENJPEG_LIB_DEPENDS= libopenjpeg.so:graphics/openjpeg15 OPENJPEG_CONFIGURE_ENABLE= libopenjpeg diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile index 15848f69dd67..07df5f5d1d2b 100644 --- a/multimedia/lives/Makefile +++ b/multimedia/lives/Makefile @@ -3,7 +3,7 @@ PORTNAME= lives DISTVERSION= 3.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= http://lives-video.com/releases/ DISTNAME= LiVES-${PORTVERSION} @@ -123,7 +123,7 @@ OGM_DESC= Use ogmtools for manipulating with OGM files OGM_RUN_DEPENDS= ogmmerge:multimedia/ogmtools OPENCV_CONFIGURE_OFF= --disable-opencv OPENCV_LIB_DEPENDS= libopencv_calib3d.so:graphics/opencv \ - libopencv_core.so:graphics/opencv-core + libopencv_core.so:graphics/opencv SCHROEDINGER_CONFIGURE_OFF= --disable-dirac SCHROEDINGER_LIB_DEPENDS= libschroedinger-1.0.so:multimedia/schroedinger SSWF_DESC= Use sswf for manipulating with Flash movies diff --git a/multimedia/zart/Makefile b/multimedia/zart/Makefile index f71bd30d5a34..8608afe2acce 100644 --- a/multimedia/zart/Makefile +++ b/multimedia/zart/Makefile @@ -2,10 +2,14 @@ PORTNAME= zart PORTVERSION= g20191124 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= https://gmic.eu/files/source/:gmic DISTFILES= gmic_${GMIC_VERSION}.tar.gz:gmic +PATCH_SITES= https://github.com/c-koi/zart/commit/ +PATCHFILES= 6ca1964690afbbc78627d7c868a692401043a584.patch:-p1 + MAINTAINER= yuri@FreeBSD.org COMMENT= GMIC GUI for video streams @@ -15,8 +19,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LIB_DEPENDS= libgmic.so:graphics/gmic \ - libopencv_core.so:graphics/opencv-core \ - libopencv_video.so:graphics/opencv \ + libopencv_core.so:graphics/opencv \ libfftw3.so:math/fftw3 USES= compiler:c++11-lang pkgconfig qmake qt:5 diff --git a/multimedia/zart/distinfo b/multimedia/zart/distinfo index 8777cd82ca23..ca97bde3e4a9 100644 --- a/multimedia/zart/distinfo +++ b/multimedia/zart/distinfo @@ -1,5 +1,7 @@ -TIMESTAMP = 1577251091 +TIMESTAMP = 1612027931 SHA256 (gmic_2.8.1.tar.gz) = 1a2b4c75c428201e52e920bd07e6c04118ae294cb89fce3c1c4ef386421b2a7a SIZE (gmic_2.8.1.tar.gz) = 5995556 SHA256 (c-koi-zart-g20191124-099554f_GH0.tar.gz) = 667bb0730cc462f31659b33b66cbc521e94a321e4eea96d79ded2f6ee31b002e SIZE (c-koi-zart-g20191124-099554f_GH0.tar.gz) = 293482 +SHA256 (6ca1964690afbbc78627d7c868a692401043a584.patch) = 00c749fd75b460e57f6ad99c44c6c9f81c66d88468dd79cf2698cf7f6282bb6a +SIZE (6ca1964690afbbc78627d7c868a692401043a584.patch) = 1154 diff --git a/multimedia/zart/files/patch-zart.pro b/multimedia/zart/files/patch-zart.pro new file mode 100644 index 000000000000..db8f6d7fe19f --- /dev/null +++ b/multimedia/zart/files/patch-zart.pro @@ -0,0 +1,11 @@ +--- zart.pro.orig 2021-01-30 17:27:07 UTC ++++ zart.pro +@@ -29,7 +29,7 @@ greaterThan(QT_MAJOR_VERSION, 4): CONFIG += c++11 + CONFIG += warn_on + QT_CONFIG -= no-pkg-config + CONFIG += link_pkgconfig +-PKGCONFIG += opencv fftw3 zlib ++PKGCONFIG += opencv4 fftw3 zlib + DEFINES += cimg_use_fftw3 cimg_use_zlib + + DEFINES += QT_DEPRECATED_WARNINGS diff --git a/net-im/tox/Makefile b/net-im/tox/Makefile index 3195b50656cb..e9bae674031e 100644 --- a/net-im/tox/Makefile +++ b/net-im/tox/Makefile @@ -3,7 +3,7 @@ PORTNAME= toxcore PORTVERSION= 0.2.12 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v PORTEPOCH= 1 CATEGORIES= net-im net-p2p @@ -22,7 +22,7 @@ LIB_DEPENDS= libvpx.so:multimedia/libvpx \ libsodium.so:security/libsodium \ libopus.so:audio/opus \ libconfig.so:devel/libconfig -TEST_DEPENDS= libopencv_core.so:graphics/opencv-core +TEST_DEPENDS= libopencv_core.so:graphics/opencv CONFLICTS= toxcore-legacy-0.1.* diff --git a/net-p2p/retroshare/Makefile b/net-p2p/retroshare/Makefile index a4c6a2e46801..1ff74994edd7 100644 --- a/net-p2p/retroshare/Makefile +++ b/net-p2p/retroshare/Makefile @@ -4,7 +4,7 @@ PORTNAME= retroshare DISTVERSIONPREFIX= v DISTVERSION= 0.6.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-p2p PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -24,7 +24,6 @@ LIB_DEPENDS= libsqlcipher.so:databases/sqlcipher \ libgnome-keyring.so:security/libgnome-keyring \ libgpgme.so:security/gpgme \ libopencv_highgui.so:graphics/opencv \ - libopencv_imgproc.so:graphics/opencv-core \ libavcodec.so:multimedia/ffmpeg \ libcurl.so:ftp/curl \ libmicrohttpd.so:www/libmicrohttpd \