cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update opencv to 3.4.7

Browse Source 
Notable port changes:

- Remove -docs to avoid java conflicts with JDK 8 and 11.
- Upstream switched completely to github
- Sort CONFIGURE_ARGS
- Add patch to install licenses files at the old location.
- ONLY_FOR_ARCHS-java = aarch64 amd64 i386

ok kurt@
This commit is contained in:
rsadowski 2019-09-27 05:49:56 +00:00
parent 66c2c48aa7
commit fe71728367
10 changed files with 90 additions and 10929 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
graphics/opencv/Makefile
View File

@ -1,53 +1,51 @@
# $OpenBSD: Makefile,v 1.50 2019/07/02 10:13:03 jca Exp $
# $OpenBSD: Makefile,v 1.51 2019/09/27 05:49:56 rsadowski Exp $
ONLY_FOR_ARCHS = ${GCC4_ARCHS} ${CLANG_ARCHS}
ONLY_FOR_ARCHS-java = aarch64 amd64 i386
CATEGORIES = graphics devel
COMMENT-docs = OpenCV documentation and examples
COMMENT-main = library for computer vision real-time processin
COMMENT-java = Java bindings for OpenCV
V = 3.4.2
REVISION = 1
DISTNAME = opencv-${V}
V = 3.4.7
GH_ACCOUNT = opencv
GH_PROJECT = opencv
GH_TAGNAME = ${V}
PKGNAME-main = opencv-${V}
PKGNAME-docs = opencv-docs-$V
PKGNAME-java = opencv-java-${V}
HOMEPAGE = https://www.opencv.org/
MAINTAINER = Rafael Sadowski <rsadowski@openbsd.org>
DISTFILES = opencv-{opencv/archive/}${V}${EXTRACT_SUFX}
.for i in opencv_calib3d opencv_core opencv_features2d \
opencv_flann opencv_highgui opencv_imgproc \
opencv_ml opencv_objdetect opencv_photo opencv_stitching \
opencv_superres opencv_video opencv_videostab opencv_imgcodecs \
opencv_shape opencv_videoio opencv_dnn
SHARED_LIBS += $i 4.0
SHARED_LIBS += $i 5.0
.endfor
WANTLIB-main += ${COMPILER_LIBCXX} Half Iex IlmImf IlmThread Imath
WANTLIB-main += atk-1.0 avcodec avformat avresample avutil c cairo
WANTLIB-main += cairo-gobject gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB-main += gobject-2.0 gphoto2 gphoto2_port gstapp-1.0 gstbase-1.0
WANTLIB-main += gstpbutils-1.0 gstreamer-1.0 gstriff-1.0 gstvideo-1.0
WANTLIB-main += gthread-2.0 gtk-3 intl jasper jpeg m pango-1.0 pangocairo-1.0
WANTLIB-main += png swscale tiff webp z
WANTLIB += ${COMPILER_LIBCXX} Half Iex IlmImf IlmThread Imath
WANTLIB += atk-1.0 avcodec avformat avresample avutil c cairo
WANTLIB += cairo-gobject gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB += gobject-2.0 gstapp-1.0 gstaudio-1.0 gstbase-1.0 gstpbutils-1.0
WANTLIB += gstreamer-1.0 gstriff-1.0 gstvideo-1.0 gthread-2.0
WANTLIB += gtk-3 intl jasper jpeg m pango-1.0 pangocairo-1.0 png
WANTLIB += swscale tiff webp z
WANTLIB-java += ${COMPILER_LIBCXX} m opencv_calib3d opencv_core opencv_features2d
WANTLIB-java += opencv_flann opencv_highgui opencv_imgcodecs opencv_imgproc
WANTLIB-java += opencv_ml opencv_objdetect opencv_photo opencv_video
WANTLIB-java += opencv_videoio
WANTLIB-docs =
WANTLIB += ${COMPILER_LIBCXX} m opencv_calib3d opencv_core opencv_dnn
WANTLIB += opencv_features2d opencv_flann opencv_highgui opencv_imgcodecs
WANTLIB += opencv_imgproc opencv_ml opencv_objdetect opencv_photo
WANTLIB += opencv_video opencv_videoio
COMPILER = base-clang ports-gcc
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=opencvlibrary/}
EXTRACT_SUFX = .zip
MULTI_PACKAGES = -main -docs -java
PSEUDO_FLAVORS = no_docs no_java
MULTI_PACKAGES = -main -java
PSEUDO_FLAVORS = no_java
FLAVOR ?=
# BSDL
@ -58,12 +56,10 @@ PERMIT_PACKAGE = Yes
MODULES = devel/cmake \
lang/python
BUILD_DEPENDS = devel/doxygen \
math/py-numpy \
BUILD_DEPENDS = math/py-numpy \
math/eigen3
RUN_DEPENDS-main = math/py-numpy
RUN_DEPENDS-docs = ${BUILD_PKGPATH},-main
RUN_DEPENDS-java = ${MODJAVA_RUN_DEPENDS}
LIB_DEPENDS-main = ${LIB_DEPENDS} \
@ -89,34 +85,22 @@ CONFIGURE_ENV = CFLAGS="${CFLAGS} -fPIC" \
# ATM opencv requires V4L1 compat, ask them to change it,
# then see WITH_V4L below.
CONFIGURE_ARGS = -DWITH_1394=Off \
-DWITH_VTK=Off \
CONFIGURE_ARGS = -DBUILD_DOCS=Off \
-DBUILD_EXAMPLES=Off \
-DBUILD_IPP_IW=Off \
-DBUILD_ITT=Off \
-DBUILD_PERF_TESTS=Off \
-DBUILD_TESTS=Off \
-DENABLE_SSE3=Off \
-DINSTALL_PYTHON_EXAMPLES=Off \
-DINSTALL_TESTS=Off \
-DWITH_1394=Off \
-DWITH_CUDA=Off \
-DWITH_EIGEN=Off \
-DWITH_V4L=Off \
-DWITH_IPP=Off \
-DWITH_OPENCL=Off \
-DBUILD_ITT=Off \
-DBUILD_IPP_IW=Off \
-DENABLE_SSE3=Off \
-DBUILD_TESTS=Off \
-DBUILD_PERF_TESTS=Off \
-DINSTALL_TESTS=Off \
CONFIGURE_ARGS += -DCMAKE_POLICY_DEFAULT_CMP0058=NEW
.if ${BUILD_PACKAGES:M-docs}
BUILD_DEPENDS += textproc/py-sphinx
ALL_TARGET = all doxygen
CONFIGURE_ARGS += -DBUILD_DOCS=On \
-DBUILD_EXAMPLES=On \
-DINSTALL_C_EXAMPLES=On \
-DINSTALL_PYTHON_EXAMPLES=On
.else
CONFIGURE_ARGS += -DBUILD_DOCS=Off \
-DBUILD_EXAMPLES=Off \
-DINSTALL_PYTHON_EXAMPLES=Off
.endif
-DWITH_V4L=Off \
-DWITH_VTK=Off
.if ${BUILD_PACKAGES:M-java}
MODULES += java

4
graphics/opencv/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (opencv-3.4.2.zip) = lAXF19irFpbphjHQySElgWNW7DZqc8QXvcxNdHg7Qqo=
SIZE (opencv-3.4.2.zip) = 91570120
SHA256 (opencv-3.4.7.tar.gz) = 6nQ4lqYEproeHBZRrULJfQ+QFl3r6ZQIEcfgvaowdSY=
SIZE (opencv-3.4.7.tar.gz) = 88350165

14
graphics/opencv/patches/patch-CMakeLists_txt Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-CMakeLists_txt,v 1.9 2019/09/27 05:49:56 rsadowski Exp $
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -616,7 +616,7 @@ else()
ocv_update(OPENCV_SAMPLES_SRC_INSTALL_PATH share/OpenCV/samples)
ocv_update(OPENCV_JAR_INSTALL_PATH share/OpenCV/java)
ocv_update(OPENCV_OTHER_INSTALL_PATH share/OpenCV)
- ocv_update(OPENCV_LICENSES_INSTALL_PATH "${CMAKE_INSTALL_DATAROOTDIR}/licenses/opencv3")
+ ocv_update(OPENCV_LICENSES_INSTALL_PATH "${CMAKE_INSTALL_DATAROOTDIR}/OpenCV/licenses/")
if(NOT DEFINED OPENCV_CONFIG_INSTALL_PATH)
math(EXPR SIZEOF_VOID_P_BITS "8 * ${CMAKE_SIZEOF_VOID_P}")

4
graphics/opencv/patches/patch-cmake_OpenCVFindLibsVideo_cmake
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-cmake_OpenCVFindLibsVideo_cmake,v 1.6 2019/03/23 07:26:56 rsadowski Exp $
$OpenBSD: patch-cmake_OpenCVFindLibsVideo_cmake,v 1.7 2019/09/27 05:49:56 rsadowski Exp $
Index: cmake/OpenCVFindLibsVideo.cmake
--- cmake/OpenCVFindLibsVideo.cmake.orig
+++ cmake/OpenCVFindLibsVideo.cmake
@@ -186,7 +186,6 @@ if(WITH_V4L)
@@ -185,7 +185,6 @@ if(WITH_V4L)
endif()
endif()
CHECK_INCLUDE_FILE(linux/videodev.h HAVE_CAMV4L)

4
graphics/opencv/patches/patch-modules_core_src_system_cpp
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-modules_core_src_system_cpp,v 1.5 2019/03/23 07:26:56 rsadowski Exp $
$OpenBSD: patch-modules_core_src_system_cpp,v 1.6 2019/09/27 05:49:56 rsadowski Exp $
Fix build on i386.
Index: modules/core/src/system.cpp
--- modules/core/src/system.cpp.orig
+++ modules/core/src/system.cpp
@@ -185,9 +185,12 @@ std::wstring GetTempFileNameWinRT(std::wstring prefix)
@@ -189,9 +189,12 @@ std::wstring GetTempFileNameWinRT(std::wstring prefix)
#endif
#else

19
graphics/opencv/patches/patch-modules_dnn_src_torch_THGeneral_cpp
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-modules_dnn_src_torch_THGeneral_cpp,v 1.1 2019/03/23 07:26:56 rsadowski Exp $
Index: modules/dnn/src/torch/THGeneral.cpp
--- modules/dnn/src/torch/THGeneral.cpp.orig
+++ modules/dnn/src/torch/THGeneral.cpp
@@ -1,10 +1,12 @@
#include "../precomp.hpp"
#if defined(TH_DISABLE_HEAP_TRACKING)
-#elif (defined(__unix) || defined(_WIN32))
+#elif (defined(__unix) || defined(_WIN32)) && !defined(__OpenBSD__)
#include <malloc.h>
#elif defined(__APPLE__)
#include <malloc/malloc.h>
+#elif defined(__OpenBSD__)
+#include <stdlib.h>
#endif
#include "THGeneral.h"

4
graphics/opencv/pkg/DESCR-docs
View File

@ -1,4 +0,0 @@
The Open Computer Vision Library is a collection of algorithms and sample
code for various computer vision problems.
This package contains OpenCV documentation and examples.

10843
graphics/opencv/pkg/PLIST-docs
View File

File diff suppressed because it is too large Load Diff

6
graphics/opencv/pkg/PLIST-java
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-java,v 1.6 2019/03/23 07:26:56 rsadowski Exp $
@comment $OpenBSD: PLIST-java,v 1.7 2019/09/27 05:49:56 rsadowski Exp $
share/OpenCV/java/
share/OpenCV/java/libopencv_java342.so
share/OpenCV/java/opencv-342.jar
share/OpenCV/java/libopencv_java347.so
share/OpenCV/java/opencv-347.jar

33
graphics/opencv/pkg/PLIST-main
View File

@ -1,10 +1,11 @@
@comment $OpenBSD: PLIST-main,v 1.8 2019/03/23 07:26:56 rsadowski Exp $
@comment $OpenBSD: PLIST-main,v 1.9 2019/09/27 05:49:56 rsadowski Exp $
@bin bin/opencv_annotation
@bin bin/opencv_createsamples
@bin bin/opencv_interactive-calibration
@bin bin/opencv_traincascade
@bin bin/opencv_version
@bin bin/opencv_visualisation
bin/setup_vars_opencv3.sh
include/opencv/
include/opencv/cv.h
include/opencv/cv.hpp
@ -25,7 +26,9 @@ include/opencv2/calib3d/calib3d_c.h
include/opencv2/core/
include/opencv2/core.hpp
include/opencv2/core/affine.hpp
include/opencv2/core/async.hpp
include/opencv2/core/base.hpp
include/opencv2/core/bindings_utils.hpp
include/opencv2/core/bufferpool.hpp
include/opencv2/core/check.hpp
include/opencv2/core/core.hpp
@ -71,6 +74,9 @@ include/opencv2/core/cv_cpu_helper.h
include/opencv2/core/cvdef.h
include/opencv2/core/cvstd.hpp
include/opencv2/core/cvstd.inl.hpp
include/opencv2/core/detail/
include/opencv2/core/detail/async_promise.hpp
include/opencv2/core/detail/exception_ptr.hpp
include/opencv2/core/directx.hpp
include/opencv2/core/eigen.hpp
include/opencv2/core/fast_math.hpp
@ -78,9 +84,13 @@ include/opencv2/core/hal/
include/opencv2/core/hal/hal.hpp
include/opencv2/core/hal/interface.h
include/opencv2/core/hal/intrin.hpp
include/opencv2/core/hal/intrin_avx.hpp
include/opencv2/core/hal/intrin_avx512.hpp
include/opencv2/core/hal/intrin_cpp.hpp
include/opencv2/core/hal/intrin_forward.hpp
include/opencv2/core/hal/intrin_neon.hpp
include/opencv2/core/hal/intrin_sse.hpp
include/opencv2/core/hal/intrin_sse_em.hpp
include/opencv2/core/hal/intrin_vsx.hpp
include/opencv2/core/ippasync.hpp
include/opencv2/core/mat.hpp
@ -117,6 +127,7 @@ include/opencv2/core/ovx.hpp
include/opencv2/core/persistence.hpp
include/opencv2/core/ptr.inl.hpp
include/opencv2/core/saturate.hpp
include/opencv2/core/simd_intrinsics.hpp
include/opencv2/core/softfloat.hpp
include/opencv2/core/sse_utils.hpp
include/opencv2/core/traits.hpp
@ -124,6 +135,8 @@ include/opencv2/core/types.hpp
include/opencv2/core/types_c.h
include/opencv2/core/utility.hpp
include/opencv2/core/utils/
include/opencv2/core/utils/allocator_stats.hpp
include/opencv2/core/utils/allocator_stats.impl.hpp
include/opencv2/core/utils/filesystem.hpp
include/opencv2/core/utils/logger.defines.hpp
include/opencv2/core/utils/logger.hpp
@ -142,6 +155,8 @@ include/opencv2/dnn/dnn.inl.hpp
include/opencv2/dnn/layer.details.hpp
include/opencv2/dnn/layer.hpp
include/opencv2/dnn/shape_utils.hpp
include/opencv2/dnn/utils/
include/opencv2/dnn/utils/inference_engine.hpp
include/opencv2/features2d/
include/opencv2/features2d.hpp
include/opencv2/features2d/features2d.hpp
@ -255,6 +270,7 @@ include/opencv2/video/video.hpp
include/opencv2/videoio/
include/opencv2/videoio.hpp
include/opencv2/videoio/cap_ios.h
include/opencv2/videoio/registry.hpp
include/opencv2/videoio/videoio.hpp
include/opencv2/videoio/videoio_c.h
include/opencv2/videostab/
@ -291,7 +307,19 @@ include/opencv2/videostab/wobble_suppression.hpp
@lib lib/libopencv_videoio.so.${LIBopencv_videoio_VERSION}
@lib lib/libopencv_videostab.so.${LIBopencv_videostab_VERSION}
lib/pkgconfig/opencv.pc
lib/python${MODPY_VERSION}/site-packages/cv2.so
lib/python${MODPY_VERSION}/site-packages/cv2/
lib/python${MODPY_VERSION}/site-packages/cv2/__init__.py
lib/python${MODPY_VERSION}/site-packages/cv2/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/cv2/config-${MODPY_VERSION}.py
lib/python${MODPY_VERSION}/site-packages/cv2/config-${MODPY_VERSION}.pyc
lib/python${MODPY_VERSION}/site-packages/cv2/config.py
lib/python${MODPY_VERSION}/site-packages/cv2/config.pyc
lib/python${MODPY_VERSION}/site-packages/cv2/load_config_py2.py
lib/python${MODPY_VERSION}/site-packages/cv2/load_config_py2.pyc
lib/python${MODPY_VERSION}/site-packages/cv2/load_config_py3.py
lib/python${MODPY_VERSION}/site-packages/cv2/load_config_py3.pyc
lib/python${MODPY_VERSION}/site-packages/cv2/python-${MODPY_VERSION}/
lib/python${MODPY_VERSION}/site-packages/cv2/python-${MODPY_VERSION}/cv2.so
share/OpenCV/
share/OpenCV/OpenCVConfig-version.cmake
share/OpenCV/OpenCVConfig.cmake
@ -325,5 +353,6 @@ share/OpenCV/licenses/
share/OpenCV/licenses/SoftFloat-COPYING.txt
share/OpenCV/licenses/protobuf-LICENSE
share/OpenCV/licenses/protobuf-README.md
share/OpenCV/licenses/quirc-LICENSE
share/OpenCV/valgrind.supp
share/OpenCV/valgrind_3rdparty.supp