diff options
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support')
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch | 30 | ||||
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.4.bb (renamed from dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.3.bb) | 2 |
2 files changed, 14 insertions, 18 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch index f38e0669..6d0c6cbc 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch | |||
@@ -1,33 +1,29 @@ | |||
1 | From 6a0046c523a67b4d21d856ea73861c00b5a9c9fd Mon Sep 17 00:00:00 2001 | 1 | From 247a5383e7ae444fd99022a19fe90a59dbedbc98 Mon Sep 17 00:00:00 2001 |
2 | From: Anuj Mittal <anuj.mittal@intel.com> | 2 | From: Naveen Saini <naveen.kumar.saini@intel.com> |
3 | Date: Mon, 19 Oct 2020 23:29:23 +0800 | 3 | Date: Mon, 30 Aug 2021 17:54:17 +0800 |
4 | Subject: [PATCH] demos: use gflags from meta-oe | 4 | Subject: [PATCH] demos: use gflags from meta-oe |
5 | 5 | ||
6 | Upstream-Status: Inappropriate | 6 | Upstream-Status: Inappropriate |
7 | 7 | ||
8 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | 8 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> |
9 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | ||
9 | --- | 10 | --- |
10 | demos/CMakeLists.txt | 4 ++-- | 11 | demos/CMakeLists.txt | 2 +- |
11 | 1 file changed, 2 insertions(+), 2 deletions(-) | 12 | 1 file changed, 1 insertion(+), 1 deletion(-) |
12 | 13 | ||
13 | diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt | 14 | diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt |
14 | index c5e3b1ec3..4e78c72a6 100644 | 15 | index 1df8f248d..d368d608c 100644 |
15 | --- a/demos/CMakeLists.txt | 16 | --- a/demos/CMakeLists.txt |
16 | +++ b/demos/CMakeLists.txt | 17 | +++ b/demos/CMakeLists.txt |
17 | @@ -62,11 +62,11 @@ set(CMAKE_CXX_STANDARD 11) | 18 | @@ -131,7 +131,7 @@ find_package(OpenCV REQUIRED COMPONENTS core highgui videoio imgproc imgcodecs g |
18 | set(CMAKE_CXX_STANDARD_REQUIRED ON) | 19 | find_package(InferenceEngine REQUIRED) |
19 | #################################### | 20 | find_package(ngraph REQUIRED) |
20 | |||
21 | -set(GFLAGS_IS_SUBPROJECT TRUE) | ||
22 | +set(GFLAGS_IS_SUBPROJECT FALSE) | ||
23 | set(HAVE_SYS_STAT_H 1) | ||
24 | set(HAVE_INTTYPES_H 1) | ||
25 | 21 | ||
26 | -add_subdirectory(thirdparty/gflags) | 22 | -add_subdirectory(thirdparty/gflags) |
27 | +#add_subdirectory(thirdparty/gflags) | 23 | +#add_subdirectory(thirdparty/gflags) |
24 | add_subdirectory(common/cpp) | ||
25 | add_subdirectory(multi_channel_common/cpp) | ||
28 | 26 | ||
29 | if(CMAKE_CXX_COMPILER_ID MATCHES "^GNU|(Apple)?Clang$") | ||
30 | set(COMPILER_IS_GCC_LIKE TRUE) | ||
31 | -- | 27 | -- |
32 | 2.29.0 | 28 | 2.17.1 |
33 | 29 | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.3.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.4.bb index 1461afe1..b68e0641 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.3.bb +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.4.bb | |||
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/opencv/open_model_zoo.git;protocol=git;branch=master | |||
8 | file://0001-use-oe-gflags.patch \ | 8 | file://0001-use-oe-gflags.patch \ |
9 | " | 9 | " |
10 | 10 | ||
11 | SRCREV = "9ca5dbeff80464bf5728e8be25daedfe9a9208d7" | 11 | SRCREV = "e37a163a2385d9ddaa8e3da1ccb50c80d4fa0802" |
12 | 12 | ||
13 | LICENSE = "Apache-2.0" | 13 | LICENSE = "Apache-2.0" |
14 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ | 14 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ |