diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/actiona/Makefile | 6 | ||||
| -rw-r--r-- | misc/darknet/Makefile | 3 | ||||
| -rw-r--r-- | misc/mxnet/Makefile | 4 | ||||
| -rw-r--r-- | misc/visp/Makefile | 4 | ||||
| -rw-r--r-- | misc/visp/files/patch-modules_vision_src_key-point_vpKeyPoint.cpp | 20 |
5 files changed, 30 insertions, 7 deletions
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 <bsd.port.pre.mk> 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<cv::FeatureDetector> siftDetector = cv::xfeatures2d::SIFT::create(); ++ cv::Ptr<cv::FeatureDetector> 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 |