Attachment 222659 Details for Bug 253110 – pacth-Makefile

[patch] pacth-Makefile

patch-Makefile (text/plain), 8.93 KB, created by alt2600 on 2021-02-20 07:05:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: alt2600

Created: 2021-02-20 07:05:38 UTC

Size: 8.93 KB

patch

obsolete

>--- Makefile.orig	2021-02-19 22:12:31.383925000 -0500
>+++ Makefile	2021-02-20 01:12:03.700204000 -0500
>@@ -1,8 +1,8 @@
>-# $FreeBSD: head/graphics/opencv/Makefile 565123 2021-02-13 11:08:29Z mandree $
>+# $FreeBSD: head/graphics/opencv/Makefile 563430 2021-01-30 18:08:56Z tcberner $
> 
> PORTNAME=	opencv
> DISTVERSION=	4.5.1
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	graphics
> 
> MAINTAINER=	tcberner@FreeBSD.org
>@@ -11,84 +11,209 @@
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-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 \
>+		libhdf5.so:science/hdf5
> 
>-USES=		cmake compiler:c++14-lang eigen:3 jpeg localbase:ldflags pkgconfig python:3.6+,build
>+
>+USES=		cmake compiler:c++14-lang localbase:ldflags pkgconfig python:3.6+,build
> USE_GITHUB=	yes
> GH_PROJECT=	opencv_contrib:contrib \
> 		ade:ade \
> 		opencv_3rdparty:extra_mod_3rdparty_boost_descr \
>-		opencv_3rdparty:extra_mod_3rdparty_vgg_descr
>+		opencv_3rdparty:extra_mod_3rdparty_vgg_descr \
>+		opencv_3rdparty:extra_mod_3rdparty_face_alignment_dat
> GH_TAGNAME=	v0.1.1f:ade \
> 		34e4206aef44d50e6bbcd0ab06354b52e7466d26:extra_mod_3rdparty_boost_descr \
>-		fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d:extra_mod_3rdparty_vgg_descr
>+		fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d:extra_mod_3rdparty_vgg_descr \
>+		8afa57abc8229d611c4937165d20e2a2d9fc5a12:extra_mod_3rdparty_face_alignment_dat
> 
>-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_ON=	ENABLE_CONFIG_VERIFICATION \
>+		OPENCV_GENERATE_PKGCONFIG
>+
> CMAKE_OFF=	OPENCV_GENERATE_SETUPVARS \
> 		BUILD_opencv_python2 \
>-		BUILD_TESTS
>+		BUILD_ZLIB \
>+		BUILD_TIFF \
>+		BUILD_JASPER \
>+		BUILD_JPEG \
>+		BUILD_PNG \
>+		BUILD_OPENEXR \
>+		BUILD_WEBP \
>+		BUILD_TBB \
>+		BUILD_IPP_IW \
>+		BUILD_ITT \
>+		BUILD_TESTS \
>+		ENABLE_CCACHE \
>+		ENABLE_PRECOMPILED_HEADERS \
>+		WITH_AVFOUNDATION \
>+		WITH_CAP_IOS \
>+		WITH_CAROTENE \
>+		WITH_CPUFEATURES \
>+		WITH_VTK \
>+		WITH_CUDA \
>+		WITH_CUFFT \
>+		WITH_CUBLAS \
>+		WITH_CUDNN \
>+		WITH_NVCUVID \
>+		WITH_GTK \
>+		WITH_GTK_2_X \
>+		WITH_IPP \
>+		WITH_HALIDE \
>+		WITH_INF_ENGINE \
>+		WITH_NGRAPH \
>+		WITH_OPENGL \
>+		WITH_OPENVX \
>+		WITH_OPENNI \
>+		WITH_OPENNI2 \
>+		WITH_PVAPI \
>+		WITH_ARAVIS \
>+		WITH_QT \
>+		WITH_HPX \
>+		WITH_OPENMP \
>+		WITH_DSHOW \
>+		WITH_MSMF \
>+		WITH_MSMF_DXVA \
>+		WITH_XIMEA \
>+		WITH_UEYE \
>+		WITH_CLP \
>+		WITH_OPENCL_SVM \
>+		WITH_OPENCLAMDFFT \
>+		WITH_OPENCLAMDBLAS \
>+		WITH_DIRECTX \
>+		WITH_OPENCL_D3D11_NV \
>+		WITH_LIBREALSENSE \
>+		WITH_VA \
>+		WITH_VA_INTEL \
>+		WITH_MFX \
>+		WITH_ITT \
>+		WITH_ANDROID_MEDIANDK \
>+		WITH_TENGINE \
>+		WITH_ONNX
>+		
> CMAKE_ARGS=	-DOPENCV_EXTRA_MODULES_PATH="${WRKSRC}/contrib/modules" \
> 		-DOPENCV_PYTHON3_INSTALL_PATH=${PYTHON_SITELIBDIR} \
> 		-DVULKAN_INCLUDE_DIRS=${LOCALBASE}/include
> 
> DATADIR=	${PREFIX}/share/${PORTNAME}4
> 
>-OPTIONS_DEFINE=		HARDENING PYTHON JAVA LTO
>-OPTIONS_DEFAULT=	PYTHON
>+OPTIONS_DEFINE=		PYTHON JAVA EIGEN GDAL GDCM OPENCL TBB PATENTED PROTOBUF HARDENING LTO
> OPTIONS_SUB=		yes
>+OPTIONS_DEFAULT=	PYTHON OPENBLAS DC1394 EIGEN GDAL GPHOTO2 OPENJPEG JPEG OPENCL OPENEXR PNG TIFF VULKAN WEBP V4L PROTOBUF GSTREAMER GDCM XINE
>+OPTIONS_GROUP=		VIDEO IMAGEPROC
>+OPTIONS_GROUP_VIDEO=	DC1394 VULKAN WEBP FFMPEG V4L GSTREAMER XINE
>+OPTIONS_GROUP_IMAGEPROC=GPHOTO2 JPEG OPENEXR PNG TIFF
>+OPTIONS_SINGLE=		BLAS
>+OPTIONS_SINGLE_BLAS=	ATLAS OPENBLAS NOBLAS
>+OPTIONS_RADIO=		JPEG2K
>+OPTIONS_RADIO_JPEG2K=	JASPER OPENJPEG
> 
>-HARDENING_CMAKE_BOOL=	ENABLE_BUILD_HARDENING
>-HARDENING_DESC=		Enable hardening of the resulting binaries
>+ATLAS_DESC=         	ATLAS blas implementation with lapacke
>+ATLAS_LIB_DEPENDS=	libatlas.so:math/atlas \
>+			liblapacke.so:math/lapacke
> 
>-JAVA_CMAKE_BOOL=	BUILD_openv_java
>-JAVA_BUILD_DEPENDS=	ant:devel/apache-ant
>+OPENBLAS_DESC=		OpenBLAS blas implementation with lapacke
>+OPENBLAS_LIB_DEPENDS=	libopenblas.so:math/openblas \
>+			liblapacke.so:math/lapacke
> 
>+NOBLAS_DESC=		Disable support for lapack/blas
>+NOBLAS_CMAKE_ON=	-DWITH_LAPACK:BOOL=FALSE
>+
>+DC1394_DESC=		IEEE 1394 camera support
>+DC1394_CMAKE_BOOL=	WITH_1394
>+DC1394_LIB_DEPENDS=	libdc1394.so:multimedia/libdc1394
>+EIGEN_DESC=		Add Eigen v3 Support, builds sfm modules
>+EIGEN_CMAKE_BOOL=	WITH_EIGEN
>+EIGEN_USES=		eigen:3
>+GDAL_DESC=		Add Geospatial Data Abstraction Library Support
>+GDAL_CMAKE_BOOL=	WITH_GDAL
>+GDAL_LIB_DEPENDS=	libgdal.so:graphics/gdal
>+GDCM_DESC=		Add Open source DICOM library Support
>+GDCM_CMAKE_BOOL=	WITH_GDCM
>+GDCM_LIB_DEPENDS=	libgdcmMSFF.so:devel/gdcm
>+GPHOTO2_DESC=		Add Gphoto2 Support
>+GPHOTO2_CMAKE_BOOL=	WITH_GPHOTO2
>+GPHOTO2_LIB_DEPENDS=	libgphoto2.so:graphics/libgphoto2
>+JASPER_DESC=		Add Jasper Support for JPEG2000
>+JASPER_CMAKE_BOOL=	WITH_JASPER
>+JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
>+OPENJPEG_DESC=		Add OpenJPEG Support for JPEG2000, OpenCV preferred
>+OPENJPEG_CMAKE_BOOL=	WITH_OPENJPEG
>+OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
>+JPEG_DESC=		Add LibJpeg Support
>+JPEG_CMAKE_BOOL=	WITH_JPEG
>+JPEG_USES=		jpeg 
>+OPENCL_DESC=		Add OpenCL Support
>+OPENCL_CMAKE_BOOL=	WITH_OPENCL
>+OPENCL_BUILD_DEPENDS=	opencl>=0:devel/opencl
>+OPENCL_RUN_DEPENDS=	opencl>=0:devel/opencl
>+OPENEXR_DESC=		Add OpenEXR Support
>+OPENEXR_CMAKE_BOOL=	WITH_OPENEXR
>+OPENEXR_LIB_DEPENDS=	libIlmImf.so:graphics/openexr
>+PNG_DESC=		Add LibPNG Support
>+PNG_CMAKE_BOOL=		WITH_PNG
>+PNG_LIB_DEPENDS=	libpng16.so:graphics/png
>+TBB_DESC=		Add Intel Threading Building Blocks Support
>+TBB_CMAKE_BOOL=		WITH_TBB
>+TBB_LIB_DEPENDS=	libtbb.so:devel/tbb
>+TIFF_DESC=		Add LibTIFF Support
>+TIFF_CMAKE_BOOL=	WITH_TIFF
>+TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
>+VULKAN_DESC=		Add Vulkan Support
>+VULKAN_CMAKE_BOOL=	WITH_VULKAN
>+VULKAN_BUILD_DEPENDS=	vulkan-headers>0:graphics/vulkan-headers
>+GSTREAMER_DESC=		Add GSTREAMER Support
>+GSTREAMER_CMAKE_BOOL=	WITH_GSTREAMER
>+GSTREAMER_USE=		GSTREAMER1=yes
>+WEBP_DESC=		Add Webp Support
>+WEBP_CMAKE_BOOL=	WITH_WEBP
>+WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
>+PATENTED_DESC=		Enable patented 2d feature detection USE AT OWN RISK
>+PATENTED_CMAKE_BOOL=	OPENCV_ENABLE_NONFREE
>+FFMPEG_DESC=		Link with ffmpeg, circular dependancy possible
>+FFMPEG_CMAKE_BOOL=	WITH_FFMPEG
>+FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
>+V4L_DESC=		Enable support for Video for Linux
>+V4L_CMAKE_BOOL=		WITH_V4L WITH_LIBV4L
>+V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
>+V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
>+PROTOBUF_DESC=		Enable protobuf support, builds dnn modules
>+PROTOBUF_CMAKE_BOOL=	WITH_PROTOBUF
>+PROTOBUF_LIB_DEPENDS=	libprotobuf.so:devel/protobuf
>+XINE_DESC=		Add Xine Support
>+XINE_CMAKE_BOOL=	WITH_XINE
>+XINE_LIB_DEPENDS=	libxine.so:multimedia/libxine
>+JAVA_DESC=		Enable Java Support
>+JAVA_CMAKE_BOOL=	BUILD_opencv_java BUILD_opencv_java_bindings_generator BUILD_JAVA 
>+JAVA_BUILD_DEPENDS=	ant:devel/apache-ant
>+PYTHON_DESC=		Enable Python Support 3.6 or greater
> PYTHON_BUILD_DEPENDS=	${PYNUMPY}
> PYTHON_RUN_DEPENDS=	${PYNUMPY}
> PYTHON_USES=		python:3.6+
> PYTHON_USE_PYTHON=	noflavors
> PYTHON_CMAKE_BOOL=	BUILD_opencv_python3
>-
>+HARDENING_DESC=		Enables Build Hardening
>+HARDENING_CMAKE_BOOL=	ENABLE_BUILD_HARDENING
>+LTO_DESC=		Enables Link Time Optimizations
> LTO_CMAKE_BOOL=		ENABLE_THIN_LTO
> 
>+
> 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
>-
>+	${MKDIR} ${BUILD_WRKSRC}/downloads/xfeatures2d
>+	${MV} ${WRKSRC_extra_mod_3rdparty_boost_descr}/* ${BUILD_WRKSRC}/downloads/xfeatures2d
>+	${MV} ${WRKSRC_extra_mod_3rdparty_vgg_descr}/* ${BUILD_WRKSRC}/downloads/xfeatures2d
>+	${MKDIR} ${BUILD_WRKSRC}/share/opencv4/testdata/cv/face
>+	${MV} ${WRKSRC_extra_mod_3rdparty_face_alignment_dat}/* ${BUILD_WRKSRC}/share/opencv4/testdata/cv/face
>+post-patch:
>+	${REINPLACE_CMD} -e 's|/usr/lib/atlas-base|${LOCALBASE}/lib|g' ${WRKSRC}/cmake/OpenCVFindAtlas.cmake
>+	${REINPLACE_CMD} -e 's|/usr/include/atlas|${LOCALBASE}/include|g' ${WRKSRC}/cmake/OpenCVFindAtlas.cmake
>+	${REINPLACE_CMD} -e 's|/libpng/png.h|/libpng16/png.h|g' ${WRKSRC}/cmake/OpenCVFindLibsGrfmt.cmake
>+	${REINPLACE_CMD} -e 's|<libpng/png.h>|<libpng16/png.h>|g' ${WRKSRC}/modules/imgcodecs/src/grfmt_png.cpp
> .include <bsd.port.mk>

Actions: View | Diff

Attachments on bug 253110: 222058 | 222147 | 222148 | 222149 | 222150 | 222151 | 222152 | 222153 | 222659 | 222660 | 222661 | 222662 | 225777