mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-24 04:33:24 +00:00
graphics/opencv: update to 4.5.1 -- and make port more easily maintainable
This is a major upgrade from 3.x to 4.x. Changelog from versions 3.4.1--4.5.1 can be found here: https://github.com/opencv/opencv/wiki/ChangeLog Note: this has explicitely not been added as a new graphics/opencv4 port, but replaces the previous graphics/opencv[3] port. Again, to improve maintainability by not giving ports the option to pick the "wrong one" - this leads however to some abandoned ports being broken. The port has been greatly simplified: * graphics/opencv-core which existed to enable ffmpeg to depend on opencv, and vice versa has been removed. ffmpeg no longer can depend on opencv. * graphics/py-opencv has been integrated into graphics/opencv, the default versions python bindings will be built unless the PYTHON option is explicitely turned off. * graphics/opencv-java has been integrated into graphics/opencv -- it is off by default, but can be enabled by toggling the JAVA option -- there are no consumers in the tree, so that option might go away in the future. * All the previous options have been removed and replaced by a (hopefully) sane set of dependencies that make the port and package most usable for the majority of consumers. - Please let me know if you think there are better defaults (i.e. anything that is missing, or something that should not be dependet on). - If you think something should be added or removed, please open a bug report. - If you think something should be added as an optional dependency, please open a bug report (with a good reason [tm]). The depending ports have been updated to work against opencv4, or marked broken. * Ports broken: - graphics/rubygem-objectdetect: OpenCV4 no longer ships opencv-1.0 API - graphics/p5-Image-ObjectDetect: OpenCV4 no longer ships opencv-1.0 API - graphics/gimp-gmic-plugin: OpenCV4 no longer ships opencv-1.0 API * Backports: - misc/visp:dfa7e4bd47
- multimedia/zart:6ca1964690
,d3a2931b1a
* Others: - misc/actiona: switch to pkgconfig 'opencv4' - multimedia/libav: drop opencv support - misc/darknet: already failed to build prior to the upgrade - math/saga: remove patching added to work against opencv3
This commit is contained in:
parent
33809b22ad
commit
7a09f7fbc2
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=563430
3
MOVED
3
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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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 =
|
||||
|
@ -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
|
||||
|
@ -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 \
|
||||
|
@ -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
|
||||
|
||||
|
@ -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 \
|
||||
|
@ -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
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
# Created by: Koop Mast <kwm@FreeBSD.org>
|
||||
# $FreeBSD$
|
||||
|
||||
PORTREVISION= 6
|
||||
PORTREVISION= 7
|
||||
CATEGORIES= graphics
|
||||
|
||||
COMMENT= Gstreamer opencv real time computer vision plugin
|
||||
|
@ -1,6 +1,6 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTREVISION= 0
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= graphics
|
||||
|
||||
COMMENT= GStreamer opencv real time computer vision plugin
|
||||
|
@ -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
|
||||
|
||||
|
@ -1,14 +0,0 @@
|
||||
# Created by: Martin Matuska <mm@FreeBSD.org>
|
||||
# $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"
|
@ -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
|
@ -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"
|
@ -1,2 +0,0 @@
|
||||
%%DATADIR%%/java/libopencv_java%%OCV_VER%%.so
|
||||
%%DATADIR%%/java/opencv-%%OCV_VER%%.jar
|
@ -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|<malloc.h>|<stdlib.h>|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 <bsd.port.pre.mk>
|
||||
|
||||
.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 <bsd.port.post.mk>
|
||||
.include <bsd.port.mk>
|
||||
|
@ -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
|
||||
|
@ -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} )
|
@ -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)
|
||||
|
@ -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 <glog/logging.h>\n#include <gflags/gflags.h>\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()
|
||||
|
@ -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,
|
@ -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);
|
@ -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)
|
@ -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__)
|
@ -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 <altivec.h>
|
||||
# undef vector
|
||||
# undef pixel
|
||||
# undef bool
|
||||
+# include <altivec.h>
|
||||
# define CV_VSX 1
|
||||
#endif
|
||||
|
||||
@@ -152,10 +152,10 @@ struct VZeroUpperGuard {
|
||||
# include <arm_neon.h>
|
||||
# define CV_NEON 1
|
||||
#elif defined(__VSX__) && defined(__PPC64__) && defined(__LITTLE_ENDIAN__)
|
||||
-# include <altivec.h>
|
||||
# undef vector
|
||||
# undef pixel
|
||||
# undef bool
|
||||
+# include <altivec.h>
|
||||
# define CV_VSX 1
|
||||
#endif
|
||||
|
@ -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 <stdint.h>
|
||||
#endif
|
||||
|
||||
|
@ -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 <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <float.h>
|
||||
+#include <math.h>
|
||||
#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 *******************/
|
@ -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 <errno.h>
|
||||
#include <io.h>
|
||||
#include <stdio.h>
|
||||
-#elif defined __linux__ || defined __APPLE__
|
||||
+#elif defined __linux__ || defined __APPLE__ || defined(__FreeBSD__)
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
@@ -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))
|
||||
{
|
@ -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 <dlfcn.h>
|
||||
#include <stdio.h>
|
||||
typedef void* VulkanHandle;
|
@ -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})
|
@ -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 );
|
@ -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);
|
@ -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 <stdio.h>
|
||||
+#include <stdlib.h>
|
||||
#include <gtk/gtk.h>
|
||||
+#include <gdk/gdk.h>
|
||||
#include <gdk/gdkkeysyms.h>
|
||||
#include <gdk-pixbuf/gdk-pixbuf.h>
|
||||
-#include <stdio.h>
|
||||
|
||||
#if (GTK_MAJOR_VERSION == 3)
|
||||
#define GTK_VERSION3 1
|
@ -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 )
|
@ -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);
|
@ -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 <sys/mman.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
+#ifdef __linux__
|
||||
#include <asm/types.h> /* for videodev2.h */
|
||||
+#endif
|
||||
#include <assert.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/ioctl.h>
|
||||
@@ -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;
|
@ -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 <unistd.h> // sleep
|
||||
+#endif
|
||||
|
||||
using namespace cv;
|
||||
using namespace std;
|
@ -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 <unistd.h> // sleep
|
||||
+#endif
|
||||
|
||||
using namespace std;
|
||||
using namespace cv;
|
12
graphics/opencv/files/patch-modules_videoio_src_cap__v4l.cpp
Normal file
12
graphics/opencv/files/patch-modules_videoio_src_cap__v4l.cpp
Normal file
@ -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 <poll.h>
|
||||
|
||||
#ifdef HAVE_CAMV4L2
|
||||
+#ifdef __linux__
|
||||
#include <asm/types.h> /* for videodev2.h */
|
||||
+#endif
|
||||
#include <linux/videodev2.h>
|
||||
#endif
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -3,7 +3,7 @@
|
||||
|
||||
PORTNAME= pfstools
|
||||
DISTVERSION= 2.1.0
|
||||
PORTREVISION= 6
|
||||
PORTREVISION= 7
|
||||
CATEGORIES= graphics
|
||||
MASTER_SITES= SF
|
||||
|
||||
|
@ -3,7 +3,7 @@
|
||||
|
||||
PORTNAME= facedetect
|
||||
PORTVERSION= 1.1
|
||||
PORTREVISION= 10
|
||||
PORTREVISION= 11
|
||||
CATEGORIES= graphics
|
||||
PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}
|
||||
|
||||
|
@ -1,17 +0,0 @@
|
||||
# Created by: Martin Matuska <mm@FreeBSD.org>
|
||||
# $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"
|
@ -1 +0,0 @@
|
||||
%%PYTHON_SITELIBDIR%%/cv2.so
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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 \
|
||||
|
@ -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\
|
@ -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
|
||||
|
||||
|
@ -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"
|
||||
|
@ -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>
|
||||
|
@ -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 \
|
||||
|
@ -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
|
@ -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 \
|
||||
|
@ -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
|
||||
|
@ -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})
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
11
multimedia/zart/files/patch-zart.pro
Normal file
11
multimedia/zart/files/patch-zart.pro
Normal file
@ -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
|
@ -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.*
|
||||
|
||||
|
@ -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 \
|
||||
|
Loading…
Reference in New Issue
Block a user