Update opencv to 4.2.0. Both consumer digikam and nomacs need small
tweaks, included in the diff below.
Nothing special in the diff below, just some cmake renames like off to
OFF and so one.
Tested on amd64 without any issues.
OK, comments?
Index: graphics/opencv/Makefile
===================================================================
RCS file: /cvs/ports/graphics/opencv/Makefile,v
retrieving revision 1.54
diff -u -p -r1.54 Makefile
--- graphics/opencv/Makefile 10 Nov 2019 15:32:55 -0000 1.54
+++ graphics/opencv/Makefile 13 Jan 2020 19:44:36 -0000
@@ -7,17 +7,14 @@ CATEGORIES = graphics devel
COMMENT-main = library for computer vision real-time processin
COMMENT-java = Java bindings for OpenCV
-V = 3.4.7
-GH_ACCOUNT = opencv
-GH_PROJECT = opencv
-GH_TAGNAME = ${V}
+V = 4.2.0
+GH_ACCOUNT = opencv
+GH_PROJECT = opencv
+GH_TAGNAME = ${V}
PKGNAME-main = opencv-${V}
PKGNAME-java = opencv-java-${V}
-REVISION-main = 1
-REVISION-java = 0
-
HOMEPAGE = https://www.opencv.org/
MAINTAINER = Rafael Sadowski <rsadow...@openbsd.org>
@@ -25,11 +22,10 @@ MAINTAINER = Rafael Sadowski <rsadowski
DISTFILES = opencv-{opencv/archive/}${V}${EXTRACT_SUFX}
.for i in opencv_calib3d opencv_core opencv_features2d \
- opencv_flann opencv_highgui opencv_imgproc \
- opencv_ml opencv_objdetect opencv_photo opencv_stitching \
- opencv_superres opencv_video opencv_videostab opencv_imgcodecs \
- opencv_shape opencv_videoio opencv_dnn
-SHARED_LIBS += $i 5.0
+ opencv_flann opencv_highgui opencv_imgproc opencv_ml opencv_objdetect \
+ opencv_photo opencv_stitching opencv_video opencv_imgcodecs \
+ opencv_videoio opencv_dnn opencv_gapi
+SHARED_LIBS += $i 6.0
.endfor
WANTLIB-main += ${COMPILER_LIBCXX} Half-2_4 Iex-2_4 IlmImf-2_4 IlmThread-2_4
@@ -38,7 +34,7 @@ WANTLIB-main += c cairo cairo-gobject gd
WANTLIB-main += glib-2.0 gobject-2.0 gstapp-1.0 gstaudio-1.0 gstbase-1.0
WANTLIB-main += gstpbutils-1.0 gstreamer-1.0 gstriff-1.0 gstvideo-1.0
WANTLIB-main += gthread-2.0 gtk-3 intl jasper jpeg m pango-1.0 pangocairo-1.0
-WANTLIB-main += png swscale tiff webp z
+WANTLIB-main += harfbuzz png swscale tiff webp z
WANTLIB-java += ${COMPILER_LIBCXX} m opencv_calib3d opencv_core opencv_dnn
WANTLIB-java += opencv_features2d opencv_flann opencv_highgui opencv_imgcodecs
@@ -66,6 +62,7 @@ RUN_DEPENDS-main = math/py-numpy
RUN_DEPENDS-java = ${MODJAVA_RUN_DEPENDS}
LIB_DEPENDS-main = ${LIB_DEPENDS} \
+ devel/harfbuzz \
multimedia/gstreamer1/plugins-base \
x11/gtk+3 \
graphics/ffmpeg \
@@ -92,22 +89,22 @@ CONFIGURE_ENV += LDFLAGS="${LDFLAGS} -la
# ATM opencv requires V4L1 compat, ask them to change it,
# then see WITH_V4L below.
-CONFIGURE_ARGS = -DBUILD_DOCS=Off \
- -DBUILD_EXAMPLES=Off \
- -DBUILD_IPP_IW=Off \
- -DBUILD_ITT=Off \
- -DBUILD_PERF_TESTS=Off \
- -DBUILD_TESTS=Off \
- -DENABLE_SSE3=Off \
- -DINSTALL_PYTHON_EXAMPLES=Off \
- -DINSTALL_TESTS=Off \
- -DWITH_1394=Off \
- -DWITH_CUDA=Off \
- -DWITH_EIGEN=Off \
- -DWITH_IPP=Off \
- -DWITH_OPENCL=Off \
- -DWITH_V4L=Off \
- -DWITH_VTK=Off
+CONFIGURE_ARGS = -DBUILD_DOCS=OFF \
+ -DBUILD_EXAMPLES=OFF \
+ -DBUILD_IPP_IW=OFF \
+ -DBUILD_ITT=OFF \
+ -DBUILD_PERF_TESTS=OFF \
+ -DBUILD_TESTS=OFF \
+ -DENABLE_SSE3=OFF \
+ -DINSTALL_PYTHON_EXAMPLES=OFF \
+ -DINSTALL_TESTS=OFF \
+ -DWITH_1394=OFF \
+ -DWITH_CUDA=OFF \
+ -DWITH_EIGEN=OFF \
+ -DWITH_IPP=OFF \
+ -DWITH_OPENCL=OFF \
+ -DWITH_V4L=OFF \
+ -DWITH_VTK=OFF
.if ${BUILD_PACKAGES:M-java}
MODULES += java
@@ -115,7 +112,7 @@ MODJAVA_VER = 1.8+
BUILD_DEPENDS += devel/apache-ant
.else
# Safe: Java will be detected, if present, but won't be used
-CONFIGURE_ARGS += -DBUILD_opencv_java=Off
+CONFIGURE_ARGS += -DBUILD_opencv_java=OFF
.endif
CONFIG_ADJ_CMD = perl -pi
@@ -127,8 +124,8 @@ NO_TEST = Yes
# Enable to run the regression tests
#TEST_IS_INTERACTIVE = X11
#
-#CONFIGURE_ARGS += -DDBUILD_TESTS=On \
-# -DBUILD_PERF_TESTS=On
+#CONFIGURE_ARGS += -DDBUILD_TESTS=ON \
+# -DBUILD_PERF_TESTS=ON
post-patch:
Index: graphics/opencv/distinfo
===================================================================
RCS file: /cvs/ports/graphics/opencv/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- graphics/opencv/distinfo 27 Sep 2019 05:49:56 -0000 1.9
+++ graphics/opencv/distinfo 13 Jan 2020 19:44:36 -0000
@@ -1,2 +1,2 @@
-SHA256 (opencv-3.4.7.tar.gz) = 6nQ4lqYEproeHBZRrULJfQ+QFl3r6ZQIEcfgvaowdSY=
-SIZE (opencv-3.4.7.tar.gz) = 88350165
+SHA256 (opencv-4.2.0.tar.gz) = nMshktfowDxY/uBwUTZNlO11mTY/Ow3OHF5swRwbsOw=
+SIZE (opencv-4.2.0.tar.gz) = 87808712
Index: graphics/opencv/patches/patch-CMakeLists_txt
===================================================================
RCS file: graphics/opencv/patches/patch-CMakeLists_txt
diff -N graphics/opencv/patches/patch-CMakeLists_txt
--- graphics/opencv/patches/patch-CMakeLists_txt 27 Sep 2019 05:49:56
-0000 1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.9 2019/09/27 05:49:56 rsadowski Exp $
-
-Index: CMakeLists.txt
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -616,7 +616,7 @@ else()
- ocv_update(OPENCV_SAMPLES_SRC_INSTALL_PATH share/OpenCV/samples)
- ocv_update(OPENCV_JAR_INSTALL_PATH share/OpenCV/java)
- ocv_update(OPENCV_OTHER_INSTALL_PATH share/OpenCV)
-- ocv_update(OPENCV_LICENSES_INSTALL_PATH
"${CMAKE_INSTALL_DATAROOTDIR}/licenses/opencv3")
-+ ocv_update(OPENCV_LICENSES_INSTALL_PATH
"${CMAKE_INSTALL_DATAROOTDIR}/OpenCV/licenses/")
-
- if(NOT DEFINED OPENCV_CONFIG_INSTALL_PATH)
- math(EXPR SIZEOF_VOID_P_BITS "8 * ${CMAKE_SIZEOF_VOID_P}")
Index: graphics/opencv/patches/patch-cmake_OpenCVFindLibsGrfmt_cmake
===================================================================
RCS file:
/cvs/ports/graphics/opencv/patches/patch-cmake_OpenCVFindLibsGrfmt_cmake,v
retrieving revision 1.1
diff -u -p -r1.1 patch-cmake_OpenCVFindLibsGrfmt_cmake
--- graphics/opencv/patches/patch-cmake_OpenCVFindLibsGrfmt_cmake 23 Mar
2019 07:26:56 -0000 1.1
+++ graphics/opencv/patches/patch-cmake_OpenCVFindLibsGrfmt_cmake 13 Jan
2020 19:44:36 -0000
@@ -16,3 +16,10 @@ Index: cmake/OpenCVFindLibsGrfmt.cmake
endif()
endif()
+@@ -273,4 +268,4 @@ if(WITH_IMGCODEC_PFM)
+ set(HAVE_IMGCODEC_PFM ON)
+ elseif(DEFINED WITH_IMGCODEC_PFM)
+ set(HAVE_IMGCODEC_PFM OFF)
+-endif()
+\ No newline at end of file
++endif()
Index: graphics/opencv/patches/patch-cmake_OpenCVFindLibsVideo_cmake
===================================================================
RCS file: graphics/opencv/patches/patch-cmake_OpenCVFindLibsVideo_cmake
diff -N graphics/opencv/patches/patch-cmake_OpenCVFindLibsVideo_cmake
--- graphics/opencv/patches/patch-cmake_OpenCVFindLibsVideo_cmake 27 Sep
2019 05:49:56 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-cmake_OpenCVFindLibsVideo_cmake,v 1.7 2019/09/27 05:49:56
rsadowski Exp $
-Index: cmake/OpenCVFindLibsVideo.cmake
---- cmake/OpenCVFindLibsVideo.cmake.orig
-+++ cmake/OpenCVFindLibsVideo.cmake
-@@ -185,7 +185,6 @@ if(WITH_V4L)
- endif()
- endif()
- CHECK_INCLUDE_FILE(linux/videodev.h HAVE_CAMV4L)
-- CHECK_INCLUDE_FILE(linux/videodev2.h HAVE_CAMV4L2)
- CHECK_INCLUDE_FILE(sys/videoio.h HAVE_VIDEOIO)
- endif(WITH_V4L)
-
Index: graphics/opencv/patches/patch-modules_core_src_system_cpp
===================================================================
RCS file: /cvs/ports/graphics/opencv/patches/patch-modules_core_src_system_cpp,v
retrieving revision 1.6
diff -u -p -r1.6 patch-modules_core_src_system_cpp
--- graphics/opencv/patches/patch-modules_core_src_system_cpp 27 Sep 2019
05:49:56 -0000 1.6
+++ graphics/opencv/patches/patch-modules_core_src_system_cpp 13 Jan 2020
19:44:36 -0000
@@ -3,7 +3,7 @@ Fix build on i386.
Index: modules/core/src/system.cpp
--- modules/core/src/system.cpp.orig
+++ modules/core/src/system.cpp
-@@ -189,9 +189,12 @@ std::wstring GetTempFileNameWinRT(std::wstring prefix)
+@@ -211,9 +211,12 @@ std::wstring GetTempFileNameWinRT(std::wstring prefix)
#endif
#else
Index: graphics/opencv/pkg/PLIST-java
===================================================================
RCS file: /cvs/ports/graphics/opencv/pkg/PLIST-java,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST-java
--- graphics/opencv/pkg/PLIST-java 27 Sep 2019 05:49:56 -0000 1.7
+++ graphics/opencv/pkg/PLIST-java 13 Jan 2020 19:44:36 -0000
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-java,v 1.7 2019/09/27 05:49:56 rsadowski Exp $
-share/OpenCV/java/
-share/OpenCV/java/libopencv_java347.so
-share/OpenCV/java/opencv-347.jar
+share/java/
+share/java/opencv4/
+@so share/java/opencv4/libopencv_java420.so
+share/java/opencv4/opencv-420.jar
Index: graphics/opencv/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/graphics/opencv/pkg/PLIST-main,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST-main
--- graphics/opencv/pkg/PLIST-main 27 Sep 2019 05:49:56 -0000 1.9
+++ graphics/opencv/pkg/PLIST-main 13 Jan 2020 19:44:36 -0000
@@ -1,312 +1,357 @@
@comment $OpenBSD: PLIST-main,v 1.9 2019/09/27 05:49:56 rsadowski Exp $
@bin bin/opencv_annotation
-@bin bin/opencv_createsamples
@bin bin/opencv_interactive-calibration
-@bin bin/opencv_traincascade
@bin bin/opencv_version
@bin bin/opencv_visualisation
-bin/setup_vars_opencv3.sh
-include/opencv/
-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/
-include/opencv2/calib3d/
-include/opencv2/calib3d.hpp
-include/opencv2/calib3d/calib3d.hpp
-include/opencv2/calib3d/calib3d_c.h
-include/opencv2/core/
-include/opencv2/core.hpp
-include/opencv2/core/affine.hpp
-include/opencv2/core/async.hpp
-include/opencv2/core/base.hpp
-include/opencv2/core/bindings_utils.hpp
-include/opencv2/core/bufferpool.hpp
-include/opencv2/core/check.hpp
-include/opencv2/core/core.hpp
-include/opencv2/core/core_c.h
-include/opencv2/core/cuda/
-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/
-include/opencv2/core/cuda/detail/color_detail.hpp
-include/opencv2/core/cuda/detail/reduce.hpp
-include/opencv2/core/cuda/detail/reduce_key_val.hpp
-include/opencv2/core/cuda/detail/transform_detail.hpp
-include/opencv2/core/cuda/detail/type_traits_detail.hpp
-include/opencv2/core/cuda/detail/vec_distance_detail.hpp
-include/opencv2/core/cuda/dynamic_smem.hpp
-include/opencv2/core/cuda/emulation.hpp
-include/opencv2/core/cuda/filters.hpp
-include/opencv2/core/cuda/funcattrib.hpp
-include/opencv2/core/cuda/functional.hpp
-include/opencv2/core/cuda/limits.hpp
-include/opencv2/core/cuda/reduce.hpp
-include/opencv2/core/cuda/saturate_cast.hpp
-include/opencv2/core/cuda/scan.hpp
-include/opencv2/core/cuda/simd_functions.hpp
-include/opencv2/core/cuda/transform.hpp
-include/opencv2/core/cuda/type_traits.hpp
-include/opencv2/core/cuda/utility.hpp
-include/opencv2/core/cuda/vec_distance.hpp
-include/opencv2/core/cuda/vec_math.hpp
-include/opencv2/core/cuda/vec_traits.hpp
-include/opencv2/core/cuda/warp.hpp
-include/opencv2/core/cuda/warp_reduce.hpp
-include/opencv2/core/cuda/warp_shuffle.hpp
-include/opencv2/core/cuda_stream_accessor.hpp
-include/opencv2/core/cuda_types.hpp
-include/opencv2/core/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/detail/
-include/opencv2/core/detail/async_promise.hpp
-include/opencv2/core/detail/exception_ptr.hpp
-include/opencv2/core/directx.hpp
-include/opencv2/core/eigen.hpp
-include/opencv2/core/fast_math.hpp
-include/opencv2/core/hal/
-include/opencv2/core/hal/hal.hpp
-include/opencv2/core/hal/interface.h
-include/opencv2/core/hal/intrin.hpp
-include/opencv2/core/hal/intrin_avx.hpp
-include/opencv2/core/hal/intrin_avx512.hpp
-include/opencv2/core/hal/intrin_cpp.hpp
-include/opencv2/core/hal/intrin_forward.hpp
-include/opencv2/core/hal/intrin_neon.hpp
-include/opencv2/core/hal/intrin_sse.hpp
-include/opencv2/core/hal/intrin_sse_em.hpp
-include/opencv2/core/hal/intrin_vsx.hpp
-include/opencv2/core/ippasync.hpp
-include/opencv2/core/mat.hpp
-include/opencv2/core/mat.inl.hpp
-include/opencv2/core/matx.hpp
-include/opencv2/core/neon_utils.hpp
-include/opencv2/core/ocl.hpp
-include/opencv2/core/ocl_genbase.hpp
-include/opencv2/core/opencl/
-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/
-include/opencv2/core/opencl/runtime/autogenerated/
-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/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/simd_intrinsics.hpp
-include/opencv2/core/softfloat.hpp
-include/opencv2/core/sse_utils.hpp
-include/opencv2/core/traits.hpp
-include/opencv2/core/types.hpp
-include/opencv2/core/types_c.h
-include/opencv2/core/utility.hpp
-include/opencv2/core/utils/
-include/opencv2/core/utils/allocator_stats.hpp
-include/opencv2/core/utils/allocator_stats.impl.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/dnn/
-include/opencv2/dnn.hpp
-include/opencv2/dnn/all_layers.hpp
-include/opencv2/dnn/dict.hpp
-include/opencv2/dnn/dnn.hpp
-include/opencv2/dnn/dnn.inl.hpp
-include/opencv2/dnn/layer.details.hpp
-include/opencv2/dnn/layer.hpp
-include/opencv2/dnn/shape_utils.hpp
-include/opencv2/dnn/utils/
-include/opencv2/dnn/utils/inference_engine.hpp
-include/opencv2/features2d/
-include/opencv2/features2d.hpp
-include/opencv2/features2d/features2d.hpp
-include/opencv2/features2d/hal/
-include/opencv2/features2d/hal/interface.h
-include/opencv2/flann/
-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
-include/opencv2/highgui/
-include/opencv2/highgui.hpp
-include/opencv2/highgui/highgui.hpp
-include/opencv2/highgui/highgui_c.h
-include/opencv2/imgcodecs/
-include/opencv2/imgcodecs.hpp
-include/opencv2/imgcodecs/imgcodecs.hpp
-include/opencv2/imgcodecs/imgcodecs_c.h
-include/opencv2/imgcodecs/ios.h
-include/opencv2/imgproc/
-include/opencv2/imgproc.hpp
-include/opencv2/imgproc/detail/
-include/opencv2/imgproc/detail/distortion_model.hpp
-include/opencv2/imgproc/hal/
-include/opencv2/imgproc/hal/hal.hpp
-include/opencv2/imgproc/hal/interface.h
-include/opencv2/imgproc/imgproc.hpp
-include/opencv2/imgproc/imgproc_c.h
-include/opencv2/imgproc/types_c.h
-include/opencv2/ml/
-include/opencv2/ml.hpp
-include/opencv2/ml/ml.hpp
-include/opencv2/ml/ml.inl.hpp
-include/opencv2/objdetect/
-include/opencv2/objdetect.hpp
-include/opencv2/objdetect/detection_based_tracker.hpp
-include/opencv2/objdetect/objdetect.hpp
-include/opencv2/objdetect/objdetect_c.h
-include/opencv2/opencv.hpp
-include/opencv2/opencv_modules.hpp
-include/opencv2/photo/
-include/opencv2/photo.hpp
-include/opencv2/photo/cuda.hpp
-include/opencv2/photo/photo.hpp
-include/opencv2/photo/photo_c.h
-include/opencv2/shape/
-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
-include/opencv2/stitching/
-include/opencv2/stitching.hpp
-include/opencv2/stitching/detail/
-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
-include/opencv2/superres/
-include/opencv2/superres.hpp
-include/opencv2/superres/optical_flow.hpp
-include/opencv2/video/
-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/
-include/opencv2/videoio.hpp
-include/opencv2/videoio/cap_ios.h
-include/opencv2/videoio/registry.hpp
-include/opencv2/videoio/videoio.hpp
-include/opencv2/videoio/videoio_c.h
-include/opencv2/videostab/
-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
+bin/setup_vars_opencv4.sh
+include/opencv4/
+include/opencv4/opencv2/
+include/opencv4/opencv2/calib3d/
+include/opencv4/opencv2/calib3d.hpp
+include/opencv4/opencv2/calib3d/calib3d.hpp
+include/opencv4/opencv2/calib3d/calib3d_c.h
+include/opencv4/opencv2/core/
+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/
+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/
+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/
+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/
+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_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/
+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/
+include/opencv4/opencv2/core/opencl/runtime/autogenerated/
+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/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/
+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/cvconfig.h
+include/opencv4/opencv2/dnn/
+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/
+include/opencv4/opencv2/dnn/utils/inference_engine.hpp
+include/opencv4/opencv2/dnn/version.hpp
+include/opencv4/opencv2/features2d/
+include/opencv4/opencv2/features2d.hpp
+include/opencv4/opencv2/features2d/features2d.hpp
+include/opencv4/opencv2/features2d/hal/
+include/opencv4/opencv2/features2d/hal/interface.h
+include/opencv4/opencv2/flann/
+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/gapi/
+include/opencv4/opencv2/gapi.hpp
+include/opencv4/opencv2/gapi/core.hpp
+include/opencv4/opencv2/gapi/cpu/
+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/fluid/
+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/gkernel.hpp
+include/opencv4/opencv2/gapi/gmat.hpp
+include/opencv4/opencv2/gapi/gmetaarg.hpp
+include/opencv4/opencv2/gapi/gproto.hpp
+include/opencv4/opencv2/gapi/gpu/
+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/
+include/opencv4/opencv2/gapi/infer.hpp
+include/opencv4/opencv2/gapi/infer/ie.hpp
+include/opencv4/opencv2/gapi/ocl/
+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/
+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/
+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/
+include/opencv4/opencv2/gapi/render.hpp
+include/opencv4/opencv2/gapi/render/render.hpp
+include/opencv4/opencv2/gapi/streaming/
+include/opencv4/opencv2/gapi/streaming/cap.hpp
+include/opencv4/opencv2/gapi/streaming/source.hpp
+include/opencv4/opencv2/gapi/util/
+include/opencv4/opencv2/gapi/util/any.hpp
+include/opencv4/opencv2/gapi/util/compiler_hints.hpp
+include/opencv4/opencv2/gapi/util/optional.hpp
+include/opencv4/opencv2/gapi/util/throw.hpp
+include/opencv4/opencv2/gapi/util/util.hpp
+include/opencv4/opencv2/gapi/util/variant.hpp
+include/opencv4/opencv2/highgui/
+include/opencv4/opencv2/highgui.hpp
+include/opencv4/opencv2/highgui/highgui.hpp
+include/opencv4/opencv2/highgui/highgui_c.h
+include/opencv4/opencv2/imgcodecs/
+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/
+include/opencv4/opencv2/imgcodecs/legacy/constants_c.h
+include/opencv4/opencv2/imgproc/
+include/opencv4/opencv2/imgproc.hpp
+include/opencv4/opencv2/imgproc/detail/
+include/opencv4/opencv2/imgproc/detail/gcgraph.hpp
+include/opencv4/opencv2/imgproc/hal/
+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/ml/
+include/opencv4/opencv2/ml.hpp
+include/opencv4/opencv2/ml/ml.hpp
+include/opencv4/opencv2/ml/ml.inl.hpp
+include/opencv4/opencv2/objdetect/
+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/photo/
+include/opencv4/opencv2/photo.hpp
+include/opencv4/opencv2/photo/cuda.hpp
+include/opencv4/opencv2/photo/legacy/
+include/opencv4/opencv2/photo/legacy/constants_c.h
+include/opencv4/opencv2/photo/photo.hpp
+include/opencv4/opencv2/stitching/
+include/opencv4/opencv2/stitching.hpp
+include/opencv4/opencv2/stitching/detail/
+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/video/
+include/opencv4/opencv2/video.hpp
+include/opencv4/opencv2/video/background_segm.hpp
+include/opencv4/opencv2/video/legacy/
+include/opencv4/opencv2/video/legacy/constants_c.h
+include/opencv4/opencv2/video/tracking.hpp
+include/opencv4/opencv2/video/video.hpp
+include/opencv4/opencv2/videoio/
+include/opencv4/opencv2/videoio.hpp
+include/opencv4/opencv2/videoio/cap_ios.h
+include/opencv4/opencv2/videoio/legacy/
+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
+lib/cmake/opencv4/
+lib/cmake/opencv4/OpenCVConfig-version.cmake
+lib/cmake/opencv4/OpenCVConfig.cmake
+lib/cmake/opencv4/OpenCVModules${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/opencv4/OpenCVModules.cmake
@lib lib/libopencv_calib3d.so.${LIBopencv_calib3d_VERSION}
@lib lib/libopencv_core.so.${LIBopencv_core_VERSION}
@lib lib/libopencv_dnn.so.${LIBopencv_dnn_VERSION}
@lib lib/libopencv_features2d.so.${LIBopencv_features2d_VERSION}
@lib lib/libopencv_flann.so.${LIBopencv_flann_VERSION}
+@lib lib/libopencv_gapi.so.${LIBopencv_gapi_VERSION}
@lib lib/libopencv_highgui.so.${LIBopencv_highgui_VERSION}
@lib lib/libopencv_imgcodecs.so.${LIBopencv_imgcodecs_VERSION}
@lib lib/libopencv_imgproc.so.${LIBopencv_imgproc_VERSION}
@lib lib/libopencv_ml.so.${LIBopencv_ml_VERSION}
@lib lib/libopencv_objdetect.so.${LIBopencv_objdetect_VERSION}
@lib lib/libopencv_photo.so.${LIBopencv_photo_VERSION}
-@lib lib/libopencv_shape.so.${LIBopencv_shape_VERSION}
@lib lib/libopencv_stitching.so.${LIBopencv_stitching_VERSION}
-@lib lib/libopencv_superres.so.${LIBopencv_superres_VERSION}
@lib lib/libopencv_video.so.${LIBopencv_video_VERSION}
@lib lib/libopencv_videoio.so.${LIBopencv_videoio_VERSION}
-@lib lib/libopencv_videostab.so.${LIBopencv_videostab_VERSION}
-lib/pkgconfig/opencv.pc
lib/python${MODPY_VERSION}/site-packages/cv2/
lib/python${MODPY_VERSION}/site-packages/cv2/__init__.py
lib/python${MODPY_VERSION}/site-packages/cv2/__init__.pyc
@@ -319,40 +364,38 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/cv2/load_config_py3.py
lib/python${MODPY_VERSION}/site-packages/cv2/load_config_py3.pyc
lib/python${MODPY_VERSION}/site-packages/cv2/python-${MODPY_VERSION}/
-lib/python${MODPY_VERSION}/site-packages/cv2/python-${MODPY_VERSION}/cv2.so
-share/OpenCV/
-share/OpenCV/OpenCVConfig-version.cmake
-share/OpenCV/OpenCVConfig.cmake
-share/OpenCV/OpenCVModules${MODCMAKE_BUILD_SUFFIX}
-share/OpenCV/OpenCVModules.cmake
-share/OpenCV/haarcascades/
-share/OpenCV/haarcascades/haarcascade_eye.xml
-share/OpenCV/haarcascades/haarcascade_eye_tree_eyeglasses.xml
-share/OpenCV/haarcascades/haarcascade_frontalcatface.xml
-share/OpenCV/haarcascades/haarcascade_frontalcatface_extended.xml
-share/OpenCV/haarcascades/haarcascade_frontalface_alt.xml
-share/OpenCV/haarcascades/haarcascade_frontalface_alt2.xml
-share/OpenCV/haarcascades/haarcascade_frontalface_alt_tree.xml
-share/OpenCV/haarcascades/haarcascade_frontalface_default.xml
-share/OpenCV/haarcascades/haarcascade_fullbody.xml
-share/OpenCV/haarcascades/haarcascade_lefteye_2splits.xml
-share/OpenCV/haarcascades/haarcascade_licence_plate_rus_16stages.xml
-share/OpenCV/haarcascades/haarcascade_lowerbody.xml
-share/OpenCV/haarcascades/haarcascade_profileface.xml
-share/OpenCV/haarcascades/haarcascade_righteye_2splits.xml
-share/OpenCV/haarcascades/haarcascade_russian_plate_number.xml
-share/OpenCV/haarcascades/haarcascade_smile.xml
-share/OpenCV/haarcascades/haarcascade_upperbody.xml
-share/OpenCV/lbpcascades/
-share/OpenCV/lbpcascades/lbpcascade_frontalcatface.xml
-share/OpenCV/lbpcascades/lbpcascade_frontalface.xml
-share/OpenCV/lbpcascades/lbpcascade_frontalface_improved.xml
-share/OpenCV/lbpcascades/lbpcascade_profileface.xml
-share/OpenCV/lbpcascades/lbpcascade_silverware.xml
-share/OpenCV/licenses/
-share/OpenCV/licenses/SoftFloat-COPYING.txt
-share/OpenCV/licenses/protobuf-LICENSE
-share/OpenCV/licenses/protobuf-README.md
-share/OpenCV/licenses/quirc-LICENSE
-share/OpenCV/valgrind.supp
-share/OpenCV/valgrind_3rdparty.supp
+@so lib/python${MODPY_VERSION}/site-packages/cv2/python-${MODPY_VERSION}/cv2.so
+share/licenses/
+share/licenses/opencv4/
+share/licenses/opencv4/SoftFloat-COPYING.txt
+share/licenses/opencv4/ade-LICENSE
+share/licenses/opencv4/protobuf-LICENSE
+share/licenses/opencv4/protobuf-README.md
+share/licenses/opencv4/quirc-LICENSE
+share/opencv4/
+share/opencv4/haarcascades/
+share/opencv4/haarcascades/haarcascade_eye.xml
+share/opencv4/haarcascades/haarcascade_eye_tree_eyeglasses.xml
+share/opencv4/haarcascades/haarcascade_frontalcatface.xml
+share/opencv4/haarcascades/haarcascade_frontalcatface_extended.xml
+share/opencv4/haarcascades/haarcascade_frontalface_alt.xml
+share/opencv4/haarcascades/haarcascade_frontalface_alt2.xml
+share/opencv4/haarcascades/haarcascade_frontalface_alt_tree.xml
+share/opencv4/haarcascades/haarcascade_frontalface_default.xml
+share/opencv4/haarcascades/haarcascade_fullbody.xml
+share/opencv4/haarcascades/haarcascade_lefteye_2splits.xml
+share/opencv4/haarcascades/haarcascade_licence_plate_rus_16stages.xml
+share/opencv4/haarcascades/haarcascade_lowerbody.xml
+share/opencv4/haarcascades/haarcascade_profileface.xml
+share/opencv4/haarcascades/haarcascade_righteye_2splits.xml
+share/opencv4/haarcascades/haarcascade_russian_plate_number.xml
+share/opencv4/haarcascades/haarcascade_smile.xml
+share/opencv4/haarcascades/haarcascade_upperbody.xml
+share/opencv4/lbpcascades/
+share/opencv4/lbpcascades/lbpcascade_frontalcatface.xml
+share/opencv4/lbpcascades/lbpcascade_frontalface.xml
+share/opencv4/lbpcascades/lbpcascade_frontalface_improved.xml
+share/opencv4/lbpcascades/lbpcascade_profileface.xml
+share/opencv4/lbpcascades/lbpcascade_silverware.xml
+share/opencv4/valgrind.supp
+share/opencv4/valgrind_3rdparty.supp
Index: graphics/digikam/Makefile
===================================================================
RCS file: /cvs/ports/graphics/digikam/Makefile,v
retrieving revision 1.60
diff -u -p -r1.60 Makefile
--- graphics/digikam/Makefile 27 Sep 2019 06:12:58 -0000 1.60
+++ graphics/digikam/Makefile 13 Jan 2020 19:44:36 -0000
@@ -4,7 +4,7 @@ COMMENT = KDE digital photo and video ma
V = 6.2.0
DISTNAME = digikam-${V}
-REVISION = 1
+REVISION = 2
CATEGORIES = graphics
Index: graphics/digikam/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/digikam/pkg/PLIST,v
retrieving revision 1.21
diff -u -p -r1.21 PLIST
--- graphics/digikam/pkg/PLIST 7 Aug 2019 10:44:49 -0000 1.21
+++ graphics/digikam/pkg/PLIST 13 Jan 2020 19:44:36 -0000
@@ -35,122 +35,122 @@ lib/cmake/digikam/DigikamGuiConfig.cmake
@lib lib/libdigikamgui.so.${LIBdigikamgui_VERSION}
lib/qt5/plugins/digikam/
lib/qt5/plugins/digikam/bqm/
-lib/qt5/plugins/digikam/bqm/Bqm_AntiVignetting_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_AssignTemplate_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_AutoCorrection_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_BWconvert_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_BcgCorrection_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_Blur_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_Border_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_ChannelMixer_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_ColorBalance_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_ColorFX_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_Convert16To8_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_Convert8To16_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_ConvertToDNG_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_ConvertToJP2lugin_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_ConvertToJPEG_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_ConvertToPGF_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_ConvertToPNG_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_ConvertToTIFF_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_Crop_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_CurvesAdjust_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_FilmGrain_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_Flip_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_HslCorrection_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_IccConvert_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_Invert_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_LensAutoFix_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_LocalContrast_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_NoiseReduction_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_RedEyeCorrection_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_RemoveMetadata_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_Resize_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_Restoration_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_Rotate_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_Sharpen_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_TimeAdjust_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_UserScript_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_WaterMark_Plugin.so
-lib/qt5/plugins/digikam/bqm/Bqm_WhiteBalance_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_AntiVignetting_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_AssignTemplate_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_AutoCorrection_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_BWconvert_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_BcgCorrection_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_Blur_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_Border_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_ChannelMixer_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_ColorBalance_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_ColorFX_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_Convert16To8_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_Convert8To16_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_ConvertToDNG_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_ConvertToJP2lugin_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_ConvertToJPEG_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_ConvertToPGF_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_ConvertToPNG_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_ConvertToTIFF_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_Crop_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_CurvesAdjust_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_FilmGrain_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_Flip_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_HslCorrection_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_IccConvert_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_Invert_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_LensAutoFix_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_LocalContrast_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_NoiseReduction_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_RedEyeCorrection_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_RemoveMetadata_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_Resize_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_Restoration_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_Rotate_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_Sharpen_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_TimeAdjust_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_UserScript_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_WaterMark_Plugin.so
+@so lib/qt5/plugins/digikam/bqm/Bqm_WhiteBalance_Plugin.so
lib/qt5/plugins/digikam/editor/
-lib/qt5/plugins/digikam/editor/Editor_AdjustCurvesTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_AdjustLevelsTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_AntivignettingTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_AutoCorrectionTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_AutoCropTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_BWSepiaTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_BcgTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_BlurFxTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_BlurTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_BorderTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_CBTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_ChannelMixerTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_CharcoalTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_ColorFxTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_ContentAwareResizeTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_Convert16To8Tool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_Convert8To16Tool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_DistortionFxTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_EmbossTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_FilmGrainTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_FilmTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_FreeRotationTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_HSLTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_HotpixelsTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_InsertTextTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_InvertTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_LensAutoFixTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_LensDistortionTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_LocalContrastTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_NoiseReductionTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_OilPaintTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_PerspectiveTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_PrintTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_ProfileConversionTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_RainDropTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_RatioCropTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_RedEyeTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_ResizeTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_RestorationTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_SharpenTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_ShearTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_TextureTool_Plugin.so
-lib/qt5/plugins/digikam/editor/Editor_WhiteBalanceTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_AdjustCurvesTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_AdjustLevelsTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_AntivignettingTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_AutoCorrectionTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_AutoCropTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_BWSepiaTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_BcgTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_BlurFxTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_BlurTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_BorderTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_CBTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_ChannelMixerTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_CharcoalTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_ColorFxTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_ContentAwareResizeTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_Convert16To8Tool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_Convert8To16Tool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_DistortionFxTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_EmbossTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_FilmGrainTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_FilmTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_FreeRotationTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_HSLTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_HotpixelsTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_InsertTextTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_InvertTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_LensAutoFixTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_LensDistortionTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_LocalContrastTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_NoiseReductionTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_OilPaintTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_PerspectiveTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_PrintTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_ProfileConversionTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_RainDropTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_RatioCropTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_RedEyeTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_ResizeTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_RestorationTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_SharpenTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_ShearTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_TextureTool_Plugin.so
+@so lib/qt5/plugins/digikam/editor/Editor_WhiteBalanceTool_Plugin.so
lib/qt5/plugins/digikam/generic/
-lib/qt5/plugins/digikam/generic/Generic_Box_Plugin.so
-lib/qt5/plugins/digikam/generic/Generic_Calendar_Plugin.so
-lib/qt5/plugins/digikam/generic/Generic_DigitalScanner_Plugin.so
-lib/qt5/plugins/digikam/generic/Generic_DropBox_Plugin.so
-lib/qt5/plugins/digikam/generic/Generic_ExpoBlending_Plugin.so
-lib/qt5/plugins/digikam/generic/Generic_FaceBook_Plugin.so
-lib/qt5/plugins/digikam/generic/Generic_FileCopy_Plugin.so
-lib/qt5/plugins/digikam/generic/Generic_FileTransfer_Plugin.so
-lib/qt5/plugins/digikam/generic/Generic_Flickr_Plugin.so
-lib/qt5/plugins/digikam/generic/Generic_GLViewer_Plugin.so
-lib/qt5/plugins/digikam/generic/Generic_GeolocationEdit_Plugin.so
-lib/qt5/plugins/digikam/generic/Generic_Google_Plugin.so
-lib/qt5/plugins/digikam/generic/Generic_HtmlGallery_Plugin.so
-lib/qt5/plugins/digikam/generic/Generic_ImageShack_Plugin.so
-lib/qt5/plugins/digikam/generic/Generic_ImgUr_Plugin.so
-lib/qt5/plugins/digikam/generic/Generic_IpFs_Plugin.so
-lib/qt5/plugins/digikam/generic/Generic_JAlbum_Plugin.so
-lib/qt5/plugins/digikam/generic/Generic_MediaServer_Plugin.so
-lib/qt5/plugins/digikam/generic/Generic_MediaWiki_Plugin.so
-lib/qt5/plugins/digikam/generic/Generic_MetadataEdit_Plugin.so
-lib/qt5/plugins/digikam/generic/Generic_OneDrive_Plugin.so
-lib/qt5/plugins/digikam/generic/Generic_Panorama_Plugin.so
-lib/qt5/plugins/digikam/generic/Generic_Pinterest_Plugin.so
-lib/qt5/plugins/digikam/generic/Generic_Piwigo_Plugin.so
-lib/qt5/plugins/digikam/generic/Generic_Presentation_Plugin.so
-lib/qt5/plugins/digikam/generic/Generic_PrintCreator_Plugin.so
-lib/qt5/plugins/digikam/generic/Generic_Rajce_Plugin.so
-lib/qt5/plugins/digikam/generic/Generic_SendByMail_Plugin.so
-lib/qt5/plugins/digikam/generic/Generic_SmugMug_Plugin.so
-lib/qt5/plugins/digikam/generic/Generic_TimeAdjust_Plugin.so
-lib/qt5/plugins/digikam/generic/Generic_Twitter_Plugin.so
-lib/qt5/plugins/digikam/generic/Generic_Wallpaper_Plugin.so
-lib/qt5/plugins/digikam/generic/Generic_YandexFotki_Plugin.so
+@so lib/qt5/plugins/digikam/generic/Generic_Box_Plugin.so
+@so lib/qt5/plugins/digikam/generic/Generic_Calendar_Plugin.so
+@so lib/qt5/plugins/digikam/generic/Generic_DigitalScanner_Plugin.so
+@so lib/qt5/plugins/digikam/generic/Generic_DropBox_Plugin.so
+@so lib/qt5/plugins/digikam/generic/Generic_ExpoBlending_Plugin.so
+@so lib/qt5/plugins/digikam/generic/Generic_FaceBook_Plugin.so
+@so lib/qt5/plugins/digikam/generic/Generic_FileCopy_Plugin.so
+@so lib/qt5/plugins/digikam/generic/Generic_FileTransfer_Plugin.so
+@so lib/qt5/plugins/digikam/generic/Generic_Flickr_Plugin.so
+@so lib/qt5/plugins/digikam/generic/Generic_GLViewer_Plugin.so
+@so lib/qt5/plugins/digikam/generic/Generic_GeolocationEdit_Plugin.so
+@so lib/qt5/plugins/digikam/generic/Generic_Google_Plugin.so
+@so lib/qt5/plugins/digikam/generic/Generic_HtmlGallery_Plugin.so
+@so lib/qt5/plugins/digikam/generic/Generic_ImageShack_Plugin.so
+@so lib/qt5/plugins/digikam/generic/Generic_ImgUr_Plugin.so
+@so lib/qt5/plugins/digikam/generic/Generic_IpFs_Plugin.so
+@so lib/qt5/plugins/digikam/generic/Generic_JAlbum_Plugin.so
+@so lib/qt5/plugins/digikam/generic/Generic_MediaServer_Plugin.so
+@so lib/qt5/plugins/digikam/generic/Generic_MediaWiki_Plugin.so
+@so lib/qt5/plugins/digikam/generic/Generic_MetadataEdit_Plugin.so
+@so lib/qt5/plugins/digikam/generic/Generic_OneDrive_Plugin.so
+@so lib/qt5/plugins/digikam/generic/Generic_Panorama_Plugin.so
+@so lib/qt5/plugins/digikam/generic/Generic_Pinterest_Plugin.so
+@so lib/qt5/plugins/digikam/generic/Generic_Piwigo_Plugin.so
+@so lib/qt5/plugins/digikam/generic/Generic_Presentation_Plugin.so
+@so lib/qt5/plugins/digikam/generic/Generic_PrintCreator_Plugin.so
+@so lib/qt5/plugins/digikam/generic/Generic_Rajce_Plugin.so
+@so lib/qt5/plugins/digikam/generic/Generic_SendByMail_Plugin.so
+@so lib/qt5/plugins/digikam/generic/Generic_SmugMug_Plugin.so
+@so lib/qt5/plugins/digikam/generic/Generic_TimeAdjust_Plugin.so
+@so lib/qt5/plugins/digikam/generic/Generic_Twitter_Plugin.so
+@so lib/qt5/plugins/digikam/generic/Generic_Wallpaper_Plugin.so
+@so lib/qt5/plugins/digikam/generic/Generic_YandexFotki_Plugin.so
@man man/man1/cleanup_digikamdb.1
@man man/man1/digitaglinktree.1
share/applications/org.kde.digikam.desktop
Index: graphics/nomacs/Makefile
===================================================================
RCS file: /cvs/ports/graphics/nomacs/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- graphics/nomacs/Makefile 12 Jul 2019 20:47:04 -0000 1.24
+++ graphics/nomacs/Makefile 13 Jan 2020 19:44:36 -0000
@@ -5,7 +5,7 @@ COMMENT = small and fast Qt image viewer
GH_ACCOUNT = nomacs
GH_PROJECT = nomacs
GH_TAGNAME = 3.12
-REVISION = 0
+REVISION = 1
CATEGORIES = graphics
Index: graphics/nomacs/patches/patch-src_DkCore_DkImageStorage_cpp
===================================================================
RCS file: graphics/nomacs/patches/patch-src_DkCore_DkImageStorage_cpp
diff -N graphics/nomacs/patches/patch-src_DkCore_DkImageStorage_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ graphics/nomacs/patches/patch-src_DkCore_DkImageStorage_cpp 13 Jan 2020
19:44:36 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix build with opencv 4.2
+
+Index: src/DkCore/DkImageStorage.cpp
+--- src/DkCore/DkImageStorage.cpp.orig
++++ src/DkCore/DkImageStorage.cpp
+@@ -1424,7 +1424,7 @@ void DkImage::mapGammaTable(cv::Mat& img, const QVecto
+ qDebug() << "gamma computation takes: " << dt;
+ }
+
+-void DkImage::logPolar(const cv::Mat& src, cv::Mat& dst, CvPoint2D32f center,
double scaleLog, double angle, double scale) {
++void DkImage::logPolar(const cv::Mat& src, cv::Mat& dst, cv::Point2d center,
double scaleLog, double angle, double scale) {
+
+ cv::Mat mapx, mapy;
+
Index: graphics/nomacs/patches/patch-src_DkCore_DkImageStorage_h
===================================================================
RCS file: graphics/nomacs/patches/patch-src_DkCore_DkImageStorage_h
diff -N graphics/nomacs/patches/patch-src_DkCore_DkImageStorage_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ graphics/nomacs/patches/patch-src_DkCore_DkImageStorage_h 13 Jan 2020
19:44:36 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix build with opencv 4.2
+
+Index: src/DkCore/DkImageStorage.h
+--- src/DkCore/DkImageStorage.h.orig
++++ src/DkCore/DkImageStorage.h
+@@ -95,7 +95,7 @@ class DllCoreExport DkImage { (public)
+ static void mapGammaTable(cv::Mat& img, const QVector<unsigned short>&
gammaTable);
+ static void gammaToLinear(cv::Mat& img);
+ static void linearToGamma(cv::Mat& img);
+- static void logPolar(const cv::Mat& src, cv::Mat& dst, CvPoint2D32f
center, double scaleLog, double angle, double scale = 1.0);
++ static void logPolar(const cv::Mat& src, cv::Mat& dst, cv::Point2d
center, double scaleLog, double angle, double scale = 1.0);
+ static void tinyPlanet(QImage& img, double scaleLog, double angle,
QSize s, bool invert = false);
+ #endif
+
