From 90b225ce8a00aafd94d0aef5f85e73adce91d5f2 Mon Sep 17 00:00:00 2001
From: Anuj Mittal <anuj.mittal@intel.com>
Date: Fri, 27 Sep 2019 22:55:27 +0800
Subject: dldt-inference-engine: upgrade 2019r1.1 -> 2019r2

* Release notes:
https://software.intel.com/en-us/articles/OpenVINO-RelNotes

* Enable unit tests to be built and tested using ptest mechanism.

* Include patches from Clear Linux for build fixes.

* Switch to using python3 and threading to using TBB. Switch ENABLE_OPENCV
to off so opencv from system is used.

* Remove do_install and patch Makefiles instead to install libraries correctly.

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 .../opencv/files/0004-disable-werror.patch         | 93 ++++++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch

(limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch')

diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch
new file mode 100644
index 00000000..b5f52d56
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch
@@ -0,0 +1,93 @@
+From 68d6b80eb9cc87ff3598958b8a7f52b688b9436f Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <anuj.mittal@intel.com>
+Date: Fri, 27 Sep 2019 20:32:08 +0800
+Subject: [PATCH] disable werror
+
+This shouldn't be enabled and leads to multiple errors when compiling
+cldnn and samples.
+
+Upstream-Status: Pending
+
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ inference-engine/cmake/os_flags.cmake                    | 1 -
+ inference-engine/samples/CMakeLists.txt                  | 1 -
+ inference-engine/src/extension/CMakeLists.txt            | 1 -
+ inference-engine/thirdparty/clDNN/CMakeLists.txt         | 2 --
+ inference-engine/thirdparty/mkl-dnn/cmake/platform.cmake | 1 -
+ inference-engine/tools/CMakeLists.txt                    | 1 -
+ 6 files changed, 7 deletions(-)
+
+diff --git a/inference-engine/cmake/os_flags.cmake b/inference-engine/cmake/os_flags.cmake
+index 6a5442f..a14a1ae 100644
+--- a/inference-engine/cmake/os_flags.cmake
++++ b/inference-engine/cmake/os_flags.cmake
+@@ -48,7 +48,6 @@ if (WIN32)
+         set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${DEBUG_SYMBOLS_LINKER_FLAGS}")
+     endif()
+ else()
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Werror=return-type ")
+     if (APPLE)
+         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unused-command-line-argument")
+     elseif(UNIX)
+diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
+index dd7b679..828abe6 100644
+--- a/inference-engine/samples/CMakeLists.txt
++++ b/inference-engine/samples/CMakeLists.txt
+@@ -59,7 +59,6 @@ if (WIN32)
+         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251 /wd4275 /wd4267") #disable some warnings
+     endif()
+ else()
+-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") #treating warnings as errors
+     if (APPLE)
+         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unused-command-line-argument")
+     elseif(UNIX)
+diff --git a/inference-engine/src/extension/CMakeLists.txt b/inference-engine/src/extension/CMakeLists.txt
+index fb14ebe..228bb8c 100644
+--- a/inference-engine/src/extension/CMakeLists.txt
++++ b/inference-engine/src/extension/CMakeLists.txt
+@@ -25,7 +25,6 @@ if (WIN32)
+         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251 /wd4275 /wd4267") #disable some warnings
+     endif()
+ else()
+-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+ endif()
+ 
+ if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
+diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt
+index 5957791..6007be4 100644
+--- a/inference-engine/thirdparty/clDNN/CMakeLists.txt
++++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt
+@@ -758,8 +758,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS")
+         MultiProcessorCompilation
+         DeadCodeEliminate
+         ExtensionsEnabled
+-        TreatWarnAsErrorEnabled
+-        WarnLevel4
+         NoFastMath
+         StackProtector
+     )
+diff --git a/inference-engine/thirdparty/mkl-dnn/cmake/platform.cmake b/inference-engine/thirdparty/mkl-dnn/cmake/platform.cmake
+index a541215..bed8a59 100644
+--- a/inference-engine/thirdparty/mkl-dnn/cmake/platform.cmake
++++ b/inference-engine/thirdparty/mkl-dnn/cmake/platform.cmake
+@@ -63,7 +63,6 @@ if(MSVC)
+     endif()
+ elseif(UNIX OR MINGW)
+     append(CMAKE_CCXX_FLAGS "-Wall -Wno-unknown-pragmas")
+-    append_if_product(CMAKE_CCXX_FLAGS "-Werror")
+     append(CMAKE_CCXX_FLAGS "-fvisibility=internal")
+     append(CMAKE_C_FLAGS "-std=c99")
+     append(CMAKE_CXX_FLAGS "-std=c++11 -fvisibility-inlines-hidden")
+diff --git a/inference-engine/tools/CMakeLists.txt b/inference-engine/tools/CMakeLists.txt
+index fddfa28..a714fc1 100644
+--- a/inference-engine/tools/CMakeLists.txt
++++ b/inference-engine/tools/CMakeLists.txt
+@@ -24,7 +24,6 @@ endif()
+ if (WIN32)
+     # add_compile_options("/WX")
+ else()
+-    add_compile_options("-Werror")
+ endif()
+ 
+ if (ENABLE_OPENCV)
-- 
cgit v1.2.3-54-g00ecf