* [ptxdist] [PATCH v4 2/8] OpenCV: Added flag to build and integrate Examples
2020-01-28 16:36 [ptxdist] [PATCH v4 1/8] OpenCV: Update to Version 4.1.2 Marian Cichy
@ 2020-01-28 16:36 ` Marian Cichy
2020-01-31 7:15 ` Michael Olbrich
2020-01-28 16:36 ` [ptxdist] [PATCH v4 3/8] OpenCV: Clean up configure_helper output Marian Cichy
` (5 subsequent siblings)
6 siblings, 1 reply; 10+ messages in thread
From: Marian Cichy @ 2020-01-28 16:36 UTC (permalink / raw)
To: ptxdist; +Cc: Marian Cichy
Signed-off-by: Marian Cichy <m.cichy@pengutronix.de>
---
rules/opencv.in | 17 +++++++++++++++++
rules/opencv.make | 13 ++++++++++---
2 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/rules/opencv.in b/rules/opencv.in
index 37fd32758..e8b9e36df 100644
--- a/rules/opencv.in
+++ b/rules/opencv.in
@@ -131,4 +131,21 @@ config OPENCV_QT
help
QT GUI Support
+config OPENCV_EXAMPLES
+ bool
+ prompt "Build Examples"
+ select OPENCV_IMGPROC
+ select OPENCV_FLANN
+ select OPENCV_IMGCODECS
+ select OPENCV_VIDEOIO
+ select OPENCV_HIGHGUI
+ select OPENCV_ML
+ select OPENCV_VIDEO
+ select OPENCV_OBJDETECT
+ select OPENCV_PHOTO
+ select OPENCV_FEATURES2D
+ select OPENCV_CALIB3D
+ select OPENCV_STITCHING
+ 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..1d97066a1 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,14 @@ 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)
+ @$(call touch)
+
# ----------------------------------------------------------------------------
# Target-Install
# ----------------------------------------------------------------------------
@@ -153,9 +161,8 @@ $(STATEDIR)/opencv.targetinstall:
@$(foreach lib, $(OPENCV_LIBS-y), \
$(call install_lib, opencv, 0, 0, 0644, $(lib));)
-
+ @$(call install_tree, opencv, 0, 0, $(OPENCV_BUILD_DIR)/bin, /bin)
@$(call install_finish, opencv)
-
@$(call touch)
# vim: syntax=make
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [ptxdist] [PATCH v4 2/8] OpenCV: Added flag to build and integrate Examples
2020-01-28 16:36 ` [ptxdist] [PATCH v4 2/8] OpenCV: Added flag to build and integrate Examples Marian Cichy
@ 2020-01-31 7:15 ` Michael Olbrich
0 siblings, 0 replies; 10+ messages in thread
From: Michael Olbrich @ 2020-01-31 7:15 UTC (permalink / raw)
To: ptxdist; +Cc: Marian Cichy
On Tue, Jan 28, 2020 at 05:36:13PM +0100, Marian Cichy wrote:
> Signed-off-by: Marian Cichy <m.cichy@pengutronix.de>
Some example use libopencv_dnn.so.4.2 but it's not installed.
Also, the rpath needs to be fixed (you know about this one already).
Michael
> ---
> rules/opencv.in | 17 +++++++++++++++++
> rules/opencv.make | 13 ++++++++++---
> 2 files changed, 27 insertions(+), 3 deletions(-)
>
> diff --git a/rules/opencv.in b/rules/opencv.in
> index 37fd32758..e8b9e36df 100644
> --- a/rules/opencv.in
> +++ b/rules/opencv.in
> @@ -131,4 +131,21 @@ config OPENCV_QT
> help
> QT GUI Support
>
> +config OPENCV_EXAMPLES
> + bool
> + prompt "Build Examples"
> + select OPENCV_IMGPROC
> + select OPENCV_FLANN
> + select OPENCV_IMGCODECS
> + select OPENCV_VIDEOIO
> + select OPENCV_HIGHGUI
> + select OPENCV_ML
> + select OPENCV_VIDEO
> + select OPENCV_OBJDETECT
> + select OPENCV_PHOTO
> + select OPENCV_FEATURES2D
> + select OPENCV_CALIB3D
> + select OPENCV_STITCHING
> + 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..1d97066a1 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,14 @@ 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)
> + @$(call touch)
> +
> # ----------------------------------------------------------------------------
> # Target-Install
> # ----------------------------------------------------------------------------
> @@ -153,9 +161,8 @@ $(STATEDIR)/opencv.targetinstall:
>
> @$(foreach lib, $(OPENCV_LIBS-y), \
> $(call install_lib, opencv, 0, 0, 0644, $(lib));)
> -
> + @$(call install_tree, opencv, 0, 0, $(OPENCV_BUILD_DIR)/bin, /bin)
> @$(call install_finish, opencv)
> -
> @$(call touch)
>
> # vim: syntax=make
> --
> 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 v4 3/8] OpenCV: Clean up configure_helper output
2020-01-28 16:36 [ptxdist] [PATCH v4 1/8] OpenCV: Update to Version 4.1.2 Marian Cichy
2020-01-28 16:36 ` [ptxdist] [PATCH v4 2/8] OpenCV: Added flag to build and integrate Examples Marian Cichy
@ 2020-01-28 16:36 ` Marian Cichy
2020-01-28 16:36 ` [ptxdist] [PATCH v4 4/8] OpenCV: Changed QT-Support from 4 to 5 Marian Cichy
` (4 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Marian Cichy @ 2020-01-28 16:36 UTC (permalink / raw)
To: ptxdist; +Cc: Marian Cichy
Signed-off-by: Marian Cichy <m.cichy@pengutronix.de>
---
rules/opencv.make | 161 +++++++++++++++++++++++++++++++---------------
1 file changed, 109 insertions(+), 52 deletions(-)
diff --git a/rules/opencv.make b/rules/opencv.make
index 1d97066a1..e08d90a3b 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,153 @@ 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:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_VIDEOIO) \
+ -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_C_EXAMPLES:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_EXAMPLES) \
-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=OFF \
+ -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_IPP=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)
@@ -141,12 +200,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] 10+ messages in thread* [ptxdist] [PATCH v4 4/8] OpenCV: Changed QT-Support from 4 to 5
2020-01-28 16:36 [ptxdist] [PATCH v4 1/8] OpenCV: Update to Version 4.1.2 Marian Cichy
2020-01-28 16:36 ` [ptxdist] [PATCH v4 2/8] OpenCV: Added flag to build and integrate Examples Marian Cichy
2020-01-28 16:36 ` [ptxdist] [PATCH v4 3/8] OpenCV: Clean up configure_helper output Marian Cichy
@ 2020-01-28 16:36 ` Marian Cichy
2020-01-28 16:36 ` [ptxdist] [PATCH v4 5/8] OpenCV: added switch to turn on/off DNN support Marian Cichy
` (3 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Marian Cichy @ 2020-01-28 16:36 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 e8b9e36df..16e7b56db 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 e08d90a3b..1cc692855 100644
--- a/rules/opencv.make
+++ b/rules/opencv.make
@@ -170,7 +170,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 v4 5/8] OpenCV: added switch to turn on/off DNN support
2020-01-28 16:36 [ptxdist] [PATCH v4 1/8] OpenCV: Update to Version 4.1.2 Marian Cichy
` (2 preceding siblings ...)
2020-01-28 16:36 ` [ptxdist] [PATCH v4 4/8] OpenCV: Changed QT-Support from 4 to 5 Marian Cichy
@ 2020-01-28 16:36 ` Marian Cichy
2020-01-28 16:36 ` [ptxdist] [PATCH v4 6/8] OpenCV: changed ptx/ifdef usage to ptx/onoff Marian Cichy
` (2 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Marian Cichy @ 2020-01-28 16:36 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 16e7b56db..a917d79c7 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 1cc692855..9ec11dc51 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] 10+ messages in thread* [ptxdist] [PATCH v4 6/8] OpenCV: changed ptx/ifdef usage to ptx/onoff
2020-01-28 16:36 [ptxdist] [PATCH v4 1/8] OpenCV: Update to Version 4.1.2 Marian Cichy
` (3 preceding siblings ...)
2020-01-28 16:36 ` [ptxdist] [PATCH v4 5/8] OpenCV: added switch to turn on/off DNN support Marian Cichy
@ 2020-01-28 16:36 ` Marian Cichy
2020-01-31 7:15 ` Michael Olbrich
2020-01-28 16:36 ` [ptxdist] [PATCH v4 7/8] OpenCV: Update to version 4.2.0 Marian Cichy
2020-01-28 16:36 ` [ptxdist] [PATCH v4 8/8] OpenCV: make build generate pkg-config file Marian Cichy
6 siblings, 1 reply; 10+ messages in thread
From: Marian Cichy @ 2020-01-28 16:36 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 9ec11dc51..50bcd5997 100644
--- a/rules/opencv.make
+++ b/rules/opencv.make
@@ -60,25 +60,25 @@ 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_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 \
-DCPU_BASELINE=DETECT \
@@ -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 \
@@ -153,7 +153,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 \
@@ -175,7 +175,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 v4 6/8] OpenCV: changed ptx/ifdef usage to ptx/onoff
2020-01-28 16:36 ` [ptxdist] [PATCH v4 6/8] OpenCV: changed ptx/ifdef usage to ptx/onoff Marian Cichy
@ 2020-01-31 7:15 ` Michael Olbrich
0 siblings, 0 replies; 10+ messages in thread
From: Michael Olbrich @ 2020-01-31 7:15 UTC (permalink / raw)
To: ptxdist
On Tue, Jan 28, 2020 at 05:36:17PM +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>
> ---
> rules/opencv.make | 32 ++++++++++++++++----------------
> 1 file changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/rules/opencv.make b/rules/opencv.make
> index 9ec11dc51..50bcd5997 100644
> --- a/rules/opencv.make
> +++ b/rules/opencv.make
> @@ -60,25 +60,25 @@ 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) \
Typo: ptx/onff -> ptx/onoff
Michael
> + -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_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 \
> -DCPU_BASELINE=DETECT \
> @@ -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 \
> @@ -153,7 +153,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 \
> @@ -175,7 +175,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
* [ptxdist] [PATCH v4 7/8] OpenCV: Update to version 4.2.0
2020-01-28 16:36 [ptxdist] [PATCH v4 1/8] OpenCV: Update to Version 4.1.2 Marian Cichy
` (4 preceding siblings ...)
2020-01-28 16:36 ` [ptxdist] [PATCH v4 6/8] OpenCV: changed ptx/ifdef usage to ptx/onoff Marian Cichy
@ 2020-01-28 16:36 ` Marian Cichy
2020-01-28 16:36 ` [ptxdist] [PATCH v4 8/8] OpenCV: make build generate pkg-config file Marian Cichy
6 siblings, 0 replies; 10+ messages in thread
From: Marian Cichy @ 2020-01-28 16:36 UTC (permalink / raw)
To: ptxdist; +Cc: Marian Cichy
Update version and add new dependencies
---
rules/opencv.in | 1 +
rules/opencv.make | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/rules/opencv.in b/rules/opencv.in
index a917d79c7..8380506ad 100644
--- a/rules/opencv.in
+++ b/rules/opencv.in
@@ -99,6 +99,7 @@ config OPENCV_VIDEO
config OPENCV_VIDEOIO
bool
prompt "videoio"
+ select OPENCV_IMGCODECS
help
Video I/O
diff --git a/rules/opencv.make b/rules/opencv.make
index 50bcd5997..73582af38 100644
--- a/rules/opencv.make
+++ b/rules/opencv.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_OPENCV) += opencv
# Paths and names
#
-OPENCV_VERSION := 4.1.2
-OPENCV_MD5 := 6b390578d57131ae9d6c2a183257399d
+OPENCV_VERSION := 4.2.0
+OPENCV_MD5 := b02b54115f1f99cb9e885d1e5988ff70
OPENCV := opencv-$(OPENCV_VERSION)
OPENCV_SUFFIX := zip
OPENCV_URL := \
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 10+ messages in thread* [ptxdist] [PATCH v4 8/8] OpenCV: make build generate pkg-config file
2020-01-28 16:36 [ptxdist] [PATCH v4 1/8] OpenCV: Update to Version 4.1.2 Marian Cichy
` (5 preceding siblings ...)
2020-01-28 16:36 ` [ptxdist] [PATCH v4 7/8] OpenCV: Update to version 4.2.0 Marian Cichy
@ 2020-01-28 16:36 ` Marian Cichy
6 siblings, 0 replies; 10+ messages in thread
From: Marian Cichy @ 2020-01-28 16:36 UTC (permalink / raw)
To: ptxdist; +Cc: Marian Cichy
OpenCV usually depends on CMake when some application wants to find its
libraries. However, PTXDist usually relies on pkg-config when building
custom software.
NOTE: This is a workaround since OpenCV marks the usage of pkg-config as
deprecated.
---
rules/opencv.make | 1 +
1 file changed, 1 insertion(+)
diff --git a/rules/opencv.make b/rules/opencv.make
index 73582af38..ce10e9033 100644
--- a/rules/opencv.make
+++ b/rules/opencv.make
@@ -182,6 +182,7 @@ OPENCV_CONF_OPT := \
-DWITH_WEBP:BOOL=OFF \
-DWITH_XIMEA:BOOL=OFF \
-DWITH_XINE:BOOL=OFF \
+ -DOPENCV_GENERATE_PKGCONFIG=ON \
$(STATEDIR)/opencv.install:
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 10+ messages in thread