From 98d6f56788b4abd374d1f04a35cf3d6602092200 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Fri, 23 Apr 2021 17:20:12 +0200 Subject: [PATCH] gatesgarth migration: opencv: remove custom recipe reusing the upstream version Recipe was updated in meta-freescale layer https://jira.digi.com/browse/DEL-7508 Signed-off-by: Arturo Buzarra --- ...dparty-ippicv-Use-pre-downloaded-ipp.patch | 36 --- ...maller-version-of-download_models.py.patch | 179 --------------- .../opencv/opencv/0001-Dont-use-isystem.patch | 28 --- .../opencv/0001-Make-ts-module-external.patch | 42 ---- ...-around-deprecated-ffmpeg-RAW-functi.patch | 31 --- .../0001-Use-Os-to-compile-tinyxml2.cpp.patch | 31 --- .../0003-To-fix-errors-as-following.patch | 70 ------ .../opencv/opencv/OpenCV_DNN_examples.patch | 148 ------------ .../opencv/opencv/download.patch | 41 ---- .../recipes-support/opencv/opencv_4.4.0.bb | 217 ------------------ .../opencv/opencv_4.4.0.imx.bb | 57 ----- 11 files changed, 880 deletions(-) delete mode 100644 meta-digi-dey/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch delete mode 100644 meta-digi-dey/recipes-support/opencv/opencv/0001-Add-smaller-version-of-download_models.py.patch delete mode 100644 meta-digi-dey/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch delete mode 100644 meta-digi-dey/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch delete mode 100644 meta-digi-dey/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch delete mode 100644 meta-digi-dey/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch delete mode 100644 meta-digi-dey/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch delete mode 100644 meta-digi-dey/recipes-support/opencv/opencv/OpenCV_DNN_examples.patch delete mode 100644 meta-digi-dey/recipes-support/opencv/opencv/download.patch delete mode 100644 meta-digi-dey/recipes-support/opencv/opencv_4.4.0.bb delete mode 100644 meta-digi-dey/recipes-support/opencv/opencv_4.4.0.imx.bb diff --git a/meta-digi-dey/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch b/meta-digi-dey/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch deleted file mode 100644 index 9e6a61371..000000000 --- a/meta-digi-dey/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9b4959b97d2e95d4b49cf6ca2a3fce3cdb484f2d Mon Sep 17 00:00:00 2001 -From: Ricardo Ribalda Delgado -Date: Thu, 31 Mar 2016 00:20:15 +0200 -Subject: [PATCH] 3rdparty/ippicv: Use pre-downloaded ipp - -Signed-off-by: Ricardo Ribalda Delgado -Signed-off-by: Ismo Puustinen - ---- - 3rdparty/ippicv/ippicv.cmake | 15 +-------------- - 1 file changed, 1 insertion(+), 14 deletions(-) - -diff --git a/3rdparty/ippicv/ippicv.cmake b/3rdparty/ippicv/ippicv.cmake -index 257af6fcc6..f88460450f 100644 ---- a/3rdparty/ippicv/ippicv.cmake -+++ b/3rdparty/ippicv/ippicv.cmake -@@ -34,18 +34,5 @@ function(download_ippicv root_var) - endif() - - set(THE_ROOT "${OpenCV_BINARY_DIR}/3rdparty/ippicv") -- ocv_download(FILENAME ${OPENCV_ICV_NAME} -- HASH ${OPENCV_ICV_HASH} -- URL -- "${OPENCV_IPPICV_URL}" -- "$ENV{OPENCV_IPPICV_URL}" -- "https://raw.githubusercontent.com/opencv/opencv_3rdparty/${IPPICV_COMMIT}/ippicv/" -- DESTINATION_DIR "${THE_ROOT}" -- ID IPPICV -- STATUS res -- UNPACK RELATIVE_URL) -- -- if(res) -- set(${root_var} "${THE_ROOT}/${OPENCV_ICV_PACKAGE_SUBDIR}" PARENT_SCOPE) -- endif() -+ set(${root_var} "${THE_ROOT}/${OPENCV_ICV_PACKAGE_SUBDIR}" PARENT_SCOPE) - endfunction() diff --git a/meta-digi-dey/recipes-support/opencv/opencv/0001-Add-smaller-version-of-download_models.py.patch b/meta-digi-dey/recipes-support/opencv/opencv/0001-Add-smaller-version-of-download_models.py.patch deleted file mode 100644 index 0aabee29f..000000000 --- a/meta-digi-dey/recipes-support/opencv/opencv/0001-Add-smaller-version-of-download_models.py.patch +++ /dev/null @@ -1,179 +0,0 @@ -From fca4d9eec289f22c081daa2c61a1110e3f268f92 Mon Sep 17 00:00:00 2001 -From: Tom Hochstein -Date: Tue, 1 Sep 2020 14:57:07 -0500 -Subject: [PATCH] Add smaller version of download_models.py - -Signed-off-by: Tom Hochstein ---- - testdata/dnn/download_models_basic.py | 159 ++++++++++++++++++++++++++ - 1 file changed, 159 insertions(+) - create mode 100644 testdata/dnn/download_models_basic.py - -diff --git a/testdata/dnn/download_models_basic.py b/testdata/dnn/download_models_basic.py -new file mode 100644 -index 0000000..5c8a616 ---- /dev/null -+++ b/testdata/dnn/download_models_basic.py -@@ -0,0 +1,159 @@ -+#!/usr/bin/env python -+ -+from __future__ import print_function -+import hashlib -+import sys -+import tarfile -+if sys.version_info[0] < 3: -+ from urllib2 import urlopen -+else: -+ from urllib.request import urlopen -+ -+ -+class Model: -+ MB = 1024*1024 -+ BUFSIZE = 10*MB -+ -+ def __init__(self, **kwargs): -+ self.name = kwargs.pop('name') -+ self.url = kwargs.pop('url', None) -+ self.filename = kwargs.pop('filename') -+ self.sha = kwargs.pop('sha', None) -+ self.archive = kwargs.pop('archive', None) -+ self.member = kwargs.pop('member', None) -+ -+ def __str__(self): -+ return 'Model <{}>'.format(self.name) -+ -+ def printRequest(self, r): -+ def getMB(r): -+ d = dict(r.info()) -+ for c in ['content-length', 'Content-Length']: -+ if c in d: -+ return int(d[c]) / self.MB -+ return '' -+ print(' {} {} [{} Mb]'.format(r.getcode(), r.msg, getMB(r))) -+ -+ def verify(self): -+ if not self.sha: -+ return False -+ print(' expect {}'.format(self.sha)) -+ sha = hashlib.sha1() -+ try: -+ with open(self.filename, 'rb') as f: -+ while True: -+ buf = f.read(self.BUFSIZE) -+ if not buf: -+ break -+ sha.update(buf) -+ print(' actual {}'.format(sha.hexdigest())) -+ return self.sha == sha.hexdigest() -+ except Exception as e: -+ print(' catch {}'.format(e)) -+ -+ def get(self): -+ if self.verify(): -+ print(' hash match - skipping') -+ return True -+ -+ if self.archive or self.member: -+ assert(self.archive and self.member) -+ print(' hash check failed - extracting') -+ print(' get {}'.format(self.member)) -+ self.extract() -+ else: -+ assert(self.url) -+ print(' hash check failed - downloading') -+ print(' get {}'.format(self.url)) -+ self.download() -+ -+ print(' done') -+ print(' file {}'.format(self.filename)) -+ return self.verify() -+ -+ def download(self): -+ try: -+ r = urlopen(self.url, timeout=60) -+ self.printRequest(r) -+ self.save(r) -+ except Exception as e: -+ print(' catch {}'.format(e)) -+ -+ def extract(self): -+ try: -+ with tarfile.open(self.archive) as f: -+ assert self.member in f.getnames() -+ self.save(f.extractfile(self.member)) -+ except Exception as e: -+ print(' catch {}'.format(e)) -+ -+ def save(self, r): -+ with open(self.filename, 'wb') as f: -+ print(' progress ', end='') -+ sys.stdout.flush() -+ while True: -+ buf = r.read(self.BUFSIZE) -+ if not buf: -+ break -+ f.write(buf) -+ print('>', end='') -+ sys.stdout.flush() -+ -+models = [ -+ Model( -+ name='Fcn', -+ url='http://dl.caffe.berkeleyvision.org/fcn8s-heavy-pascal.caffemodel', -+ sha='c449ea74dd7d83751d1357d6a8c323fcf4038962', -+ filename='fcn8s-heavy-pascal.caffemodel'), -+ Model( -+ name='SqueezeNet_v1.1', -+ url='https://raw.githubusercontent.com/DeepScale/SqueezeNet/b5c3f1a23713c8b3fd7b801d229f6b04c64374a5/SqueezeNet_v1.1/squeezenet_v1.1.caffemodel', -+ sha='3397f026368a45ae236403ccc81cfcbe8ebe1bd0', -+ filename='squeezenet_v1.1.caffemodel'), -+ Model( -+ name='Colorization', -+ url='https://raw.githubusercontent.com/richzhang/colorization/master/models/colorization_deploy_v2.prototxt', -+ sha='f528334e386a69cbaaf237a7611d833bef8e5219', -+ filename='colorization_deploy_v2.prototxt'), -+ Model( -+ name='Colorization', -+ url='http://eecs.berkeley.edu/~rich.zhang/projects/2016_colorization/files/demo_v2/colorization_release_v2.caffemodel', -+ sha='21e61293a3fa6747308171c11b6dd18a68a26e7f', -+ filename='colorization_release_v2.caffemodel'), -+ Model( -+ name='OpenPose/pose/coco', # https://github.com/CMU-Perceptual-Computing-Lab/openpose -+ url='http://posefs1.perception.cs.cmu.edu/OpenPose/models/pose/coco/pose_iter_440000.caffemodel', -+ sha='ac7e97da66f3ab8169af2e601384c144e23a95c1', -+ filename='openpose_pose_coco.caffemodel'), -+ Model( -+ name='YOLOv3', # https://pjreddie.com/darknet/yolo/ -+ url='https://pjreddie.com/media/files/yolov3.weights', -+ sha='520878f12e97cf820529daea502acca380f1cb8e', -+ filename='yolov3.weights'), -+ Model( -+ name='EAST', # https://github.com/argman/EAST (a TensorFlow model), https://arxiv.org/abs/1704.03155v2 (a paper) -+ url='https://www.dropbox.com/s/r2ingd0l3zt8hxs/frozen_east_text_detection.tar.gz?dl=1', -+ sha='3ca8233d6edd748f7ed23246c8ca24cbf696bb94', -+ filename='frozen_east_text_detection.tar.gz'), -+ Model( -+ name='EAST', -+ archive='frozen_east_text_detection.tar.gz', -+ member='frozen_east_text_detection.pb', -+ sha='fffabf5ac36f37bddf68e34e84b45f5c4247ed06', -+ filename='frozen_east_text_detection.pb'), -+] -+ -+# Note: models will be downloaded to current working directory -+# expected working directory is opencv_extra/testdata/dnn -+if __name__ == '__main__': -+ failedModels = [] -+ for m in models: -+ print(m) -+ if not m.get(): -+ failedModels.append(m.filename) -+ -+ if failedModels: -+ print("Following models have not been downloaded:") -+ for f in failedModels: -+ print("* {}".format(f)) -+ exit(15) --- -2.17.1 - diff --git a/meta-digi-dey/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch b/meta-digi-dey/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch deleted file mode 100644 index 948a80faf..000000000 --- a/meta-digi-dey/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 66e50ee69fa9ee2469d349100e70d8b296c4b4dc Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 11 Sep 2018 00:21:18 -0700 -Subject: [PATCH] Dont use isystem - -clang really does not like it - -Upstream-Status: Pending - -Signed-off-by: Khem Raj - ---- - cmake/OpenCVPCHSupport.cmake | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/cmake/OpenCVPCHSupport.cmake b/cmake/OpenCVPCHSupport.cmake -index 08cd06def4..46c9c02da3 100644 ---- a/cmake/OpenCVPCHSupport.cmake -+++ b/cmake/OpenCVPCHSupport.cmake -@@ -18,6 +18,8 @@ IF(CV_GCC) - SET(PCHSupport_FOUND TRUE) - ENDIF() - -+ SET(CMAKE_INCLUDE_SYSTEM_FLAG_C "-I") -+ SET(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-I") - SET(_PCH_include_prefix "-I") - SET(_PCH_isystem_prefix "-isystem") - SET(_PCH_define_prefix "-D") diff --git a/meta-digi-dey/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch b/meta-digi-dey/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch deleted file mode 100644 index d56b8ae67..000000000 --- a/meta-digi-dey/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 11bbf909e08594628bd757d989ae34cf1bfe200b Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Thu, 18 Jun 2020 05:51:38 +0000 -Subject: [PATCH] Make ts module external - -Make ts module external - -Reference: https://github.com/qbonnard/opencv/commit/6b229c5834cb9a0930425e762a6c7b03244d7abb - -Upstream-Status: Submitted [https://github.com/opencv/opencv/issues/8408] - -Signed-off-by: Mingli Yu ---- - modules/ts/CMakeLists.txt | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/modules/ts/CMakeLists.txt b/modules/ts/CMakeLists.txt -index f95bed0793..66f315bcca 100644 ---- a/modules/ts/CMakeLists.txt -+++ b/modules/ts/CMakeLists.txt -@@ -4,9 +4,6 @@ if(NOT BUILD_opencv_ts AND NOT BUILD_TESTS AND NOT BUILD_PERF_TESTS) - ocv_module_disable(ts) - endif() - --set(OPENCV_MODULE_TYPE STATIC) --set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE) -- - if(WINRT) - # WINRT doesn't have access to environment variables - # so adding corresponding macros during CMake run -@@ -16,7 +13,7 @@ endif() - - ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef) - --ocv_add_module(ts INTERNAL opencv_core opencv_imgproc opencv_imgcodecs opencv_videoio opencv_highgui) -+ocv_add_module(ts opencv_core opencv_imgproc opencv_imgcodecs opencv_videoio opencv_highgui) - - ocv_glob_module_sources() - ocv_module_include_directories() --- -2.24.1 - diff --git a/meta-digi-dey/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch b/meta-digi-dey/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch deleted file mode 100644 index 1e47f8b16..000000000 --- a/meta-digi-dey/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e4ec6cea72da9e9ae5ba57140fa2f5c63f1f8295 Mon Sep 17 00:00:00 2001 -From: Jason Wessel -Date: Wed, 9 May 2018 13:33:59 -0700 -Subject: [PATCH] Temporarliy work around deprecated ffmpeg RAW function - compile failure until next uprev - -Signed-off-by: Jason Wessel - ---- - modules/videoio/src/cap_ffmpeg_impl.hpp | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/modules/videoio/src/cap_ffmpeg_impl.hpp b/modules/videoio/src/cap_ffmpeg_impl.hpp -index 6dca724a89..ae55dd4555 100644 ---- a/modules/videoio/src/cap_ffmpeg_impl.hpp -+++ b/modules/videoio/src/cap_ffmpeg_impl.hpp -@@ -774,6 +774,14 @@ struct ImplMutex::Impl - - #endif - -+/* NOTE This is deprecated in ffmpeg and the code should be removed */ -+#ifndef AVFMT_RAWPICTURE -+#define AVFMT_RAWPICTURE 0x0020 -+#endif /* AVFMT_RAWPICTURE */ -+#ifndef CODEC_FLAG_GLOBAL_HEADER -+#define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER -+#endif -+ - void ImplMutex::init() - { - impl = new Impl(); diff --git a/meta-digi-dey/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch b/meta-digi-dey/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch deleted file mode 100644 index c5a64387f..000000000 --- a/meta-digi-dey/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 59fafe6e39759e193b5764b36b4c5a93da352123 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 18 Aug 2020 00:36:49 -0700 -Subject: [PATCH] Use -Os to compile tinyxml2.cpp - -This workarounds issue [1] seen on riscv with gcc - -[1] https://github.com/riscv/riscv-gnu-toolchain/issues/624 - -Upstream-Status: Inappropriate [ OE-Specific ] -Signed-off-by: Khem Raj ---- - modules/datasets/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/datasets/CMakeLists.txt b/modules/datasets/CMakeLists.txt -index 56ca9e310..99b7a33f6 100644 ---- a/modules/datasets/CMakeLists.txt -+++ b/modules/datasets/CMakeLists.txt -@@ -2,7 +2,7 @@ set(the_description "datasets framework") - - set(filter_srcs "${CMAKE_CURRENT_LIST_DIR}/src/tinyxml2/tinyxml2.cpp") - if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") -- ocv_append_source_files_cxx_compiler_options(filter_srcs "-Wno-suggest-override") # GCC -+ ocv_append_source_files_cxx_compiler_options(filter_srcs "-Wno-suggest-override -Os") # GCC - elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - ocv_append_source_files_cxx_compiler_options(filter_srcs "-Wno-inconsistent-missing-override") # Clang - endif() --- -2.28.0 - diff --git a/meta-digi-dey/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch b/meta-digi-dey/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch deleted file mode 100644 index bb47ef2ba..000000000 --- a/meta-digi-dey/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch +++ /dev/null @@ -1,70 +0,0 @@ -From f42c9b8c7bafcadc7e95fb25a391707f970eb426 Mon Sep 17 00:00:00 2001 -From: Huang Qiyu -Date: Fri, 19 May 2017 04:27:50 +0900 -Subject: [PATCH] To fix errors as following: - -"test_main.cpp:45: undefined reference to `parseCustomOptions(int, char**)'" -"perf_abs.cpp:13: undefined reference to `cvtest::param_seed'" -"test_superres.cpp:270: undefined reference to `checkIppStatus()'" - -Signed-off-by: Huang Qiyu - -Also add the visibility changes for certain OpenCL-related functions in -ts module. - -Signed-off-by: Ismo Puustinen - ---- - modules/ts/include/opencv2/ts.hpp | 4 ++-- - modules/ts/include/opencv2/ts/ocl_test.hpp | 2 +- - modules/ts/include/opencv2/ts/ts_ext.hpp | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/modules/ts/include/opencv2/ts.hpp b/modules/ts/include/opencv2/ts.hpp -index ed7491a89a..80919d13ee 100644 ---- a/modules/ts/include/opencv2/ts.hpp -+++ b/modules/ts/include/opencv2/ts.hpp -@@ -728,7 +728,7 @@ protected: - } - }; - --extern uint64 param_seed; -+CV_EXPORTS extern uint64 param_seed; - - struct DefaultRngAuto - { -@@ -791,7 +791,7 @@ private: - #endif - #endif - --void parseCustomOptions(int argc, char **argv); -+CV_EXPORTS void parseCustomOptions(int argc, char **argv); - - #define CV_TEST_INIT0_NOOP (void)0 - -diff --git a/modules/ts/include/opencv2/ts/ocl_test.hpp b/modules/ts/include/opencv2/ts/ocl_test.hpp -index 11572e9f48..438112e2aa 100644 ---- a/modules/ts/include/opencv2/ts/ocl_test.hpp -+++ b/modules/ts/include/opencv2/ts/ocl_test.hpp -@@ -82,7 +82,7 @@ inline UMat ToUMat(InputArray src) - return dst; - } - --extern int test_loop_times; -+CV_EXPORTS extern int test_loop_times; - - #define MAX_VALUE 357 - -diff --git a/modules/ts/include/opencv2/ts/ts_ext.hpp b/modules/ts/include/opencv2/ts/ts_ext.hpp -index b2a4cac241..b94c681c0c 100644 ---- a/modules/ts/include/opencv2/ts/ts_ext.hpp -+++ b/modules/ts/include/opencv2/ts/ts_ext.hpp -@@ -9,7 +9,7 @@ - #define OPENCV_TS_EXT_HPP - - namespace cvtest { --void checkIppStatus(); -+CV_EXPORTS void checkIppStatus(); - extern bool skipUnstableTests; - extern bool runBigDataTests; - extern int testThreads; diff --git a/meta-digi-dey/recipes-support/opencv/opencv/OpenCV_DNN_examples.patch b/meta-digi-dey/recipes-support/opencv/opencv/OpenCV_DNN_examples.patch deleted file mode 100644 index 712806adb..000000000 --- a/meta-digi-dey/recipes-support/opencv/opencv/OpenCV_DNN_examples.patch +++ /dev/null @@ -1,148 +0,0 @@ -From 3c4daafb54f961e376104a461ca7ec114ff0331a Mon Sep 17 00:00:00 2001 -From: Ludek Slosarcik -Date: Fri, 14 Feb 2020 15:46:50 +0100 -Subject: [PATCH] opencv_dnn: added video device for 2 examples, and change text labels - -Signed-off-by: Ludek Slosarcik - -Upstream-Status: Pending ---- - samples/cpp/logistic_regression.cpp | 2 +- - samples/dnn/classification.cpp | 7 ++++--- - samples/dnn/object_detection.cpp | 10 +++++----- - samples/dnn/segmentation.cpp | 2 +- - samples/dnn/text_detection.cpp | 5 +++-- - 5 files changed, 14 insertions(+), 12 deletions(-) - -Index: git/samples/cpp/logistic_regression.cpp -=================================================================== ---- git.orig/samples/cpp/logistic_regression.cpp -+++ git/samples/cpp/logistic_regression.cpp -@@ -83,7 +83,7 @@ static float calculateAccuracyPercent(co - - int main() - { -- const String filename = samples::findFile("data01.xml"); -+ const String filename = samples::findFile("../data/data01.xml"); - cout << "**********************************************************************" << endl; - cout << filename - << " contains digits 0 and 1 of 20 samples each, collected on an Android device" << endl; -Index: git/samples/dnn/classification.cpp -=================================================================== ---- git.orig/samples/dnn/classification.cpp -+++ git/samples/dnn/classification.cpp -@@ -11,6 +11,7 @@ std::string keys = - "{ help h | | Print help message. }" - "{ @alias | | An alias name of model to extract preprocessing parameters from models.yml file. }" - "{ zoo | models.yml | An optional path to file with preprocessing parameters }" -+ "{ device | 0 | camera device number. }" - "{ input i | | Path to input image or video file. Skip this argument to capture frames from a camera.}" - "{ framework f | | Optional name of an origin framework of the model. Detect it automatically if it does not set. }" - "{ classes | | Optional path to a text file with names of classes. }" -@@ -94,7 +95,7 @@ int main(int argc, char** argv) - if (parser.has("input")) - cap.open(parser.get("input")); - else -- cap.open(0); -+ cap.open(parser.get("device")); - //! [Open a video file or an image file or a camera stream] - - // Process frames. -@@ -131,13 +132,13 @@ int main(int argc, char** argv) - double freq = getTickFrequency() / 1000; - double t = net.getPerfProfile(layersTimes) / freq; - std::string label = format("Inference time: %.2f ms", t); -- putText(frame, label, Point(0, 15), FONT_HERSHEY_SIMPLEX, 0.5, Scalar(0, 255, 0)); -+ putText(frame, label, Point(0, 20), FONT_HERSHEY_SIMPLEX, 0.8, Scalar(0, 0, 255), 2, 8, false); - - // Print predicted class. - label = format("%s: %.4f", (classes.empty() ? format("Class #%d", classId).c_str() : - classes[classId].c_str()), - confidence); -- putText(frame, label, Point(0, 40), FONT_HERSHEY_SIMPLEX, 0.5, Scalar(0, 255, 0)); -+ putText(frame, label, Point(0, 45), FONT_HERSHEY_SIMPLEX, 0.8, Scalar(0, 0, 255), 2, 8, false); - - imshow(kWinName, frame); - } -Index: git/samples/dnn/object_detection.cpp -=================================================================== ---- git.orig/samples/dnn/object_detection.cpp -+++ git/samples/dnn/object_detection.cpp -@@ -251,13 +251,13 @@ int main(int argc, char** argv) - if (predictionsQueue.counter > 1) - { - std::string label = format("Camera: %.2f FPS", framesQueue.getFPS()); -- putText(frame, label, Point(0, 15), FONT_HERSHEY_SIMPLEX, 0.5, Scalar(0, 255, 0)); -+ putText(frame, label, Point(0, 20), FONT_HERSHEY_SIMPLEX, 0.8, Scalar(0, 0, 255), 2, 8, false); - - label = format("Network: %.2f FPS", predictionsQueue.getFPS()); -- putText(frame, label, Point(0, 30), FONT_HERSHEY_SIMPLEX, 0.5, Scalar(0, 255, 0)); -+ putText(frame, label, Point(0, 45), FONT_HERSHEY_SIMPLEX, 0.8, Scalar(0, 0, 255), 2, 8, false); - - label = format("Skipped frames: %d", framesQueue.counter - predictionsQueue.counter); -- putText(frame, label, Point(0, 45), FONT_HERSHEY_SIMPLEX, 0.5, Scalar(0, 255, 0)); -+ putText(frame, label, Point(0, 70), FONT_HERSHEY_SIMPLEX, 0.8, Scalar(0, 0, 255), 2, 8, false); - } - imshow(kWinName, frame); - } -@@ -293,7 +293,7 @@ int main(int argc, char** argv) - double freq = getTickFrequency() / 1000; - double t = net.getPerfProfile(layersTimes) / freq; - std::string label = format("Inference time: %.2f ms", t); -- putText(frame, label, Point(0, 15), FONT_HERSHEY_SIMPLEX, 0.5, Scalar(0, 255, 0)); -+ putText(frame, label, Point(0, 20), FONT_HERSHEY_SIMPLEX, 0.8, Scalar(0, 0, 255), 2, 8, false); - - imshow(kWinName, frame); - } -@@ -462,7 +462,7 @@ void drawPred(int classId, float conf, i - top = max(top, labelSize.height); - rectangle(frame, Point(left, top - labelSize.height), - Point(left + labelSize.width, top + baseLine), Scalar::all(255), FILLED); -- putText(frame, label, Point(left, top), FONT_HERSHEY_SIMPLEX, 0.5, Scalar()); -+ putText(frame, label, Point(left, top), FONT_HERSHEY_SIMPLEX, 0.8, Scalar()); - } - - void callback(int pos, void*) -Index: git/samples/dnn/segmentation.cpp -=================================================================== ---- git.orig/samples/dnn/segmentation.cpp -+++ git/samples/dnn/segmentation.cpp -@@ -157,7 +157,7 @@ int main(int argc, char** argv) - double freq = getTickFrequency() / 1000; - double t = net.getPerfProfile(layersTimes) / freq; - std::string label = format("Inference time: %.2f ms", t); -- putText(frame, label, Point(0, 15), FONT_HERSHEY_SIMPLEX, 0.5, Scalar(0, 255, 0)); -+ putText(frame, label, Point(0, 20), FONT_HERSHEY_SIMPLEX, 0.8, Scalar(0, 0, 255), 2, 8, false); - - imshow(kWinName, frame); - if (!classes.empty()) -Index: git/samples/dnn/text_detection.cpp -=================================================================== ---- git.orig/samples/dnn/text_detection.cpp -+++ git/samples/dnn/text_detection.cpp -@@ -25,6 +25,7 @@ using namespace cv::dnn; - const char* keys = - "{ help h | | Print help message. }" - "{ input i | | Path to input image or video file. Skip this argument to capture frames from a camera.}" -+ "{ device | 0 | camera device number. }" - "{ model m | | Path to a binary .pb file contains trained detector network.}" - "{ ocr | | Path to a binary .pb or .onnx file contains trained recognition network.}" - "{ width | 320 | Preprocess input image by resizing to a specific width. It should be multiple by 32. }" -@@ -75,7 +76,7 @@ int main(int argc, char** argv) - - // Open a video file or an image file or a camera stream. - VideoCapture cap; -- bool openSuccess = parser.has("input") ? cap.open(parser.get("input")) : cap.open(0); -+ bool openSuccess = parser.has("input") ? cap.open(parser.get("input")) : cap.open(parser.get("device")); - CV_Assert(openSuccess); - - static const std::string kWinName = "EAST: An Efficient and Accurate Scene Text Detector"; -@@ -156,7 +157,7 @@ int main(int argc, char** argv) - - // Put efficiency information. - std::string label = format("Inference time: %.2f ms", tickMeter.getTimeMilli()); -- putText(frame, label, Point(0, 15), FONT_HERSHEY_SIMPLEX, 0.5, Scalar(0, 255, 0)); -+ putText(frame, label, Point(0, 20), FONT_HERSHEY_SIMPLEX, 0.8, Scalar(0, 0, 255), 2, 8, false); - - imshow(kWinName, frame); - diff --git a/meta-digi-dey/recipes-support/opencv/opencv/download.patch b/meta-digi-dey/recipes-support/opencv/opencv/download.patch deleted file mode 100644 index 33ac48312..000000000 --- a/meta-digi-dey/recipes-support/opencv/opencv/download.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b18a280fab06a680d9f831bf8b462647f3cb6214 Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Thu, 9 Jan 2020 16:24:24 +0000 -Subject: [PATCH] opencv: abort configure if we need to download - -This CMake module will download files during do_configure. This is bad as it -means we can't do offline builds. - -Add an option to disallow downloads by emitting a fatal error. - -Upstream-Status: Pending -Signed-off-by: Ross Burton - ---- - cmake/OpenCVDownload.cmake | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/cmake/OpenCVDownload.cmake b/cmake/OpenCVDownload.cmake -index 63cf6d3238..4acf477f70 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 /.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}") diff --git a/meta-digi-dey/recipes-support/opencv/opencv_4.4.0.bb b/meta-digi-dey/recipes-support/opencv/opencv_4.4.0.bb deleted file mode 100644 index c83186de0..000000000 --- a/meta-digi-dey/recipes-support/opencv/opencv_4.4.0.bb +++ /dev/null @@ -1,217 +0,0 @@ -SUMMARY = "Opencv : The Open Computer Vision Library" -HOMEPAGE = "http://opencv.org/" -SECTION = "libs" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=19598330421859a6dd353a4318091ac7" - -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" - -DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" - -SRCREV_opencv = "c3bb57afeaf030f10939204d48d7c2a3842f4293" -SRCREV_contrib = "5fae4082cc493efa5cb7a7486f9e009618a5198b" -SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274" -SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" -SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" -SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" - -def ipp_filename(d): - import re - arch = d.getVar('TARGET_ARCH') - if re.match("i.86$", arch): - return "ippicv_2020_lnx_ia32_20191018_general.tgz" - else: - return "ippicv_2020_lnx_intel64_20191018_general.tgz" - -def ipp_md5sum(d): - import re - arch = d.getVar('TARGET_ARCH') - if re.match("i.86$", arch): - return "ad189a940fb60eb71f291321322fe3e8" - else: - return "7421de0095c7a39162ae13a6098782f9" - -IPP_FILENAME = "${@ipp_filename(d)}" -IPP_MD5 = "${@ipp_md5sum(d)}" - -SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg" -SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ - git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib \ - git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20191018;destsuffix=ipp;name=ipp \ - git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc \ - git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg \ - git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=face;name=face \ - file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ - file://0003-To-fix-errors-as-following.patch \ - file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ - file://0001-Dont-use-isystem.patch \ - file://download.patch \ - file://0001-Make-ts-module-external.patch \ - " -SRC_URI_append_riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib" - -S = "${WORKDIR}/git" - -# OpenCV wants to download more files during configure. We download these in -# do_fetch and construct a source cache in the format it expects -OPENCV_DLDIR = "${WORKDIR}/downloads" - -do_unpack_extra() { - tar xzf ${WORKDIR}/ipp/ippicv/${IPP_FILENAME} -C ${WORKDIR} - - md5() { - # Return the MD5 of $1 - echo $(md5sum $1 | cut -d' ' -f1) - } - cache() { - TAG=$1 - shift - mkdir --parents ${OPENCV_DLDIR}/$TAG - for F in $*; do - DEST=${OPENCV_DLDIR}/$TAG/$(md5 $F)-$(basename $F) - test -e $DEST || ln -s $F $DEST - done - } - cache xfeatures2d/boostdesc ${WORKDIR}/boostdesc/*.i - cache xfeatures2d/vgg ${WORKDIR}/vgg/*.i - cache data ${WORKDIR}/face/*.dat -} -addtask unpack_extra after do_unpack before do_patch - -CMAKE_VERBOSE = "VERBOSE=1" - -EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ - -DWITH_1394=OFF \ - -DENABLE_PRECOMPILED_HEADERS=OFF \ - -DCMAKE_SKIP_RPATH=ON \ - -DOPENCV_ICV_HASH=${IPP_MD5} \ - -DIPPROOT=${WORKDIR}/ippicv_lnx \ - -DOPENCV_GENERATE_PKGCONFIG=ON \ - -DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \ - -DOPENCV_ALLOW_DOWNLOADS=OFF \ - ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \ - ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \ - ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \ -" -EXTRA_OECMAKE_append_x86 = " -DX86=ON" - -PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ - ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}" - -PACKAGECONFIG[gapi] = "-DWITH_ADE=ON -Dade_DIR=${STAGING_LIBDIR},-DWITH_ADE=OFF,ade" -PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas," -PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," -PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON -DPROTOBUF_UPDATE_FILES=ON -DBUILD_PROTOBUF=OFF,-DBUILD_opencv_dnn=OFF,protobuf protobuf-native," -PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen gflags glog," -PACKAGECONFIG[freetype] = "-DBUILD_opencv_freetype=ON,-DBUILD_opencv_freetype=OFF,freetype," -PACKAGECONFIG[gphoto2] = "-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2," -PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0 gstreamer1.0-plugins-base," -PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3," -PACKAGECONFIG[jasper] = "-DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper," -PACKAGECONFIG[java] = "-DJAVA_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native fastjar-native openjdk-8-native," -PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg," -PACKAGECONFIG[libav] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav," -PACKAGECONFIG[libv4l] = "-DWITH_LIBV4L=ON,-DWITH_LIBV4L=OFF,v4l-utils," -PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers virtual/opencl-icd," -PACKAGECONFIG[oracle-java] = "-DJAVA_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${ORACLE_JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native oracle-jse-jdk oracle-jse-jdk-native," -PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng," -PACKAGECONFIG[python2] = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python-numpy," -PACKAGECONFIG[python3] = "-DPYTHON3_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python3-numpy," -PACKAGECONFIG[samples] = "-DBUILD_EXAMPLES=ON -DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,," -PACKAGECONFIG[tbb] = "-DWITH_TBB=ON,-DWITH_TBB=OFF,tbb," -PACKAGECONFIG[text] = "-DBUILD_opencv_text=ON,-DBUILD_opencv_text=OFF,tesseract," -PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff," -PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils," - -inherit pkgconfig cmake - -inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'distutils3-base', '', d)} -inherit ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'distutils-base', '', d)} - -export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}" -export PYTHON="${STAGING_BINDIR_NATIVE}/${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3', 'python', d)}" -export ORACLE_JAVA_HOME="${STAGING_DIR_NATIVE}/usr/bin/java" -export JAVA_HOME="${STAGING_DIR_NATIVE}/usr/lib/jvm/openjdk-8-native" -export ANT_DIR="${STAGING_DIR_NATIVE}/usr/share/ant/" - -TARGET_CC_ARCH += "-I${S}/include " - -PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'samples', '${PN}-samples', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'java', '${PN}-java', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'python-${BPN}', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-${BPN}', '', d)} \ - ${PN}-apps" - -python populate_packages_prepend () { - cv_libdir = d.expand('${libdir}') - do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True) - do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') - do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') - do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) - - pn = d.getVar('PN') - metapkg = pn + '-dev' - d.setVar('ALLOW_EMPTY_' + metapkg, "1") - blacklist = [ metapkg ] - metapkg_rdepends = [ ] - packages = d.getVar('PACKAGES').split() - for pkg in packages[1:]: - if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'): - metapkg_rdepends.append(pkg) - d.setVar('RRECOMMENDS_' + metapkg, ' '.join(metapkg_rdepends)) - - metapkg = pn - d.setVar('ALLOW_EMPTY_' + metapkg, "1") - blacklist = [ metapkg, "libopencv-ts" ] - metapkg_rdepends = [ ] - for pkg in packages[1:]: - if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.endswith('-doc') and not pkg.endswith('-locale') and not pkg.endswith('-staticdev'): - metapkg_rdepends.append(pkg) - d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends)) -} - -PACKAGES_DYNAMIC += "^libopencv-.*" - -FILES_${PN} = "" -FILES_${PN}-dbg += "${datadir}/OpenCV/java/.debug/* ${datadir}/OpenCV/samples/bin/.debug/*" -FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/cmake/opencv4/*.cmake" -FILES_${PN}-staticdev += "${libdir}/opencv4/3rdparty/*.a" -FILES_${PN}-apps = "${bindir}/* ${datadir}/opencv4 ${datadir}/licenses" -FILES_${PN}-java = "${datadir}/OpenCV/java" -FILES_${PN}-samples = "${datadir}/opencv4/samples/" - -INSANE_SKIP_${PN}-java = "libdir" -INSANE_SKIP_${PN}-dbg = "libdir" - -ALLOW_EMPTY_${PN} = "1" - -SUMMARY_python-opencv = "Python bindings to opencv" -FILES_python-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" -RDEPENDS_python-opencv = "python-core python-numpy" - -SUMMARY_python3-opencv = "Python bindings to opencv" -FILES_python3-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" -RDEPENDS_python3-opencv = "python3-core python3-numpy" - -RDEPENDS_${PN}-apps = "bash" - -do_compile_prepend() { - # remove the build host info to improve reproducibility - if [ -f ${WORKDIR}/build/modules/core/version_string.inc ]; then - sed -i "s#${WORKDIR}#/workdir#g" ${WORKDIR}/build/modules/core/version_string.inc - fi -} - -do_install_append() { - # Move Python files into correct library folder (for multilib build) - if [ "$libdir" != "/usr/lib" -a -d ${D}/usr/lib ]; then - mv ${D}/usr/lib/* ${D}/${libdir}/ - rm -rf ${D}/usr/lib - fi -} - -TOOLCHAIN = "gcc" diff --git a/meta-digi-dey/recipes-support/opencv/opencv_4.4.0.imx.bb b/meta-digi-dey/recipes-support/opencv/opencv_4.4.0.imx.bb deleted file mode 100644 index 77af844d0..000000000 --- a/meta-digi-dey/recipes-support/opencv/opencv_4.4.0.imx.bb +++ /dev/null @@ -1,57 +0,0 @@ -require opencv_4.4.0.bb - -LIC_FILES_CHKSUM = "file://LICENSE;md5=19598330421859a6dd353a4318091ac7" - -SRCREV_opencv = "e39e6eded2d365a5dc370e1a72717e132166cf07" -SRCREV_contrib = "5fae4082cc493efa5cb7a7486f9e009618a5198b" -SRCREV_extra = "65796edadce27ed013e3deeedb3c081ff527e4ec" -SRC_URI[tinydnn.md5sum] = "adb1c512e09ca2c7a6faef36f9c53e59" -SRC_URI[tinydnn.sha256sum] = "e2c61ce8c5debaa644121179e9dbdcf83f497f39de853f8dd5175846505aa18b" -SRCREV_FORMAT_append = "_extra" - -SRC_URI_remove = " \ - git://github.com/opencv/opencv.git;name=opencv \ - file://0002-Make-opencv-ts-create-share-library-intead-of-static.patch \ -" -OPENCV_SRC ?= "git://source.codeaurora.org/external/imx/opencv-imx.git;protocol=https" -SRCBRANCH = "4.4.0_imx" -SRC_URI =+ "${OPENCV_SRC};branch=${SRCBRANCH};name=opencv" -SRC_URI += " \ - git://github.com/opencv/opencv_extra.git;destsuffix=extra;name=extra \ - https://github.com/tiny-dnn/tiny-dnn/archive/v1.0.0a3.tar.gz;destsuffix=git/3rdparty/tinydnn/tiny-dnn-1.0.0a3;name=tinydnn;unpack=false \ - file://OpenCV_DNN_examples.patch \ - file://0001-Add-smaller-version-of-download_models.py.patch;patchdir=../extra \ -" -PV = "4.4.0.imx" - -PACKAGECONFIG_remove = "eigen" -PACKAGECONFIG_append_mx8 = " dnn text" -PACKAGECONFIG_OPENCL = "" -PACKAGECONFIG_OPENCL_mx8 = "opencl" -PACKAGECONFIG_OPENCL_mx8dxl = "" -PACKAGECONFIG_OPENCL_mx8phantomdxl = "" -PACKAGECONFIG_OPENCL_mx8mm = "" -PACKAGECONFIG_OPENCL_mx8mnlite = "" -PACKAGECONFIG_append = " ${PACKAGECONFIG_OPENCL}" - -PACKAGECONFIG[openvx] = "-DWITH_OPENVX=ON -DOPENVX_ROOT=${STAGING_LIBDIR} -DOPENVX_LIB_CANDIDATES='OpenVX;OpenVXU',-DWITH_OPENVX=OFF,virtual/libopenvx," -PACKAGECONFIG[qt5] = "-DWITH_QT=ON -DOE_QMAKE_PATH_EXTERNAL_HOST_BINS=${STAGING_BINDIR_NATIVE} -DCMAKE_PREFIX_PATH=${STAGING_BINDIR_NATIVE}/cmake,-DWITH_QT=OFF,qtbase qtbase-native," -PACKAGECONFIG[test] = "-DBUILD_TESTS=ON -DINSTALL_TESTS=ON -DOPENCV_TEST_DATA_PATH=${S}/../extra/testdata, -DBUILD_TESTS=OFF -DINSTALL_TESTS=OFF," - -do_unpack_extra_append() { - mkdir -p ${S}/3rdparty/tinydnn/ - tar xzf ${WORKDIR}/v1.0.0a3.tar.gz -C ${S}/3rdparty/tinydnn/ -} - -do_install_append() { - ln -sf opencv4/opencv2 ${D}${includedir}/opencv2 - install -d ${D}${datadir}/OpenCV/samples/data - cp -r ${S}/samples/data/* ${D}${datadir}/OpenCV/samples/data - install -d ${D}${datadir}/OpenCV/samples/bin/ - cp -f bin/example_* ${D}${datadir}/OpenCV/samples/bin/ - if ${@bb.utils.contains('PACKAGECONFIG', 'test', 'true', 'false', d)}; then - cp -r share/opencv4/testdata/cv/face/* ${D}${datadir}/opencv4/testdata/cv/face/ - fi -} - -FILES_${PN}-samples += "${datadir}/OpenCV/samples"