* [ptxdist] [PATCH 2/6] OpenCV: Added flag to build and integrate Examples
2020-01-02 13:54 [ptxdist] [PATCH 1/6] OpenCV: Update to Version 4.1.2 Marian Cichy
@ 2020-01-02 13:54 ` Marian Cichy
2020-01-06 11:32 ` Michael Olbrich
2020-01-02 13:55 ` [ptxdist] [PATCH 3/6] OpenCV: Clean up configure_helper output Marian Cichy
` (4 subsequent siblings)
5 siblings, 1 reply; 10+ messages in thread
From: Marian Cichy @ 2020-01-02 13:54 UTC (permalink / raw)
To: ptxdist; +Cc: Marian Cichy
Signed-off-by: Marian Cichy <m.cichy@pengutronix.de>
---
rules/opencv.in | 5 +++++
rules/opencv.make | 22 ++++++++++++++++++++--
2 files changed, 25 insertions(+), 2 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..fc6243753 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,22 @@ 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 -m 755 "$$file" $(OPENCV_PKGDIR)/usr/share/opencv/examples; \
+ done
+endif
+ @$(call touch)
+
# ----------------------------------------------------------------------------
# Target-Install
# ----------------------------------------------------------------------------
@@ -153,7 +169,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_PKGDIR)/usr/share/opencv/examples, /usr/share/opencv/examples)
+endif
@$(call install_finish, opencv)
@$(call touch)
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [ptxdist] [PATCH 2/6] OpenCV: Added flag to build and integrate Examples
2020-01-02 13:54 ` [ptxdist] [PATCH 2/6] OpenCV: Added flag to build and integrate Examples Marian Cichy
@ 2020-01-06 11:32 ` Michael Olbrich
0 siblings, 0 replies; 10+ messages in thread
From: Michael Olbrich @ 2020-01-06 11:32 UTC (permalink / raw)
To: ptxdist; +Cc: Marian Cichy
On Thu, Jan 02, 2020 at 02:54:59PM +0100, Marian Cichy wrote:
> Signed-off-by: Marian Cichy <m.cichy@pengutronix.de>
> ---
> rules/opencv.in | 5 +++++
> rules/opencv.make | 22 ++++++++++++++++++++--
> 2 files changed, 25 insertions(+), 2 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..fc6243753 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,22 @@ 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:
> +
> +
No empty lines here.
> + @$(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 -m 755 "$$file" $(OPENCV_PKGDIR)/usr/share/opencv/examples; \
@find ... \
install -v -m755 ...
> + done
> +endif
> + @$(call touch)
> +
> # ----------------------------------------------------------------------------
> # Target-Install
> # ----------------------------------------------------------------------------
> @@ -153,7 +169,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_PKGDIR)/usr/share/opencv/examples, /usr/share/opencv/examples)
$(call install_tree, opencv, 0, 0, -, /usr/share/opencv/examples)
Michael
> +endif
> @$(call install_finish, opencv)
>
> @$(call touch)
> --
> 2.20.1
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 10+ messages in thread
* [ptxdist] [PATCH 3/6] OpenCV: Clean up configure_helper output
2020-01-02 13:54 [ptxdist] [PATCH 1/6] OpenCV: Update to Version 4.1.2 Marian Cichy
2020-01-02 13:54 ` [ptxdist] [PATCH 2/6] OpenCV: Added flag to build and integrate Examples Marian Cichy
@ 2020-01-02 13:55 ` Marian Cichy
2020-01-06 13:55 ` Michael Olbrich
2020-01-02 13:55 ` [ptxdist] [PATCH 4/6] OpenCV: Changed QT-Support from 4 to 5 Marian Cichy
` (3 subsequent siblings)
5 siblings, 1 reply; 10+ messages in thread
From: Marian Cichy @ 2020-01-02 13:55 UTC (permalink / raw)
To: ptxdist; +Cc: Marian Cichy
Signed-off-by: Marian Cichy <m.cichy@pengutronix.de>
---
rules/opencv.make | 182 +++++++++++++++++++++++++++++++++-------------
1 file changed, 133 insertions(+), 49 deletions(-)
diff --git a/rules/opencv.make b/rules/opencv.make
index fc6243753..1656f605a 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,178 @@ OPENCV_CONF_TOOL := cmake
OPENCV_CONF_OPT := \
$(CROSS_CMAKE_USR) \
-DANT_EXECUTABLE:FILEPATH= \
- -DPYTHON_EXECUTABLE= \
+ -DAtlas_BLAS_LIBRARY=Atlas_BLAS_LIBRARY-NOTFOUND \
+ -DAtlas_CBLAS_LIBRARY=Atlas_CBLAS_LIBRARY-NOTFOUND \
+ -DAtlas_LAPACK_LIBRARY=Atlas_LAPACK_LIBRARY-NOTFOUND \
+ -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 \
+ -DCMAKE_CONFIGURATION_TYPES="Debug;Release" \
+ -DCPU_BASELINE=DETECT \
+ -DCPU_BASELINE_DISABLE=";VFPV3" \
+ -DCPU_BASELINE_REQUIRE=";NEON" \
+ -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 \
+ -DEXECUTABLE_OUTPUT_PATH=$(OPENCV_BUILD_DIR)/bin \
+ -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 \
+ -DLAPACK_CBLAS_H= \
+ -DLAPACK_IMPL=Unknown \
+ -DLAPACK_LAPACKE_H= \
+ -DLAPACK_LIBRARIES= \
+ -DMKL_INCLUDE_DIRS=MKL_ROOT_DIR-NOTFOUND/include \
+ -DMKL_WITH_OPENMP=OFF \
+ -DMKL_WITH_TBB=OFF \
+ -DOPENCL_FOUND=ON \
+ -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=OFF \
+ -DOPENCV_GENERATE_SETUPVARS=ON \
+ -DOPENCV_MATHJAX_RELPATH=https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0 \
+ -DOPENCV_PYTHON3_VERSION=OFF \
-DOPENCV_WARNINGS_ARE_ERRORS:BOOL=OFF \
- -DWITH_OPENEXR:BOOL=OFF \
- -DWITH_PVAPI:BOOL=OFF \
+ -DPROTOBUF_UPDATE_FILES=OFF \
+ -DPYTHON2_EXECUTABLE= \
+ -DPYTHON2_INCLUDE_DIR2= \
+ -DPYTHON2_LIBRARY= \
+ -DPYTHON2_LIBRARY_DEBUG= \
+ -DPYTHON2_NUMPY_INCLUDE_DIRS= \
+ -DPYTHON2_PACKAGES_PATH= \
+ -DPYTHON3_EXECUTABLE=/usr/bin/python3 \
+ -DPYTHON3_INCLUDE_DIR2= \
+ -DPYTHON3_LIBRARY= \
+ -DPYTHON3_LIBRARY_DEBUG= \
+ -DPYTHON3_NUMPY_INCLUDE_DIRS= \
+ -DPYTHON3_PACKAGES_PATH=lib/python3.7/dist-packages \
-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:
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [ptxdist] [PATCH 3/6] OpenCV: Clean up configure_helper output
2020-01-02 13:55 ` [ptxdist] [PATCH 3/6] OpenCV: Clean up configure_helper output Marian Cichy
@ 2020-01-06 13:55 ` Michael Olbrich
0 siblings, 0 replies; 10+ messages in thread
From: Michael Olbrich @ 2020-01-06 13:55 UTC (permalink / raw)
To: ptxdist; +Cc: m.cichy
So, configure_helper and cmake is a bit tricky. We have no way to actually
get only the options that can actually be set externally so just blindly
adding all options here is not possible.
So you need review the options manually. configure_helper is still useful
here because it can also compare two different versions during a version
bump, so you only need to check any new options then.
So I'm commenting all the stuff that I can see with a quick review, but
please also check all the other options to verify that the actually change
something.
On Thu, Jan 02, 2020 at 02:55:00PM +0100, Marian Cichy wrote:
> Signed-off-by: Marian Cichy <m.cichy@pengutronix.de>
> ---
> rules/opencv.make | 182 +++++++++++++++++++++++++++++++++-------------
> 1 file changed, 133 insertions(+), 49 deletions(-)
>
> diff --git a/rules/opencv.make b/rules/opencv.make
> index fc6243753..1656f605a 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,178 @@ OPENCV_CONF_TOOL := cmake
> OPENCV_CONF_OPT := \
> $(CROSS_CMAKE_USR) \
> -DANT_EXECUTABLE:FILEPATH= \
> - -DPYTHON_EXECUTABLE= \
> + -DAtlas_BLAS_LIBRARY=Atlas_BLAS_LIBRARY-NOTFOUND \
> + -DAtlas_CBLAS_LIBRARY=Atlas_CBLAS_LIBRARY-NOTFOUND \
> + -DAtlas_LAPACK_LIBRARY=Atlas_LAPACK_LIBRARY-NOTFOUND \
Just skip the NOTFOUND stuff here. It's ok if the configure_helper has some
remaining output.
> + -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 \
This is strange. PNG support is enabled below.
> + -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 \
zlib is selected?
> + -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 \
> + -DCMAKE_CONFIGURATION_TYPES="Debug;Release" \
I think, that's just some internal stuff, and can be dropped.
> + -DCPU_BASELINE=DETECT \
> + -DCPU_BASELINE_DISABLE=";VFPV3" \
> + -DCPU_BASELINE_REQUIRE=";NEON" \
No, that's platform specific and detected.
> + -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 \
> + -DEXECUTABLE_OUTPUT_PATH=$(OPENCV_BUILD_DIR)/bin \
When are the files copied there? Maybe OPENCV_PKGDIR/... makes sense here?
> + -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 \
> + -DLAPACK_CBLAS_H= \
> + -DLAPACK_IMPL=Unknown \
> + -DLAPACK_LAPACKE_H= \
> + -DLAPACK_LIBRARIES= \
I'm pretty sure that's internal stuff. I'm guessing it cannot be
overwritten anyways.
> + -DMKL_INCLUDE_DIRS=MKL_ROOT_DIR-NOTFOUND/include \
drop.
> + -DMKL_WITH_OPENMP=OFF \
> + -DMKL_WITH_TBB=OFF \
> + -DOPENCL_FOUND=ON \
I thinks that not changeable.
> + -DOPENCV_DOWNLOAD_PATH=$(OPENCV_DIR)/.cache \
This is suspicious. Is something downloaded while building? That should not
happen.
> + -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=OFF \
I thinks that should be enabled.
> + -DOPENCV_GENERATE_SETUPVARS=ON \
> + -DOPENCV_MATHJAX_RELPATH=https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0 \
No, this should not be set.
> + -DOPENCV_PYTHON3_VERSION=OFF \
> -DOPENCV_WARNINGS_ARE_ERRORS:BOOL=OFF \
> - -DWITH_OPENEXR:BOOL=OFF \
> - -DWITH_PVAPI:BOOL=OFF \
> + -DPROTOBUF_UPDATE_FILES=OFF \
> + -DPYTHON2_EXECUTABLE= \
> + -DPYTHON2_INCLUDE_DIR2= \
> + -DPYTHON2_LIBRARY= \
> + -DPYTHON2_LIBRARY_DEBUG= \
> + -DPYTHON2_NUMPY_INCLUDE_DIRS= \
> + -DPYTHON2_PACKAGES_PATH= \
> + -DPYTHON3_EXECUTABLE=/usr/bin/python3 \
> + -DPYTHON3_INCLUDE_DIR2= \
> + -DPYTHON3_LIBRARY= \
> + -DPYTHON3_LIBRARY_DEBUG= \
> + -DPYTHON3_NUMPY_INCLUDE_DIRS= \
> + -DPYTHON3_PACKAGES_PATH=lib/python3.7/dist-packages \
We're not selecting anything python related. So this should all be
disabled. Check which options are configurable.
Michael
> -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:
>
>
> --
> 2.20.1
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 10+ messages in thread
* [ptxdist] [PATCH 4/6] OpenCV: Changed QT-Support from 4 to 5
2020-01-02 13:54 [ptxdist] [PATCH 1/6] OpenCV: Update to Version 4.1.2 Marian Cichy
2020-01-02 13:54 ` [ptxdist] [PATCH 2/6] OpenCV: Added flag to build and integrate Examples Marian Cichy
2020-01-02 13:55 ` [ptxdist] [PATCH 3/6] OpenCV: Clean up configure_helper output Marian Cichy
@ 2020-01-02 13:55 ` Marian Cichy
2020-01-02 13:55 ` [ptxdist] [PATCH 5/6] OpenCV: added switch to turn on/off DNN support Marian Cichy
` (2 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Marian Cichy @ 2020-01-02 13:55 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 1656f605a..c2d91f9b5 100644
--- a/rules/opencv.make
+++ b/rules/opencv.make
@@ -195,7 +195,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] 10+ messages in thread* [ptxdist] [PATCH 5/6] OpenCV: added switch to turn on/off DNN support
2020-01-02 13:54 [ptxdist] [PATCH 1/6] OpenCV: Update to Version 4.1.2 Marian Cichy
` (2 preceding siblings ...)
2020-01-02 13:55 ` [ptxdist] [PATCH 4/6] OpenCV: Changed QT-Support from 4 to 5 Marian Cichy
@ 2020-01-02 13:55 ` Marian Cichy
2020-01-02 13:55 ` [ptxdist] [PATCH 6/6] OpenCV: changed ptx/ifdef usage to ptx/onoff Marian Cichy
2020-01-06 16:10 ` [ptxdist] [PATCH 1/6] OpenCV: Update to Version 4.1.2 Michael Olbrich
5 siblings, 0 replies; 10+ messages in thread
From: Marian Cichy @ 2020-01-02 13:55 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 c2d91f9b5..c37ee5e2e 100644
--- a/rules/opencv.make
+++ b/rules/opencv.make
@@ -65,7 +65,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] 10+ messages in thread* [ptxdist] [PATCH 6/6] OpenCV: changed ptx/ifdef usage to ptx/onoff
2020-01-02 13:54 [ptxdist] [PATCH 1/6] OpenCV: Update to Version 4.1.2 Marian Cichy
` (3 preceding siblings ...)
2020-01-02 13:55 ` [ptxdist] [PATCH 5/6] OpenCV: added switch to turn on/off DNN support Marian Cichy
@ 2020-01-02 13:55 ` Marian Cichy
2020-01-06 13:57 ` Michael Olbrich
2020-01-06 16:10 ` [ptxdist] [PATCH 1/6] OpenCV: Update to Version 4.1.2 Michael Olbrich
5 siblings, 1 reply; 10+ messages in thread
From: Marian Cichy @ 2020-01-02 13:55 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 c37ee5e2e..d2fb5aa44 100644
--- a/rules/opencv.make
+++ b/rules/opencv.make
@@ -63,24 +63,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 \
@@ -101,7 +101,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 \
@@ -162,7 +162,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 \
@@ -178,7 +178,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 \
@@ -200,7 +200,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] 10+ messages in thread* Re: [ptxdist] [PATCH 6/6] OpenCV: changed ptx/ifdef usage to ptx/onoff
2020-01-02 13:55 ` [ptxdist] [PATCH 6/6] OpenCV: changed ptx/ifdef usage to ptx/onoff Marian Cichy
@ 2020-01-06 13:57 ` Michael Olbrich
0 siblings, 0 replies; 10+ messages in thread
From: Michael Olbrich @ 2020-01-06 13:57 UTC (permalink / raw)
To: ptxdist
On Thu, Jan 02, 2020 at 02:55:03PM +0100, Marian Cichy wrote:
> 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>
Could be squashed into 3/6 to simplify things when you change that commit.
Michael
> ---
> rules/opencv.make | 32 ++++++++++++++++----------------
> 1 file changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/rules/opencv.make b/rules/opencv.make
> index c37ee5e2e..d2fb5aa44 100644
> --- a/rules/opencv.make
> +++ b/rules/opencv.make
> @@ -63,24 +63,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 \
> @@ -101,7 +101,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 \
> @@ -162,7 +162,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 \
> @@ -178,7 +178,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 \
> @@ -200,7 +200,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
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [ptxdist] [PATCH 1/6] OpenCV: Update to Version 4.1.2.
2020-01-02 13:54 [ptxdist] [PATCH 1/6] OpenCV: Update to Version 4.1.2 Marian Cichy
` (4 preceding siblings ...)
2020-01-02 13:55 ` [ptxdist] [PATCH 6/6] OpenCV: changed ptx/ifdef usage to ptx/onoff Marian Cichy
@ 2020-01-06 16:10 ` Michael Olbrich
5 siblings, 0 replies; 10+ messages in thread
From: Michael Olbrich @ 2020-01-06 16:10 UTC (permalink / raw)
To: ptxdist; +Cc: Marian Cichy
On Thu, Jan 02, 2020 at 02:54:58PM +0100, Marian Cichy wrote:
> Removed the modules opencv_superres and
> opencv_videostab because they are not part of the opencv main repository
> anymore but have been moved to the opencv_contrib repository.
>
> Signed-off-by: Marian Cichy <m.cichy@pengutronix.de>
> ---
> rules/opencv.in | 66 +++++----------------------------------------
> rules/opencv.make | 68 +++++++++++++++++++++++------------------------
> 2 files changed, 41 insertions(+), 93 deletions(-)
>
> diff --git a/rules/opencv.in b/rules/opencv.in
> index cd43563ea..37fd32758 100644
> --- a/rules/opencv.in
> +++ b/rules/opencv.in
> @@ -1,6 +1,4 @@
> -## SECTION=staging
> -## old section:
> -### SECTION=multimedia_libs
> +## SECTION=multimedia_libs
>
> menuconfig OPENCV
> tristate
> @@ -21,9 +19,6 @@ menuconfig OPENCV
> help
> Open Source Computer Vision Library
>
> - STAGING: remove in ptxdist-2020.06.0
> - Old version that need to be updated. Fails to build with gcc >= 7.x.
> -
> if OPENCV
>
> config OPENCV_CALIB3D
> @@ -33,17 +28,6 @@ config OPENCV_CALIB3D
> help
> Camera Calibration and 3D Reconstruction
>
> -config OPENCV_CONTRIB
> - bool
> - prompt "contrib"
> - select OPENCV_CALIB3D
> - select OPENCV_IMGPROC
> - select OPENCV_ML
> - select OPENCV_OBJDETECT
> - select OPENCV_VIDEO
> - help
> - Contributed/Experimental Stuff
> -
> config OPENCV_FEATURES2D
> bool
> prompt "features2d"
> @@ -58,16 +42,6 @@ config OPENCV_FLANN
> help
> Clustering and Search in Multi-Dimensional Spaces
>
> -config OPENCV_GPU
> - bool
> - prompt "gpu"
> - select OPENCV_LEGACY
> - select OPENCV_PHOTO
> - select OPENCV_OBJDETECT
> - select OPENCV_HIGHGUI
> - help
> - GPU-accelerated Computer Vision
> -
> config OPENCV_HIGHGUI
> bool
> prompt "highgui"
> @@ -81,14 +55,11 @@ config OPENCV_IMGPROC
> help
> Image Processing
>
> -config OPENCV_LEGACY
> +config OPENCV_IMGCODECS
> bool
> - prompt "legacy"
> - select OPENCV_CALIB3D
> - select OPENCV_ML
> - select OPENCV_VIDEO
> + prompt "imgcodecs"
> help
> - Deprecated stuff
> + Image Codecs
>
> config OPENCV_ML
> bool
> @@ -96,15 +67,6 @@ config OPENCV_ML
> help
> Machine Learning
>
> -config OPENCV_NONFREE
> - bool
> - prompt "nonfree"
> - select OPENCV_CALIB3D
> - select OPENCV_IMGPROC
> - select OPENCV_FEATURES2D
> - help
> - Non-free functionality
> -
> config OPENCV_OBJDETECT
> bool
> prompt "objdetect"
> @@ -128,14 +90,6 @@ config OPENCV_STITCHING
> help
> Images stitching
>
> -config OPENCV_SUPERRES
> - bool
> - prompt "superres"
> - select OPENCV_IMGPROC
> - select OPENCV_VIDEO
> - help
> - Super Resolution
> -
> config OPENCV_VIDEO
> bool
> prompt "video"
> @@ -143,17 +97,11 @@ config OPENCV_VIDEO
> help
> Video Analysis
>
> -config OPENCV_VIDEOSTAB
> +config OPENCV_VIDEOIO
> bool
> - prompt "videostab"
> - select OPENCV_CALIB3D
> - select OPENCV_FEATURES2D
> - select OPENCV_HIGHGUI
> - select OPENCV_OBJDETECT
> - select OPENCV_PHOTO
> - select OPENCV_VIDEO
> + prompt "videoio"
> help
> - Video Stabilization
> + Video I/O
>
> config OPENCV_GSTREAMER
> bool
> diff --git a/rules/opencv.make b/rules/opencv.make
> index 65125e3b7..44ee4fd0c 100644
> --- a/rules/opencv.make
> +++ b/rules/opencv.make
> @@ -17,14 +17,13 @@ PACKAGES-$(PTXCONF_OPENCV) += opencv
> # Paths and names
> #
>
> -OPENCV_VERSION := 2.4.8
> -OPENCV_MD5 := 50cc1433b3654074206f5b3dbfd49848 \
> - 5270b5b5480d3f02018e14a953dc3720
> +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/Itseez/opencv/archive/$(OPENCV_VERSION).$(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
> @@ -47,6 +46,7 @@ OPENCV_CONF_OPT := \
> -DBUILD_TESTS=OFF \
> -DBUILD_PERF_TESTS=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 \
> @@ -56,14 +56,12 @@ OPENCV_CONF_OPT := \
> -DENABLE_PRECOMPILED_HEADERS=OFF \
> -DENABLE_PROFILING=OFF \
> -DENABLE_SOLUTION_FOLDERS=OFF \
> - -DOPENCV_CAN_BREAK_BINARY_COMPATIBILITY=ON \
> -DWITH_GTK:BOOL=OFF \
> -DWITH_TBB:BOOL=OFF \
> -DWITH_TIFF:BOOL=OFF \
> - -DCMAKE_VERBOSE:BOOL=OFF \
> -DWITH_CUDA:BOOL=OFF \
> -DWITH_EIGEN:BOOL=OFF \
> - -DENABLE_NEON:BOOL=$(call ptx/onoff, PTXCONF_ARCH_ARM_NEON) \
> + -DENABLE_NEON:BOOL=$(call ptx/ifdef,PTXCONF_ARCH_ARM_NEON,ON,OFF) \
> -DENABLE_VFPV3:BOOL=OFF \
> -DWITH_GIGEAPI:BOOL=OFF \
> -DINSTALL_CREATE_DISTRIB:BOOL=OFF \
> @@ -75,50 +73,54 @@ OPENCV_CONF_OPT := \
> -DWITH_OPENEXR:BOOL=OFF \
> -DWITH_PVAPI:BOOL=OFF \
> -DWITH_1394:BOOL=OFF \
> + -DWITH_VTK:BOOL=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_JASPER:BOOL=OFF \
> -DWITH_JPEG:BOOL=ON \
> + -DWITH_WEBP:BOOL=OFF \
> -DWITH_PNG:BOOL=ON \
> - -DWITH_NVCUVID:BOOL=OFF \
> - -DWITH_OPENCL:BOOL=OFF \
> + -DWITH_OPENCL:BOOL=ON \
> + -DWITH_OPENCL_SVM:BOOL=OFF \
> -DWITH_OPENCLAMDBLAS:BOOL=OFF \
> -DWITH_OPENCLAMDFFT:BOOL=OFF \
> -DWITH_OPENEXR:BOOL=OFF \
> -DWITH_OPENMP:BOOL=OFF \
> + -DWITH_PTHREADS_PF:BOOL=OFF \
> -DWITH_OPENNI:BOOL=OFF \
> + -DWITH_OPENNI2:BOOL=OFF \
> -DWITH_PVAPI:BOOL=OFF \
> -DWITH_TBB:BOOL=OFF \
> -DWITH_UNICAP: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/onoff, PTXCONF_OPENCV_CALIB3D) \
> - -DBUILD_opencv_contrib:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_CONTRIB) \
> + -DBUILD_opencv_calib3d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_CALIB3D,ON,OFF) \
> -DBUILD_opencv_core:BOOL=ON \
> - -DBUILD_opencv_features2d:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_FEATURES2D) \
> - -DBUILD_opencv_flann:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_FLANN) \
> - -DBUILD_opencv_gpu:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_GPU) \
> - -DBUILD_opencv_highgui:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_HIGHGUI) \
> - -DBUILD_opencv_imgproc:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_IMGPROC) \
> - -DBUILD_opencv_legacy:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_LEGACY) \
> - -DBUILD_opencv_ml:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_ML) \
> - -DBUILD_opencv_nonfree:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_NONFREE) \
> - -DBUILD_opencv_objdetect:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_OBJDETECT) \
> - -DBUILD_opencv_photo:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_PHOTO) \
> - -DBUILD_opencv_stitching:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_STITCHING) \
> - -DBUILD_opencv_superres:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_SUPERRES) \
> + -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/onoff, PTXCONF_OPENCV_VIDEO) \
> - -DBUILD_opencv_videostab:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_VIDEOSTAB) \
> + -DBUILD_opencv_video:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_VIDEO,ON,OFF) \
> -DBUILD_opencv_world:BOOL=OFF \
> - -DWITH_GSTREAMER:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_GSTREAMER) \
> - -DWITH_V4L:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_V4L) \
> - -DWITH_LIBV4L:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_V4L_LIBV4L2) \
> + -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)
> + -DWITH_QT:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_QT,4,OFF)
>
> # ----------------------------------------------------------------------------
> # Target-Install
> @@ -126,21 +128,19 @@ OPENCV_CONF_OPT := \
>
> OPENCV_LIBS-$(PTXCONF_OPENCV) := libopencv_core
> OPENCV_LIBS-$(PTXCONF_OPENCV_CALIB3D) += libopencv_calib3d
> -OPENCV_LIBS-$(PTXCONF_OPENCV_CONTRIB) += libopencv_contrib
> OPENCV_LIBS-$(PTXCONF_OPENCV_FEATURES2D) += libopencv_features2d
> OPENCV_LIBS-$(PTXCONF_OPENCV_FLANN) += libopencv_flann
> -OPENCV_LIBS-$(PTXCONF_OPENCV_GPU) += libopencv_gpu
> 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
This option is removed above.
> OPENCV_LIBS-$(PTXCONF_OPENCV_ML) += libopencv_ml
> -OPENCV_LIBS-$(PTXCONF_OPENCV_NONFREE) += libopencv_nonfree
> 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_SUPERRES) += libopencv_superres
> +OPENCV_LIBS-$(PTXCONF_OPENCV_SHAPE) += libopencv_shape
This option is undefined.
Michael
> OPENCV_LIBS-$(PTXCONF_OPENCV_VIDEO) += libopencv_video
> -OPENCV_LIBS-$(PTXCONF_OPENCV_VIDEOSTAB) += libopencv_videostab
> +OPENCV_LIBS-$(PTXCONF_OPENCV_VIDEOIO) += libopencv_videoio
>
> $(STATEDIR)/opencv.targetinstall:
> @$(call targetinfo)
> --
> 2.20.1
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 10+ messages in thread