* [ptxdist] [PATCH v2 2/7] OpenCV: Added flag to build and integrate Examples
2020-01-23 14:23 [ptxdist] [PATCH v2 1/7] OpenCV: Update to Version 4.1.2 Marian Cichy
@ 2020-01-23 14:23 ` Marian Cichy
2020-01-23 14:23 ` [ptxdist] [PATCH v2 3/7] OpenCV: Clean up configure_helper output Marian Cichy
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Marian Cichy @ 2020-01-23 14:23 UTC (permalink / raw)
To: ptxdist; +Cc: Marian Cichy
Signed-off-by: Marian Cichy <m.cichy@pengutronix.de>
---
rules/opencv.in | 5 +++++
rules/opencv.make | 21 ++++++++++++++++++---
2 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/rules/opencv.in b/rules/opencv.in
index 37fd32758..ac096d60c 100644
--- a/rules/opencv.in
+++ b/rules/opencv.in
@@ -131,4 +131,9 @@ config OPENCV_QT
help
QT GUI Support
+config OPENCV_EXAMPLES
+ bool
+ prompt "Build Examples"
+ help
+ Build the OpenCV example applications and install them into /usr/share/opencv/examples.
endif
diff --git a/rules/opencv.make b/rules/opencv.make
index 44ee4fd0c..0ae4776d2 100644
--- a/rules/opencv.make
+++ b/rules/opencv.make
@@ -39,7 +39,7 @@ OPENCV_CONF_OPT := \
-DANT_EXECUTABLE:FILEPATH= \
-DPYTHON_EXECUTABLE= \
-DBUILD_DOCS:BOOL=OFF \
- -DBUILD_EXAMPLES:BOOL=OFF \
+ -DBUILD_EXAMPLES:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_EXAMPLES) \
-DBUILD_PACKAGE:BOOL=OFF \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_SHARED_LIBS:BOOL=ON \
@@ -122,6 +122,20 @@ OPENCV_CONF_OPT := \
-DWITH_OPENGL:BOOL=OFF \
-DWITH_QT:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_QT,4,OFF)
+
+OPENCV_BUILD_DIR := $(OPENCV_DIR)-build
+
+$(STATEDIR)/opencv.install:
+ @$(call targetinfo)
+ @$(call world/install, OPENCV)
+ifdef PTXCONF_OPENCV_EXAMPLES
+ @mkdir -p $(OPENCV_PKGDIR)/usr/share/opencv/examples
+ find $(OPENCV_BUILD_DIR)/bin -type f | while read file; do \
+ install -v -m 755 "$$file" $(OPENCV_PKGDIR)/usr/share/opencv/examples; \
+ done
+endif
+ @$(call touch)
+
# ----------------------------------------------------------------------------
# Target-Install
# ----------------------------------------------------------------------------
@@ -153,9 +167,10 @@ $(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, - , /usr/share/opencv/examples)
+endif
@$(call install_finish, opencv)
-
@$(call touch)
# vim: syntax=make
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 7+ messages in thread* [ptxdist] [PATCH v2 3/7] OpenCV: Clean up configure_helper output
2020-01-23 14:23 [ptxdist] [PATCH v2 1/7] OpenCV: Update to Version 4.1.2 Marian Cichy
2020-01-23 14:23 ` [ptxdist] [PATCH v2 2/7] OpenCV: Added flag to build and integrate Examples Marian Cichy
@ 2020-01-23 14:23 ` Marian Cichy
2020-01-23 14:23 ` [ptxdist] [PATCH v2 4/7] OpenCV: Changed QT-Support from 4 to 5 Marian Cichy
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Marian Cichy @ 2020-01-23 14:23 UTC (permalink / raw)
To: ptxdist; +Cc: Marian Cichy
Signed-off-by: Marian Cichy <m.cichy@pengutronix.de>
---
rules/opencv.make | 158 +++++++++++++++++++++++++++++++---------------
1 file changed, 107 insertions(+), 51 deletions(-)
diff --git a/rules/opencv.make b/rules/opencv.make
index 0ae4776d2..94d280c01 100644
--- a/rules/opencv.make
+++ b/rules/opencv.make
@@ -27,7 +27,7 @@ OPENCV_URL := \
OPENCV_SOURCE := $(SRCDIR)/$(OPENCV).$(OPENCV_SUFFIX)
OPENCV_DIR := $(BUILDDIR)/$(OPENCV)
OPENCV_LICENSE := BSD
-
+OPENCV_BUILD_DIR := $(OPENCV_DIR)-build
# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
@@ -37,94 +37,152 @@ OPENCV_CONF_TOOL := cmake
OPENCV_CONF_OPT := \
$(CROSS_CMAKE_USR) \
-DANT_EXECUTABLE:FILEPATH= \
- -DPYTHON_EXECUTABLE= \
+ -DBUILD_CUDA_STUBS:BOOL=OFF \
-DBUILD_DOCS:BOOL=OFF \
-DBUILD_EXAMPLES:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_EXAMPLES) \
+ -DBUILD_ITT=ON \
+ -DBUILD_JASPER=OFF \
+ -DBUILD_JAVA=OFF \
+ -DBUILD_JPEG=OFF \
+ -DBUILD_LIST= \
+ -DBUILD_OPENEXR=OFF \
-DBUILD_PACKAGE:BOOL=OFF \
- -DCMAKE_BUILD_TYPE=Release \
+ -DBUILD_PERF_TESTS=OFF \
+ -DBUILD_PNG=OFF \
+ -DBUILD_PROTOBUF=ON \
-DBUILD_SHARED_LIBS:BOOL=ON \
+ -DBUILD_TBB=OFF \
-DBUILD_TESTS=OFF \
- -DBUILD_PERF_TESTS=OFF \
+ -DBUILD_TIFF=OFF \
+ -DBUILD_USE_SYMLINKS=OFF \
+ -DBUILD_WEBP=OFF \
-DBUILD_WITH_DEBUG_INFO=OFF \
- -DBUILD_CUDA_STUBS:BOOL=OFF \
- -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF \
- -DCMAKE_SKIP_RPATH=OFF \
- -DCMAKE_USE_RELATIVE_PATHS=OFF \
+ -DBUILD_WITH_DYNAMIC_IPP=OFF \
+ -DBUILD_ZLIB=OFF \
+ -DBUILD_opencv_apps:BOOL=OFF \
+ -DBUILD_opencv_calib3d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_CALIB3D,ON,OFF) \
+ -DBUILD_opencv_core:BOOL=ON \
+ -DBUILD_opencv_dnn=OFF \
+ -DBUILD_opencv_features2d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FEATURES2D,ON,OFF) \
+ -DBUILD_opencv_flann:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FLANN,ON,OFF) \
+ -DBUILD_opencv_highgui:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_HIGHGUI,ON,OFF) \
+ -DBUILD_opencv_imgcodecs=$(call ptx/ifdef,PTXCONF_OPENCV_IMGCODECS,ON,OFF) \
+ -DBUILD_opencv_imgproc:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_IMGPROC,ON,OFF) \
+ -DBUILD_opencv_java_bindings_generator=ON \
+ -DBUILD_opencv_js=OFF \
+ -DBUILD_opencv_ml:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_ML,ON,OFF) \
+ -DBUILD_opencv_objdetect:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_OBJDETECT,ON,OFF) \
+ -DBUILD_opencv_photo:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_PHOTO,ON,OFF) \
+ -DBUILD_opencv_python_bindings_generator=ON \
+ -DBUILD_opencv_python_tests=ON \
+ -DBUILD_opencv_stitching:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_STITCHING,ON,OFF) \
+ -DBUILD_opencv_ts:BOOL=OFF \
+ -DBUILD_opencv_video:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_VIDEO,ON,OFF) \
+ -DBUILD_opencv_videoio=ON \
+ -DBUILD_opencv_world:BOOL=OFF \
+ -DCAROTENE_NS=carotene_o4t \
+ -DCPU_BASELINE=DETECT \
+ -DCPU_DISPATCH= \
+ -DCV_DISABLE_OPTIMIZATION=OFF \
+ -DCV_ENABLE_INTRINSICS=ON \
+ -DCV_TRACE=ON \
+ -DENABLE_BUILD_HARDENING=OFF \
+ -DENABLE_CCACHE=OFF \
+ -DENABLE_CONFIG_VERIFICATION=OFF \
+ -DENABLE_COVERAGE=OFF \
-DENABLE_FAST_MATH=ON \
+ -DENABLE_GNU_STL_DEBUG=OFF \
+ -DENABLE_IMPL_COLLECTION=OFF \
+ -DENABLE_INSTRUMENTATION=OFF \
+ -DENABLE_LTO=OFF \
+ -DENABLE_NEON:BOOL=$(call ptx/ifdef,PTXCONF_ARCH_ARM_NEON,ON,OFF) \
-DENABLE_NOISY_WARNINGS=OFF \
-DENABLE_OMIT_FRAME_POINTER=ON \
- -DENABLE_PRECOMPILED_HEADERS=OFF \
+ -DENABLE_PIC=ON \
-DENABLE_PROFILING=OFF \
-DENABLE_SOLUTION_FOLDERS=OFF \
- -DWITH_GTK:BOOL=OFF \
- -DWITH_TBB:BOOL=OFF \
- -DWITH_TIFF:BOOL=OFF \
- -DWITH_CUDA:BOOL=OFF \
- -DWITH_EIGEN:BOOL=OFF \
- -DENABLE_NEON:BOOL=$(call ptx/ifdef,PTXCONF_ARCH_ARM_NEON,ON,OFF) \
-DENABLE_VFPV3:BOOL=OFF \
- -DWITH_GIGEAPI:BOOL=OFF \
+ -DGENERATE_ABI_DESCRIPTOR=OFF \
-DINSTALL_CREATE_DISTRIB:BOOL=OFF \
-DINSTALL_C_EXAMPLES:BOOL=OFF \
-DINSTALL_PYTHON_EXAMPLES:BOOL=OFF \
+ -DINSTALL_TESTS=OFF \
-DINSTALL_TO_MANGLED_PATHS:BOOL=OFF \
+ -DMKL_WITH_OPENMP=OFF \
+ -DMKL_WITH_TBB=OFF \
+ -DOPENCV_DOWNLOAD_PATH=$(OPENCV_DIR)/.cache \
+ -DOPENCV_DUMP_HOOKS_FLOW=OFF \
+ -DOPENCV_ENABLE_MEMALIGN=ON \
+ -DOPENCV_ENABLE_MEMORY_SANITIZER=OFF \
+ -DOPENCV_ENABLE_NONFREE=OFF \
-DOPENCV_EXTRA_MODULES_PATH:PATH= \
+ -DOPENCV_FORCE_3RDPARTY_BUILD=OFF \
+ -DOPENCV_GENERATE_PKGCONFIG=ON \
+ -DOPENCV_GENERATE_SETUPVARS=ON \
+ -DOPENCV_PYTHON3_VERSION=OFF \
-DOPENCV_WARNINGS_ARE_ERRORS:BOOL=OFF \
- -DWITH_OPENEXR:BOOL=OFF \
- -DWITH_PVAPI:BOOL=OFF \
+ -DPROTOBUF_UPDATE_FILES=OFF \
-DWITH_1394:BOOL=OFF \
- -DWITH_VTK:BOOL=OFF \
+ -DWITH_ADE=ON \
+ -DWITH_ARAVIS=OFF \
+ -DWITH_CAROTENE=ON \
+ -DWITH_CLP=OFF \
-DWITH_CUBLAS:BOOL=OFF \
-DWITH_CUDA:BOOL=OFF \
-DWITH_CUFFT:BOOL=OFF \
- -DWITH_NVCUVID:BOOL=OFF \
-DWITH_EIGEN:BOOL=OFF \
-DWITH_FFMPEG:BOOL=OFF \
+ -DWITH_GDAL:BOOL=OFF \
+ -DWITH_GDCM=OFF \
+ -DWITH_GIGEAPI:BOOL=OFF \
+ -DWITH_GPHOTO2:BOOL=OFF \
+ -DWITH_GSTREAMER:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_GSTREAMER,ON,OFF) \
+ -DWITH_GTK:BOOL=OFF \
+ -DWITH_GTK_2_X=OFF \
+ -DWITH_HALIDE=OFF \
+ -DWITH_HPX=OFF \
+ -DWITH_IMGCODEC_HDR=ON \
+ -DWITH_IMGCODEC_PFM=ON \
+ -DWITH_IMGCODEC_PXM=ON \
+ -DWITH_IMGCODEC_SUNRASTER=ON \
+ -DWITH_INF_ENGINE=OFF \
+ -DWITH_IPP_A:BOOL=OFF \
+ -DWITH_ITT=ON \
-DWITH_JASPER:BOOL=OFF \
-DWITH_JPEG:BOOL=ON \
- -DWITH_WEBP:BOOL=OFF \
- -DWITH_PNG:BOOL=ON \
+ -DWITH_LAPACK=ON \
+ -DWITH_LIBREALSENSE=OFF \
+ -DWITH_LIBV4L:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_V4L_LIBV4L2,ON,OFF) \
+ -DWITH_MFX=OFF \
+ -DWITH_NVCUVID:BOOL=OFF \
-DWITH_OPENCL:BOOL=ON \
- -DWITH_OPENCL_SVM:BOOL=OFF \
-DWITH_OPENCLAMDBLAS:BOOL=OFF \
-DWITH_OPENCLAMDFFT:BOOL=OFF \
+ -DWITH_OPENCL_SVM:BOOL=OFF \
-DWITH_OPENEXR:BOOL=OFF \
+ -DWITH_OPENGL:BOOL=OFF \
-DWITH_OPENMP:BOOL=OFF \
- -DWITH_PTHREADS_PF:BOOL=OFF \
-DWITH_OPENNI:BOOL=OFF \
-DWITH_OPENNI2:BOOL=OFF \
+ -DWITH_OPENVX=OFF \
+ -DWITH_PNG:BOOL=ON \
+ -DWITH_PROTOBUF=ON \
+ -DWITH_PTHREADS_PF:BOOL=OFF \
-DWITH_PVAPI:BOOL=OFF \
+ -DWITH_QT:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_QT,4,OFF) \
+ -DWITH_QUIRC=ON \
-DWITH_TBB:BOOL=OFF \
+ -DWITH_TIFF:BOOL=OFF \
-DWITH_UNICAP:BOOL=OFF \
+ -DWITH_V4L:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_V4L,ON,OFF) \
+ -DWITH_VA=OFF \
+ -DWITH_VA_INTEL=OFF \
+ -DWITH_VULKAN=OFF \
+ -DWITH_WEBP:BOOL=OFF \
-DWITH_XIMEA:BOOL=OFF \
-DWITH_XINE:BOOL=OFF \
- -DWITH_CLP:BOOL=OFF \
- -DWITH_IPP_A:BOOL=OFF \
- -DWITH_GDAL:BOOL=OFF \
- -DWITH_GPHOTO2:BOOL=OFF \
- -DBUILD_opencv_apps:BOOL=OFF \
- -DBUILD_opencv_calib3d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_CALIB3D,ON,OFF) \
- -DBUILD_opencv_core:BOOL=ON \
- -DBUILD_opencv_features2d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FEATURES2D,ON,OFF) \
- -DBUILD_opencv_flann:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FLANN,ON,OFF) \
- -DBUILD_opencv_highgui:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_HIGHGUI,ON,OFF) \
- -DBUILD_opencv_imgproc:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_IMGPROC,ON,OFF) \
- -DBUILD_opencv_ml:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_ML,ON,OFF) \
- -DBUILD_opencv_objdetect:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_OBJDETECT,ON,OFF) \
- -DBUILD_opencv_photo:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_PHOTO,ON,OFF) \
- -DBUILD_opencv_stitching:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_STITCHING,ON,OFF) \
- -DBUILD_opencv_ts:BOOL=OFF \
- -DBUILD_opencv_video:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_VIDEO,ON,OFF) \
- -DBUILD_opencv_world:BOOL=OFF \
- -DWITH_GSTREAMER:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_GSTREAMER,ON,OFF) \
- -DWITH_V4L:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_V4L,ON,OFF) \
- -DWITH_LIBV4L:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_V4L_LIBV4L2,ON,OFF) \
- -DWITH_OPENGL:BOOL=OFF \
- -DWITH_QT:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_QT,4,OFF)
-OPENCV_BUILD_DIR := $(OPENCV_DIR)-build
-
$(STATEDIR)/opencv.install:
@$(call targetinfo)
@$(call world/install, OPENCV)
@@ -147,12 +205,10 @@ OPENCV_LIBS-$(PTXCONF_OPENCV_FLANN) += libopencv_flann
OPENCV_LIBS-$(PTXCONF_OPENCV_HIGHGUI) += libopencv_highgui
OPENCV_LIBS-$(PTXCONF_OPENCV_IMGCODECS) += libopencv_imgcodecs
OPENCV_LIBS-$(PTXCONF_OPENCV_IMGPROC) += libopencv_imgproc
-OPENCV_LIBS-$(PTXCONF_OPENCV_LEGACY) += libopencv_legacy
OPENCV_LIBS-$(PTXCONF_OPENCV_ML) += libopencv_ml
OPENCV_LIBS-$(PTXCONF_OPENCV_OBJDETECT) += libopencv_objdetect
OPENCV_LIBS-$(PTXCONF_OPENCV_PHOTO) += libopencv_photo
OPENCV_LIBS-$(PTXCONF_OPENCV_STITCHING) += libopencv_stitching
-OPENCV_LIBS-$(PTXCONF_OPENCV_SHAPE) += libopencv_shape
OPENCV_LIBS-$(PTXCONF_OPENCV_VIDEO) += libopencv_video
OPENCV_LIBS-$(PTXCONF_OPENCV_VIDEOIO) += libopencv_videoio
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 7+ messages in thread* [ptxdist] [PATCH v2 4/7] OpenCV: Changed QT-Support from 4 to 5
2020-01-23 14:23 [ptxdist] [PATCH v2 1/7] OpenCV: Update to Version 4.1.2 Marian Cichy
2020-01-23 14:23 ` [ptxdist] [PATCH v2 2/7] OpenCV: Added flag to build and integrate Examples Marian Cichy
2020-01-23 14:23 ` [ptxdist] [PATCH v2 3/7] OpenCV: Clean up configure_helper output Marian Cichy
@ 2020-01-23 14:23 ` Marian Cichy
2020-01-23 14:23 ` [ptxdist] [PATCH v2 5/7] OpenCV: added switch to turn on/off DNN support Marian Cichy
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Marian Cichy @ 2020-01-23 14:23 UTC (permalink / raw)
To: ptxdist; +Cc: Marian Cichy
Signed-off-by: Marian Cichy <m.cichy@pengutronix.de>
---
rules/opencv.in | 7 +++----
rules/opencv.make | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/rules/opencv.in b/rules/opencv.in
index ac096d60c..415db9e1e 100644
--- a/rules/opencv.in
+++ b/rules/opencv.in
@@ -8,10 +8,9 @@ menuconfig OPENCV
select ZLIB
select LIBPNG
select LIBJPEG
- select QT4 if OPENCV_QT
- select QT4_BUILD_QTESTLIB if OPENCV_QT
- select QT4_BUILD_GUI if OPENCV_QT
- select QT4_STL if OPENCV_QT
+ select QT5 if OPENCV_QT
+ select QT5_TEST if OPENCV_QT
+ select QT5_GUI if OPENCV_QT
select GSTREAMER if OPENCV_GSTREAMER
select V4L_UTILS if OPENCV_V4L_LIBV4L2
select V4L_UTILS_LIBV4L1 if OPENCV_V4L_LIBV4L2
diff --git a/rules/opencv.make b/rules/opencv.make
index 94d280c01..9652fbb4f 100644
--- a/rules/opencv.make
+++ b/rules/opencv.make
@@ -169,7 +169,7 @@ OPENCV_CONF_OPT := \
-DWITH_PROTOBUF=ON \
-DWITH_PTHREADS_PF:BOOL=OFF \
-DWITH_PVAPI:BOOL=OFF \
- -DWITH_QT:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_QT,4,OFF) \
+ -DWITH_QT:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_QT,5,OFF) \
-DWITH_QUIRC=ON \
-DWITH_TBB:BOOL=OFF \
-DWITH_TIFF:BOOL=OFF \
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 7+ messages in thread* [ptxdist] [PATCH v2 5/7] OpenCV: added switch to turn on/off DNN support
2020-01-23 14:23 [ptxdist] [PATCH v2 1/7] OpenCV: Update to Version 4.1.2 Marian Cichy
` (2 preceding siblings ...)
2020-01-23 14:23 ` [ptxdist] [PATCH v2 4/7] OpenCV: Changed QT-Support from 4 to 5 Marian Cichy
@ 2020-01-23 14:23 ` Marian Cichy
2020-01-23 14:23 ` [ptxdist] [PATCH v2 6/7] OpenCV: changed ptx/ifdef usage to ptx/onoff Marian Cichy
2020-01-23 14:23 ` [ptxdist] [PATCH v2 7/7] OpenCV: fix download in PTXDist prepare stage Marian Cichy
5 siblings, 0 replies; 7+ messages in thread
From: Marian Cichy @ 2020-01-23 14:23 UTC (permalink / raw)
To: ptxdist; +Cc: Marian Cichy
Signed-off-by: Marian Cichy <m.cichy@pengutronix.de>
---
rules/opencv.in | 6 ++++++
rules/opencv.make | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/rules/opencv.in b/rules/opencv.in
index 415db9e1e..12b44606f 100644
--- a/rules/opencv.in
+++ b/rules/opencv.in
@@ -102,6 +102,12 @@ config OPENCV_VIDEOIO
help
Video I/O
+config OPENCV_DNN
+ bool
+ prompt "DNN"
+ help
+ Deep Neural Network Library
+
config OPENCV_GSTREAMER
bool
prompt "gstreamer"
diff --git a/rules/opencv.make b/rules/opencv.make
index 9652fbb4f..8ff85591e 100644
--- a/rules/opencv.make
+++ b/rules/opencv.make
@@ -62,7 +62,7 @@ OPENCV_CONF_OPT := \
-DBUILD_opencv_apps:BOOL=OFF \
-DBUILD_opencv_calib3d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_CALIB3D,ON,OFF) \
-DBUILD_opencv_core:BOOL=ON \
- -DBUILD_opencv_dnn=OFF \
+ -DBUILD_opencv_dnn=$(call ptx/ifdef,PTXCONF_OPENCV_DNN,ON,OFF) \
-DBUILD_opencv_features2d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FEATURES2D,ON,OFF) \
-DBUILD_opencv_flann:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FLANN,ON,OFF) \
-DBUILD_opencv_highgui:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_HIGHGUI,ON,OFF) \
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 7+ messages in thread* [ptxdist] [PATCH v2 6/7] OpenCV: changed ptx/ifdef usage to ptx/onoff
2020-01-23 14:23 [ptxdist] [PATCH v2 1/7] OpenCV: Update to Version 4.1.2 Marian Cichy
` (3 preceding siblings ...)
2020-01-23 14:23 ` [ptxdist] [PATCH v2 5/7] OpenCV: added switch to turn on/off DNN support Marian Cichy
@ 2020-01-23 14:23 ` Marian Cichy
2020-01-23 14:23 ` [ptxdist] [PATCH v2 7/7] OpenCV: fix download in PTXDist prepare stage Marian Cichy
5 siblings, 0 replies; 7+ messages in thread
From: Marian Cichy @ 2020-01-23 14:23 UTC (permalink / raw)
To: ptxdist; +Cc: Marian Cichy
CMake switches used ptx/ifdef with an ON/OFF define, but we have
ptx/onoff for this case. Using this to sustain uniformity.
Signed-off-by: Marian Cichy <m.cichy@pengutronix.de>
---
rules/opencv.make | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/rules/opencv.make b/rules/opencv.make
index 8ff85591e..0a6fd7a12 100644
--- a/rules/opencv.make
+++ b/rules/opencv.make
@@ -60,24 +60,24 @@ OPENCV_CONF_OPT := \
-DBUILD_WITH_DYNAMIC_IPP=OFF \
-DBUILD_ZLIB=OFF \
-DBUILD_opencv_apps:BOOL=OFF \
- -DBUILD_opencv_calib3d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_CALIB3D,ON,OFF) \
+ -DBUILD_opencv_calib3d:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_CALIB3D) \
-DBUILD_opencv_core:BOOL=ON \
- -DBUILD_opencv_dnn=$(call ptx/ifdef,PTXCONF_OPENCV_DNN,ON,OFF) \
- -DBUILD_opencv_features2d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FEATURES2D,ON,OFF) \
- -DBUILD_opencv_flann:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FLANN,ON,OFF) \
- -DBUILD_opencv_highgui:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_HIGHGUI,ON,OFF) \
- -DBUILD_opencv_imgcodecs=$(call ptx/ifdef,PTXCONF_OPENCV_IMGCODECS,ON,OFF) \
- -DBUILD_opencv_imgproc:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_IMGPROC,ON,OFF) \
+ -DBUILD_opencv_dnn=$(call ptx/onff,PTXCONF_OPENCV_DNN) \
+ -DBUILD_opencv_features2d:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_FEATURES2D) \
+ -DBUILD_opencv_flann:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_FLANN) \
+ -DBUILD_opencv_highgui:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_HIGHGUI) \
+ -DBUILD_opencv_imgcodecs=$(call ptx/onoff,PTXCONF_OPENCV_IMGCODECS) \
+ -DBUILD_opencv_imgproc:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_IMGPROC) \
-DBUILD_opencv_java_bindings_generator=ON \
-DBUILD_opencv_js=OFF \
- -DBUILD_opencv_ml:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_ML,ON,OFF) \
- -DBUILD_opencv_objdetect:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_OBJDETECT,ON,OFF) \
- -DBUILD_opencv_photo:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_PHOTO,ON,OFF) \
+ -DBUILD_opencv_ml:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_ML) \
+ -DBUILD_opencv_objdetect:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_OBJDETECT) \
+ -DBUILD_opencv_photo:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_PHOTO) \
-DBUILD_opencv_python_bindings_generator=ON \
-DBUILD_opencv_python_tests=ON \
- -DBUILD_opencv_stitching:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_STITCHING,ON,OFF) \
+ -DBUILD_opencv_stitching:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_STITCHING) \
-DBUILD_opencv_ts:BOOL=OFF \
- -DBUILD_opencv_video:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_VIDEO,ON,OFF) \
+ -DBUILD_opencv_video:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_VIDEO) \
-DBUILD_opencv_videoio=ON \
-DBUILD_opencv_world:BOOL=OFF \
-DCAROTENE_NS=carotene_o4t \
@@ -95,7 +95,7 @@ OPENCV_CONF_OPT := \
-DENABLE_IMPL_COLLECTION=OFF \
-DENABLE_INSTRUMENTATION=OFF \
-DENABLE_LTO=OFF \
- -DENABLE_NEON:BOOL=$(call ptx/ifdef,PTXCONF_ARCH_ARM_NEON,ON,OFF) \
+ -DENABLE_NEON:BOOL=$(call ptx/onoff,PTXCONF_ARCH_ARM_NEON) \
-DENABLE_NOISY_WARNINGS=OFF \
-DENABLE_OMIT_FRAME_POINTER=ON \
-DENABLE_PIC=ON \
@@ -136,7 +136,7 @@ OPENCV_CONF_OPT := \
-DWITH_GDCM=OFF \
-DWITH_GIGEAPI:BOOL=OFF \
-DWITH_GPHOTO2:BOOL=OFF \
- -DWITH_GSTREAMER:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_GSTREAMER,ON,OFF) \
+ -DWITH_GSTREAMER:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_GSTREAMER) \
-DWITH_GTK:BOOL=OFF \
-DWITH_GTK_2_X=OFF \
-DWITH_HALIDE=OFF \
@@ -152,7 +152,7 @@ OPENCV_CONF_OPT := \
-DWITH_JPEG:BOOL=ON \
-DWITH_LAPACK=ON \
-DWITH_LIBREALSENSE=OFF \
- -DWITH_LIBV4L:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_V4L_LIBV4L2,ON,OFF) \
+ -DWITH_LIBV4L:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_V4L_LIBV4L2) \
-DWITH_MFX=OFF \
-DWITH_NVCUVID:BOOL=OFF \
-DWITH_OPENCL:BOOL=ON \
@@ -174,7 +174,7 @@ OPENCV_CONF_OPT := \
-DWITH_TBB:BOOL=OFF \
-DWITH_TIFF:BOOL=OFF \
-DWITH_UNICAP:BOOL=OFF \
- -DWITH_V4L:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_V4L,ON,OFF) \
+ -DWITH_V4L:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_V4L) \
-DWITH_VA=OFF \
-DWITH_VA_INTEL=OFF \
-DWITH_VULKAN=OFF \
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 7+ messages in thread* [ptxdist] [PATCH v2 7/7] OpenCV: fix download in PTXDist prepare stage
2020-01-23 14:23 [ptxdist] [PATCH v2 1/7] OpenCV: Update to Version 4.1.2 Marian Cichy
` (4 preceding siblings ...)
2020-01-23 14:23 ` [ptxdist] [PATCH v2 6/7] OpenCV: changed ptx/ifdef usage to ptx/onoff Marian Cichy
@ 2020-01-23 14:23 ` Marian Cichy
5 siblings, 0 replies; 7+ messages in thread
From: Marian Cichy @ 2020-01-23 14:23 UTC (permalink / raw)
To: ptxdist; +Cc: Marian Cichy
OpenCV wants to download the additional framework ADE while executing
CMake. Therefore, files will be downloaded during PTXDist's prepare
stage. This is not wanted. We now try to download the files during the
Get stage and copy the files to the same locations at the Extract.post
stage. If we cannot download the files during the Get stage, a new
CMake Flag can be used to abort during the prepare stage if download is
tried again.
Signed-off-by: Marian Cichy <m.cichy@pengutronix.de>
---
...option-to-disallow-download-of-files.patch | 42 +++++++++++
patches/opencv-4.1.2/series | 1 +
rules/opencv.make | 70 +++++++++++++++----
3 files changed, 100 insertions(+), 13 deletions(-)
create mode 100644 patches/opencv-4.1.2/0001-add-option-to-disallow-download-of-files.patch
create mode 100644 patches/opencv-4.1.2/series
diff --git a/patches/opencv-4.1.2/0001-add-option-to-disallow-download-of-files.patch b/patches/opencv-4.1.2/0001-add-option-to-disallow-download-of-files.patch
new file mode 100644
index 000000000..0e1504a96
--- /dev/null
+++ b/patches/opencv-4.1.2/0001-add-option-to-disallow-download-of-files.patch
@@ -0,0 +1,42 @@
+From b71bfe426a68a4603c9b814da68b117602a8b55f Mon Sep 17 00:00:00 2001
+From: Marian Cichy <m.cichy@pengutronix.de>
+Date: Wed, 22 Jan 2020 17:14:05 +0100
+Subject: [PATCH] add option to disallow download of files
+
+OpenCV wants to download files for the ADE Framework when it is at
+the prepare stage of PTXDist. This is not wanted. The PTXDist rule
+will download the file during the Get stage and put it at the same
+location where OpenCV would put it. If the Download at the Get stage
+does not succeed and if OPENCV_ALLOW_DOWNLOADS is OFF, OpenCV will abort
+with this patch at the Prepare stage.
+---
+ cmake/OpenCVDownload.cmake | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/cmake/OpenCVDownload.cmake b/cmake/OpenCVDownload.cmake
+index 63cf6d3238b1..cd7e50b4edf1 100644
+--- a/cmake/OpenCVDownload.cmake
++++ b/cmake/OpenCVDownload.cmake
+@@ -14,6 +14,7 @@
+ # RELATIVE_URL - if set, then URL is treated as a base, and FILENAME will be appended to it
+ # Note: uses OPENCV_DOWNLOAD_PATH folder as cache, default is <opencv>/.cache
+
++set(OPENCV_ALLOW_DOWNLOADS ON CACHE BOOL "Allow downloads")
+ set(HELP_OPENCV_DOWNLOAD_PATH "Cache directory for downloaded files")
+ if(DEFINED ENV{OPENCV_DOWNLOAD_PATH})
+ set(OPENCV_DOWNLOAD_PATH "$ENV{OPENCV_DOWNLOAD_PATH}" CACHE PATH "${HELP_OPENCV_DOWNLOAD_PATH}")
+@@ -156,6 +157,11 @@ function(ocv_download)
+
+ # Download
+ if(NOT EXISTS "${CACHE_CANDIDATE}")
++ if(NOT OPENCV_ALLOW_DOWNLOADS)
++ message(FATAL_ERROR "Not going to download ${DL_FILENAME}")
++ return()
++ endif()
++
+ ocv_download_log("#cmake_download \"${CACHE_CANDIDATE}\" \"${DL_URL}\"")
+ foreach(try ${OPENCV_DOWNLOAD_TRIES_LIST})
+ ocv_download_log("#try ${try}")
+--
+2.20.1
+
diff --git a/patches/opencv-4.1.2/series b/patches/opencv-4.1.2/series
new file mode 100644
index 000000000..aaa28ce52
--- /dev/null
+++ b/patches/opencv-4.1.2/series
@@ -0,0 +1 @@
+0001-add-option-to-disallow-download-of-files.patch
diff --git a/rules/opencv.make b/rules/opencv.make
index 0a6fd7a12..29261329f 100644
--- a/rules/opencv.make
+++ b/rules/opencv.make
@@ -17,25 +17,69 @@ PACKAGES-$(PTXCONF_OPENCV) += opencv
# Paths and names
#
-OPENCV_VERSION := 4.1.2
-OPENCV_MD5 := 6b390578d57131ae9d6c2a183257399d
-OPENCV := opencv-$(OPENCV_VERSION)
-OPENCV_SUFFIX := zip
-OPENCV_URL := \
- $(call ptx/mirror, SF, opencvlibrary/opencv-unix/$(OPENCV_VERSION)/$(OPENCV).$(OPENCV_SUFFIX)) \
- https://github.com/opencv/opencv/archive/$(OPENCV_VERSION).$(OPENCV_SUFFIX)
-OPENCV_SOURCE := $(SRCDIR)/$(OPENCV).$(OPENCV_SUFFIX)
-OPENCV_DIR := $(BUILDDIR)/$(OPENCV)
-OPENCV_LICENSE := BSD
-OPENCV_BUILD_DIR := $(OPENCV_DIR)-build
+OPENCV_VERSION := 4.1.2
+OPENCV_MD5 := 6b390578d57131ae9d6c2a183257399d
+OPENCV := opencv-$(OPENCV_VERSION)
+OPENCV_SUFFIX := zip
+OPENCV_URL := \
+ $(call ptx/mirror, SF, opencvlibrary/opencv-unix/$(OPENCV_VERSION)/$(OPENCV).$(OPENCV_SUFFIX)) \
+ https://github.com/opencv/opencv/archive/$(OPENCV_VERSION).$(OPENCV_SUFFIX)
+OPENCV_SOURCE := $(SRCDIR)/$(OPENCV).$(OPENCV_SUFFIX)
+OPENCV_DIR := $(BUILDDIR)/$(OPENCV)
+OPENCV_LICENSE := BSD
+OPENCV_BUILD_DIR := $(OPENCV_DIR)-build
+
+OPENCV_ADE_VERSION := v0.1.1f
+OPENCV_ADE_MD5 := b624b995ec9c439cbc2e9e6ee940d3a2
+OPENCV_ADE := opencv-ade-$(OPENCV_ADE_VERSION)
+OPENCV_ADE_SUFFIX := zip
+OPENCV_ADE_URL := https://github.com/opencv/ade/archive/$(OPENCV_ADE_VERSION).$(OPENCV_ADE_SUFFIX)
+OPENCV_ADE_SOURCE := $(SRCDIR)/$(OPENCV_ADE).$(OPENCV_ADE_SUFFIX)
+$(OPENCV_ADE_SOURCE) := OPENCV_ADE
+#OPENCV_ADE_DIR := $(OPENCV_DIR)/ade
+OPENCV_ADE_LICENSE := Apache-2.0
+
+OPENCV_SOURCES := $(OPENCV_SOURCE) $(OPENCV_ADE_SOURCE)
+
+
+OPENCV_DL_DIR := $(OPENCV_DIR)/.cache
+OPENCV_DL_DIR_ADE := $(OPENCV_DL_DIR)/ade
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/opencv.extract:
+ @$(call targetinfo)
+ @$(call clean, $(OPENCV_DIR))
+ @$(call extract, OPENCV)
+ @$(call patchin, OPENCV)
+ @$(call touch)
+
+
+# ----------------------------------------------------------------------------
+# Extract.post
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/opencv.extract.post:
+ @$(call targetinfo)
+ mkdir $(OPENCV_DL_DIR)
+ mkdir $(OPENCV_DL_DIR_ADE)
+ cp $(OPENCV_ADE_SOURCE) $(OPENCV_DL_DIR_ADE)/$(OPENCV_ADE_MD5)-$(OPENCV_ADE_VERSION).$(OPENCV_ADE_SUFFIX)
+ @$(call touch)
+
# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
OPENCV_CONF_TOOL := cmake
+
+EXTRA_CMAKE := -DOPENCV_ALLOW_DOWNLOADS=OFF \
+
OPENCV_CONF_OPT := \
$(CROSS_CMAKE_USR) \
+ $(EXTRA_CMAKE) \
-DANT_EXECUTABLE:FILEPATH= \
-DBUILD_CUDA_STUBS:BOOL=OFF \
-DBUILD_DOCS:BOOL=OFF \
@@ -110,7 +154,7 @@ OPENCV_CONF_OPT := \
-DINSTALL_TO_MANGLED_PATHS:BOOL=OFF \
-DMKL_WITH_OPENMP=OFF \
-DMKL_WITH_TBB=OFF \
- -DOPENCV_DOWNLOAD_PATH=$(OPENCV_DIR)/.cache \
+ -DOPENCV_DOWNLOAD_PATH=$(OPENCV_DL_DIR) \
-DOPENCV_DUMP_HOOKS_FLOW=OFF \
-DOPENCV_ENABLE_MEMALIGN=ON \
-DOPENCV_ENABLE_MEMORY_SANITIZER=OFF \
@@ -182,7 +226,6 @@ OPENCV_CONF_OPT := \
-DWITH_XIMEA:BOOL=OFF \
-DWITH_XINE:BOOL=OFF \
-
$(STATEDIR)/opencv.install:
@$(call targetinfo)
@$(call world/install, OPENCV)
@@ -194,6 +237,7 @@ ifdef PTXCONF_OPENCV_EXAMPLES
endif
@$(call touch)
+
# ----------------------------------------------------------------------------
# Target-Install
# ----------------------------------------------------------------------------
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 7+ messages in thread