From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: Marian Cichy Date: Thu, 2 Jan 2020 14:54:58 +0100 Message-Id: <20200102135503.9854-1-m.cichy@pengutronix.de> MIME-Version: 1.0 Subject: [ptxdist] [PATCH 1/6] OpenCV: Update to Version 4.1.2. List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de Cc: Marian Cichy 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 --- 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 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 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