diff options
| author | Philipp Zabel <p.zabel@pengutronix.de> | 2020-08-28 11:43:23 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-08-30 22:01:22 +0200 |
| commit | 5ab305a1cc3f512d6d5c377c07f279b906843b52 (patch) | |
| tree | c6eec243b52093197265ae6f31f9adcd21dfe220 /rules/opencv.make | |
| parent | 192d8820d5f0f6ae9595f98e962de78ce5443d60 (diff) | |
| download | ptxdist-5ab305a1cc3f512d6d5c377c07f279b906843b52.tar.gz ptxdist-5ab305a1cc3f512d6d5c377c07f279b906843b52.tar.xz | |
opencv: version bump 4.2.0 -> 4.4.0
- Set a few more options to their default values
- Remove carotene options
- Remove duplicated pkgconfig option
- Only install examples if they are built
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Message-Id: <20200828094323.23958-1-p.zabel@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/opencv.make')
| -rw-r--r-- | rules/opencv.make | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/rules/opencv.make b/rules/opencv.make index 844b39f05..ff63b0460 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_OPENCV) += opencv # Paths and names # -OPENCV_VERSION := 4.2.0 -OPENCV_MD5 := b02b54115f1f99cb9e885d1e5988ff70 +OPENCV_VERSION := 4.4.0 +OPENCV_MD5 := 4b00f5cdb1cf393c4a84696362c5a72a OPENCV := opencv-$(OPENCV_VERSION) OPENCV_SUFFIX := zip OPENCV_URL := \ @@ -28,6 +28,7 @@ OPENCV_SOURCE := $(SRCDIR)/$(OPENCV).$(OPENCV_SUFFIX) OPENCV_DIR := $(BUILDDIR)/$(OPENCV) OPENCV_LICENSE := BSD OPENCV_BUILD_DIR := $(OPENCV_DIR)-build + # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- @@ -40,6 +41,7 @@ OPENCV_CONF_OPT := \ -DBUILD_CUDA_STUBS:BOOL=OFF \ -DBUILD_DOCS:BOOL=OFF \ -DBUILD_EXAMPLES:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_EXAMPLES) \ + -DBUILD_IPP_IW=ON \ -DBUILD_ITT=ON \ -DBUILD_JASPER=OFF \ -DBUILD_JAVA=OFF \ @@ -80,7 +82,6 @@ OPENCV_CONF_OPT := \ -DBUILD_opencv_videoio:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_VIDEOIO) \ -DBUILD_opencv_video:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_VIDEO) \ -DBUILD_opencv_world:BOOL=OFF \ - -DCAROTENE_NS=carotene_o4t \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DCPU_BASELINE=DETECT \ -DCPU_DISPATCH= \ @@ -103,6 +104,7 @@ OPENCV_CONF_OPT := \ -DENABLE_PROFILING=OFF \ -DENABLE_SOLUTION_FOLDERS=OFF \ -DENABLE_VFPV3:BOOL=OFF \ + -DEXECUTABLE_OUTPUT_PATH=$(OPENCV_BUILD_DIR)/bin \ -DGENERATE_ABI_DESCRIPTOR=OFF \ -DINSTALL_CREATE_DISTRIB:BOOL=OFF \ -DINSTALL_C_EXAMPLES:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_EXAMPLES) \ @@ -111,8 +113,12 @@ OPENCV_CONF_OPT := \ -DINSTALL_TO_MANGLED_PATHS:BOOL=OFF \ -DMKL_WITH_OPENMP=OFF \ -DMKL_WITH_TBB=OFF \ + -DOPENCV_DNN_CUDA=OFF \ + -DOPENCV_DNN_OPENCL=ON \ -DOPENCV_DOWNLOAD_PATH=$(OPENCV_DIR)/.cache \ -DOPENCV_DUMP_HOOKS_FLOW=OFF \ + -DOPENCV_ENABLE_ALLOCATOR_STATS=ON \ + -DOPENCV_ENABLE_ATOMIC_LONG_LONG=ON \ -DOPENCV_ENABLE_MEMALIGN=ON \ -DOPENCV_ENABLE_MEMORY_SANITIZER=OFF \ -DOPENCV_ENABLE_NONFREE=OFF \ @@ -120,19 +126,21 @@ OPENCV_CONF_OPT := \ -DOPENCV_FORCE_3RDPARTY_BUILD=OFF \ -DOPENCV_GENERATE_PKGCONFIG=ON \ -DOPENCV_GENERATE_SETUPVARS=ON \ + -DOPENCV_IPP_GAUSSIAN_BLUR=OFF \ + -DOPENCV_MATHJAX_RELPATH=https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0 \ -DOPENCV_PYTHON3_VERSION=OFF \ -DOPENCV_WARNINGS_ARE_ERRORS:BOOL=OFF \ -DPROTOBUF_UPDATE_FILES=OFF \ -DWITH_1394:BOOL=OFF \ -DWITH_ADE=OFF \ -DWITH_ARAVIS=OFF \ - -DWITH_CAROTENE=ON \ -DWITH_CLP=OFF \ -DWITH_CUBLAS:BOOL=OFF \ -DWITH_CUDA:BOOL=OFF \ -DWITH_CUFFT:BOOL=OFF \ -DWITH_EIGEN:BOOL=OFF \ -DWITH_FFMPEG:BOOL=OFF \ + -DWITH_FREETYPE=OFF \ -DWITH_GDAL:BOOL=OFF \ -DWITH_GDCM=OFF \ -DWITH_GIGEAPI:BOOL=OFF \ @@ -156,6 +164,7 @@ OPENCV_CONF_OPT := \ -DWITH_LIBREALSENSE=OFF \ -DWITH_LIBV4L:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_V4L_LIBV4L2) \ -DWITH_MFX=OFF \ + -DWITH_NGRAPH=OFF \ -DWITH_NVCUVID:BOOL=OFF \ -DWITH_OPENCL:BOOL=ON \ -DWITH_OPENCLAMDBLAS:BOOL=OFF \ @@ -163,10 +172,12 @@ OPENCV_CONF_OPT := \ -DWITH_OPENCL_SVM:BOOL=OFF \ -DWITH_OPENEXR:BOOL=OFF \ -DWITH_OPENGL:BOOL=OFF \ + -DWITH_OPENJPEG=OFF \ -DWITH_OPENMP:BOOL=OFF \ -DWITH_OPENNI:BOOL=OFF \ -DWITH_OPENNI2:BOOL=OFF \ -DWITH_OPENVX=OFF \ + -DWITH_PLAIDML=OFF \ -DWITH_PNG:BOOL=ON \ -DWITH_PROTOBUF=ON \ -DWITH_PTHREADS_PF:BOOL=OFF \ @@ -183,7 +194,8 @@ OPENCV_CONF_OPT := \ -DWITH_WEBP:BOOL=OFF \ -DWITH_XIMEA:BOOL=OFF \ -DWITH_XINE:BOOL=OFF \ - -DOPENCV_GENERATE_PKGCONFIG=ON \ + -Dopencv_dnn_PERF_CAFFE=OFF \ + -Dopencv_dnn_PERF_CLCAFFE=OFF \ $(STATEDIR)/opencv.install: @@ -221,7 +233,9 @@ $(STATEDIR)/opencv.targetinstall: @$(foreach lib, $(OPENCV_LIBS-y), \ $(call install_lib, opencv, 0, 0, 0644, $(lib));) +ifdef PTXCONF_OPENCV_EXAMPLES @$(call install_tree, opencv, 0, 0, $(OPENCV_BUILD_DIR)/bin, /bin) +endif @$(call install_finish, opencv) @$(call touch) |