On 2020/01/19 16:18, Rafael Sadowski wrote: > On Sun Jan 19, 2020 at 02:05:29PM +0000, Stuart Henderson wrote: > > On 2020/01/18 02:04, Rafael Sadowski wrote: > > > CVSROOT: /cvs > > > Module name: ports > > > Changes by: [email protected] 2020/01/18 02:04:59 > > > > > > Modified files: > > > graphics/opencv: Makefile distinfo > > > graphics/opencv/patches: patch-cmake_OpenCVFindLibsGrfmt_cmake > > > patch-modules_core_src_system_cpp > > > graphics/opencv/pkg: PLIST-java PLIST-main > > > Removed files: > > > graphics/opencv/patches: patch-CMakeLists_txt > > > patch-cmake_OpenCVFindLibsVideo_cmake > > > > > > Log message: > > > Update opencv to 4.2 > > > > > > CMake renames like off to OFF and so one. > > > > > > > Fails to package: > > > > Here is a quick fix to unbreak opencv. > > - Remove deprecated option ENABLE_SSE3. > - Disable ADE (gapi) support because this requires to download ADE > during configure. > > Sorry for the noise. OK?
Please bump REVISION as well. Looking at the CPU feature detection, they have "baseline" which is minimum required, and "dispatched" which is various other ones built in, then it should do runtime detection. I haven't verified that but it seems likely to work so I think your diff that just removes ENABLE_SSE3=OFF is correct. (Docs at https://github.com/opencv/opencv/wiki/CPU-optimizations-build-options). OK with the bump. > Index: Makefile > =================================================================== > RCS file: /cvs/ports/graphics/opencv/Makefile,v > retrieving revision 1.55 > diff -u -p -u -p -r1.55 Makefile > --- Makefile 18 Jan 2020 09:04:59 -0000 1.55 > +++ Makefile 19 Jan 2020 15:09:40 -0000 > @@ -24,7 +24,7 @@ DISTFILES = opencv-{opencv/archive/}${V > .for i in opencv_calib3d opencv_core opencv_features2d \ > opencv_flann opencv_highgui opencv_imgproc opencv_ml opencv_objdetect \ > opencv_photo opencv_stitching opencv_video opencv_imgcodecs \ > - opencv_videoio opencv_dnn opencv_gapi > + opencv_videoio opencv_dnn > SHARED_LIBS += $i 6.0 > .endfor > > @@ -95,10 +95,10 @@ CONFIGURE_ARGS = -DBUILD_DOCS=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_ADE=OFF \ > -DWITH_CUDA=OFF \ > -DWITH_EIGEN=OFF \ > -DWITH_IPP=OFF \ > Index: pkg/PLIST-main > =================================================================== > RCS file: /cvs/ports/graphics/opencv/pkg/PLIST-main,v > retrieving revision 1.10 > diff -u -p -u -p -r1.10 PLIST-main > --- pkg/PLIST-main 18 Jan 2020 09:04:59 -0000 1.10 > +++ pkg/PLIST-main 19 Jan 2020 15:09:40 -0000 > @@ -193,77 +193,6 @@ 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 > @@ -342,7 +271,6 @@ lib/cmake/opencv4/OpenCVModules.cmake > @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} > @@ -368,7 +296,6 @@ lib/python${MODPY_VERSION}/site-packages > 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
