summaryrefslogtreecommitdiffstats
path: root/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo
diff options
context:
space:
mode:
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo')
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-switch-to-python3.patch38
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch33
2 files changed, 0 insertions, 71 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-switch-to-python3.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-switch-to-python3.patch
deleted file mode 100644
index 8bfb9ac9..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-switch-to-python3.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From 4dd5d9c7042b421c929bece05ee162b8827dc568 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Mon, 2 Nov 2020 11:44:33 +0800
4Subject: [PATCH] switch to python3
5
6Upstream-Status: Submitted
7[https://github.com/openvinotoolkit/open_model_zoo/pull/1701/commits/0261e21e63b84cc4e91b220f4a84ec52b5678e2c;
8https://github.com/gflags/gflags/pull/318#issuecomment-719466350]
9
10Signed-off-by: Changqing Li <changqing.li@windriver.com>
11---
12 .../speech_recognition_demo/speech_recognition_demo.py | 2 +-
13 thirdparty/gflags/test/gflags_build.py.in | 2 +-
14 2 files changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/python_demos/speech_recognition_demo/speech_recognition_demo.py b/python_demos/speech_recognition_demo/speech_recognition_demo.py
17index 6e8ff534..d28ccddc 100755
18--- a/python_demos/speech_recognition_demo/speech_recognition_demo.py
19+++ b/python_demos/speech_recognition_demo/speech_recognition_demo.py
20@@ -1,4 +1,4 @@
21-#!/usr/bin/env python
22+#!/usr/bin/env python3
23 #
24 # Copyright (C) 2019-2020 Intel Corporation
25 # SPDX-License-Identifier: Apache-2.0
26diff --git a/thirdparty/gflags/test/gflags_build.py.in b/thirdparty/gflags/test/gflags_build.py.in
27index a8cba2bf..559163ef 100644
28--- a/thirdparty/gflags/test/gflags_build.py.in
29+++ b/thirdparty/gflags/test/gflags_build.py.in
30@@ -1,4 +1,4 @@
31-#!/usr/bin/env python
32+#!/usr/bin/env python3
33
34 import os
35 import sys
36--
372.17.1
38
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
deleted file mode 100644
index 864c735e..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 56078933a8397b7fae146156743408319eac1ae0 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Mon, 19 Oct 2020 23:29:23 +0800
4Subject: [PATCH] demos: use gflags from meta-oe
5
6Upstream-Status: Inappropriate
7
8Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
9---
10 demos/CMakeLists.txt | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-)
12
13diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt
14index e5f17231..08d4e4e6 100644
15--- a/demos/CMakeLists.txt
16+++ b/demos/CMakeLists.txt
17@@ -90,11 +90,11 @@ if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
18 endif()
19 ####################################
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
26-add_subdirectory(thirdparty/gflags)
27+#add_subdirectory(thirdparty/gflags)
28
29 if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
30 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
31--
322.26.2
33