Signed-off-by: Lucas Sinn <[email protected]>
---
Added missing configuration options from previous patch.
rules/opencv.in | 12 --------
rules/opencv.make | 76
++++++++++++++++++++++++++++-------------------
2 files changed, 45 insertions(+), 43 deletions(-)
diff --git a/rules/opencv.in b/rules/opencv.in index
c700b2216..818b0bd72 100644
--- a/rules/opencv.in
+++ b/rules/opencv.in
@@ -14,9 +14,6 @@ menuconfig OPENCV
select QT5_GUI if OPENCV_QT
select GSTREAMER1 if OPENCV_GSTREAMER
select GST_PLUGINS_BASE1 if OPENCV_GSTREAMER
- select V4L_UTILS if OPENCV_V4L_LIBV4L2
- select V4L_UTILS_LIBV4L1 if OPENCV_V4L_LIBV4L2
- select V4L_UTILS_LIBV4L2 if OPENCV_V4L_LIBV4L2
select PYTHON3_NUMPY if OPENCV_PYTHON
help
Open Source Computer Vision Library @@ -126,15 +123,6 @@
config OPENCV_V4L
help
Video4Linux Support
-config OPENCV_V4L_LIBV4L2
- bool
- prompt "libv4l2"
- depends on OPENCV_V4L
- help
- For embedded use cases it often makes sense to explicitly not
- use libv4l, because the colorspace conversions in software adds
- unexpected overhead.
-
config OPENCV_QT
bool
prompt "qt"
diff --git a/rules/opencv.make b/rules/opencv.make index
f4a044307..a38b4fd63 100644
--- a/rules/opencv.make
+++ b/rules/opencv.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_OPENCV) += opencv # Paths and
names #
-OPENCV_VERSION := 4.4.0
-OPENCV_MD5 := 4b00f5cdb1cf393c4a84696362c5a72a
+OPENCV_VERSION := 4.8.0
+OPENCV_MD5 := b68ad705602c543c02307b97f8044ec8
OPENCV := opencv-$(OPENCV_VERSION)
OPENCV_SUFFIX := zip
OPENCV_URL := \
@@ -52,17 +52,16 @@ OPENCV_CONF_TOOL := cmake # Variables that are
not shown by configure_helper.py are added at the end.
OPENCV_CONF_OPT := \
$(CROSS_CMAKE_USR) \
- -DANT_EXECUTABLE= \
-DBUILD_CUDA_STUBS=OFF \
-DBUILD_DOCS=OFF \
-DBUILD_EXAMPLES=$(call ptx/onoff, PTXCONF_OPENCV_EXAMPLES) \
- -DBUILD_IPP_IW=ON \
-DBUILD_ITT=ON \
-DBUILD_JASPER=OFF \
-DBUILD_JAVA=OFF \
-DBUILD_JPEG=OFF \
-DBUILD_LIST= \
-DBUILD_OPENEXR=OFF \
+ -DBUILD_OPENJPEG=OFF \
-DBUILD_PACKAGE=OFF \
-DBUILD_PERF_TESTS=OFF \
-DBUILD_PNG=OFF \
@@ -87,18 +86,20 @@ OPENCV_CONF_OPT := \
-DBUILD_opencv_imgproc=$(call ptx/onoff,PTXCONF_OPENCV_IMGPROC) \
-DBUILD_opencv_java_bindings_generator=ON \
-DBUILD_opencv_js=OFF \
+ -DBUILD_opencv_js_bindings_generator=OFF \
-DBUILD_opencv_ml=$(call ptx/onoff,PTXCONF_OPENCV_ML) \
+ -DBUILD_opencv_objc_bindings_generator=OFF \
-DBUILD_opencv_objdetect=$(call ptx/onoff,PTXCONF_OPENCV_OBJDETECT) \
-DBUILD_opencv_photo=$(call ptx/onoff,PTXCONF_OPENCV_PHOTO) \
- -DBUILD_opencv_python3=$(call ptx/onoff,PTXCONF_OPENCV_PYTHON) \
-DBUILD_opencv_python_bindings_generator=$(call
ptx/onoff,PTXCONF_OPENCV_PYTHON) \
-DBUILD_opencv_python_tests=ON \
-DBUILD_opencv_stitching=$(call ptx/onoff,PTXCONF_OPENCV_STITCHING) \
- -DBUILD_opencv_ts=OFF \
-DBUILD_opencv_video=$(call ptx/onoff,PTXCONF_OPENCV_VIDEO) \
-DBUILD_opencv_videoio=$(call ptx/onoff,PTXCONF_OPENCV_VIDEOIO) \
-DBUILD_opencv_world=OFF \
-DCPU_BASELINE=DETECT \
+ -DCPU_BASELINE_DISABLE= \
+ -DCPU_BASELINE_REQUIRE= \
-DCPU_DISPATCH= \
-DCV_DISABLE_OPTIMIZATION=OFF \
-DCV_ENABLE_INTRINSICS=ON \
@@ -126,10 +127,19 @@ OPENCV_CONF_OPT := \
-DINSTALL_PYTHON_EXAMPLES=OFF \
-DINSTALL_TESTS=OFF \
-DINSTALL_TO_MANGLED_PATHS=OFF \
- -DMKL_WITH_OPENMP=OFF \
- -DMKL_WITH_TBB=OFF \
+ -DLAPACK_CBLAS_H= \
+ -DLAPACK_IMPL=Unknown \
+ -DLAPACK_LAPACKE_H= \
+ -DLAPACK_LIBRARIES= \
+ -DMKL_USE_SINGLE_DYNAMIC_LIBRARY=OFF \
+ -DOPENCL_FOUND=ON \
+ -DOPENCV_DISABLE_FILESYSTEM_SUPPORT=OFF \
-DOPENCV_DNN_CUDA=OFF \
-DOPENCV_DNN_OPENCL=ON \
+ -DOPENCV_DNN_OPENVINO=OFF \
+ -DOPENCV_DNN_PERF_CAFFE=OFF \
+ -DOPENCV_DNN_PERF_CLCAFFE=OFF \
+ -DOPENCV_DNN_TFLITE=OFF \
-DOPENCV_DOWNLOAD_PATH=$(OPENCV_DIR)/.cache \
-DOPENCV_DUMP_HOOKS_FLOW=OFF \
-DOPENCV_ENABLE_ALLOCATOR_STATS=ON \
@@ -144,24 +154,38 @@ OPENCV_CONF_OPT := \
-DOPENCV_IPP_GAUSSIAN_BLUR=OFF \
-DOPENCV_MATHJAX_RELPATH=https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0 \
-DOPENCV_PYTHON3_VERSION=$(PYTHON3_MAJORMINOR) \
+ -DOPENCV_TEST_DNN_CANN=OFF \
+ -DOPENCV_TEST_DNN_OPENVINO=OFF \
+ -DOPENCV_TEST_DNN_TFLITE=OFF \
-DOPENCV_WARNINGS_ARE_ERRORS=OFF \
+ -DPARALLEL_ENABLE_PLUGINS=OFF \
-DPROTOBUF_UPDATE_FILES=OFF \
+ -DPYTHON2_EXECUTABLE= \
+ -DPYTHON2_INCLUDE_DIR2= \
+ -DPYTHON2_LIBRARY= \
+ -DPYTHON2_LIBRARY_DEBUG= \
+ -DPYTHON2_NUMPY_INCLUDE_DIRS= \
+ -DPYTHON2_PACKAGES_PATH= \
-DPYTHON3_EXECUTABLE=$(PTXDIST_SYSROOT_CROSS)/usr/bin/python$(PYTHON3_
MAJORMINOR) \
+
-DPYTHON3_INCLUDE_DIR2=$(PTXDIST_SYSROOT_TARGET)/usr/include/python$(PYTHON3_MAJORMINOR)
\
+
-DPYTHON3_LIBRARY=$(PTXDIST_SYSROOT_TARGET)/bin/python$(PYTHON3_MAJORMINOR) \
+ -DPYTHON3_LIBRARY_DEBUG= \
-DPYTHON3_NUMPY_INCLUDE_DIRS=$(PTXDIST_SYSROOT_TARGET)$(PYTHON3_SITEPA
CKAGES)/numpy/core/include/ \
+ -DPYTHON3_PACKAGES_PATH=$(PYTHON3_SITEPACKAGES) \
-DWITH_1394=OFF \
-DWITH_ADE=OFF \
-DWITH_ARAVIS=OFF \
+ -DWITH_AVIF=OFF \
+ -DWITH_CANN=OFF \
-DWITH_CAROTENE=OFF \
-DWITH_CLP=OFF \
- -DWITH_CUBLAS=OFF \
-DWITH_CUDA=OFF \
- -DWITH_CUFFT=OFF \
-DWITH_EIGEN=OFF \
-DWITH_FFMPEG=OFF \
+ -DWITH_FLATBUFFERS=OFF \
-DWITH_FREETYPE=OFF \
-DWITH_GDAL=OFF \
-DWITH_GDCM=OFF \
- -DWITH_GIGEAPI=OFF \
-DWITH_GPHOTO2=OFF \
-DWITH_GSTREAMER=$(call ptx/onoff,PTXCONF_OPENCV_GSTREAMER) \
-DWITH_GTK=OFF \
@@ -172,18 +196,15 @@ OPENCV_CONF_OPT := \
-DWITH_IMGCODEC_PFM=ON \
-DWITH_IMGCODEC_PXM=ON \
-DWITH_IMGCODEC_SUNRASTER=ON \
- -DWITH_INF_ENGINE=OFF \
- -DWITH_IPP=OFF \
- -DWITH_IPP_A=OFF \
-DWITH_ITT=ON \
-DWITH_JASPER=OFF \
-DWITH_JPEG=ON \
-DWITH_LAPACK=ON \
-DWITH_LIBREALSENSE=OFF \
- -DWITH_LIBV4L=$(call ptx/onoff,PTXCONF_OPENCV_V4L_LIBV4L2) \
-DWITH_MFX=OFF \
- -DWITH_NGRAPH=OFF \
- -DWITH_NVCUVID=OFF \
+ -DWITH_OAK=OFF \
+ -DWITH_OBSENSOR=OFF \
+ -DWITH_ONNX=OFF \
-DWITH_OPENCL=ON \
-DWITH_OPENCLAMDBLAS=OFF \
-DWITH_OPENCLAMDFFT=OFF \
@@ -194,6 +215,7 @@ OPENCV_CONF_OPT := \
-DWITH_OPENMP=OFF \
-DWITH_OPENNI=OFF \
-DWITH_OPENNI2=OFF \
+ -DWITH_OPENVINO=OFF \
-DWITH_OPENVX=OFF \
-DWITH_PLAIDML=OFF \
-DWITH_PNG=ON \
@@ -202,29 +224,21 @@ OPENCV_CONF_OPT := \
-DWITH_PVAPI=OFF \
-DWITH_QT=$(call ptx/ifdef,PTXCONF_OPENCV_QT,5,OFF) \
-DWITH_QUIRC=ON \
+ -DWITH_SPNG=OFF \
-DWITH_TBB=OFF \
-DWITH_TENGINE=OFF \
-DWITH_TIFF=OFF \
- -DWITH_UNICAP=OFF \
+ -DWITH_TIMVX=OFF \
+ -DWITH_UEYE=OFF \
-DWITH_V4L=$(call ptx/onoff,PTXCONF_OPENCV_V4L) \
-DWITH_VA=OFF \
-DWITH_VA_INTEL=OFF \
-DWITH_VULKAN=OFF \
+ -DWITH_WAYLAND=OFF \
+ -DWITH_WEBNN=OFF \
-DWITH_WEBP=OFF \
-DWITH_XIMEA=OFF \
- -DWITH_XINE=OFF \
- -Dopencv_dnn_PERF_CAFFE=OFF \
- -Dopencv_dnn_PERF_CLCAFFE=OFF \
- \
- -DCMAKE_SKIP_RPATH=ON \
- -DBUILD_opencv_python2=OFF \
-
-DPYTHON_INCLUDE_DIR=$(PTXDIST_SYSROOT_TARGET)/usr/include/python$(PYTHON3_MAJORMINOR)
\
-
-DPYTHON_LIBRARY=$(PTXDIST_SYSROOT_TARGET)/bin/python$(PYTHON3_MAJORMINOR) \
- -DOPENCV_PYTHON3_INSTALL_PATH=$(PYTHON3_SITEPACKAGES) \
- -DOPENCV_SKIP_PYTHON_LOADER=ON \
- -DOPENCV_LAPACK_FIND_PACKAGE_ONLY=ON \
- -DCMAKE_DISABLE_FIND_PACKAGE_LAPACK=ON
-
+ -DWITH_XINE=OFF
$(STATEDIR)/opencv.install:
@$(call targetinfo)
--
2.37.2
Lucas Sinn
R&D Engineer
Wolfvision GmbH
Oberes Ried 14 | 6833 Klaus | Austria
Tel: +43 5523 52250 <tel:+43552352250> | Mail:
[email protected] <mailto:[email protected]>
Website: wolfvision.com <www.wolfvision.com> Firmenbuch / Commercial
Register: FN283521v Feldkirch/Austria
