Merge tag '0.29' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update

9 files changed, 0 insertions, 307 deletions

diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch b/meta-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch
deleted file mode 100644
index 5f909c1a8..000000000
--- a/meta-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 85b882b4ceb57fe6538f47af58d0a970923fde0e Mon Sep 17 00:00:00 2001
-From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
-Date: Thu, 31 Mar 2016 00:20:15 +0200
-Subject: [PATCH] 3rdparty/ippicv: Use pre-downloaded ipp
-
-Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
-Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>
-
----
- 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 ae8748c..305abdb 100644
---- a/3rdparty/ippicv/ippicv.cmake
-+++ b/3rdparty/ippicv/ippicv.cmake
-@@ -39,18 +39,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-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-Add-missing-multi-line-separator.patch b/meta-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-Add-missing-multi-line-separator.patch
deleted file mode 100644
index aa196a5fe..000000000
--- a/meta-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-Add-missing-multi-line-separator.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 60857229aab13ccc426572a43ab891409bb76ea4 Mon Sep 17 00:00:00 2001

-From: Khem Raj <raj.khem@gmail.com>

-Date: Sun, 9 Sep 2018 22:52:55 -0700

-Subject: [PATCH] Add missing multi-line separator

-

-Otherwise this fails to build ( found on mips )

-

-Fixes

-contrib/modules/surface_matching/src/hash_murmur86.hpp:97:15: error:

-expected constructor, destructor, or type conversion before '(' token

-     && defined(__GNUC__) && (__GNUC__>4 || (__GNUC__==4 &&

-__GNUC_MINOR__>=3))

-               ^

-

-Upstream-Status: Submitted [https://github.com/opencv/opencv_contrib/pull/1764]

-Signed-off-by: Khem Raj <raj.khem@gmail.com>

----

- modules/surface_matching/src/hash_murmur86.hpp | 2 +-

- 1 file changed, 1 insertion(+), 1 deletion(-)

-

-diff --git a/modules/surface_matching/src/hash_murmur86.hpp b/modules/surface_matching/src/hash_murmur86.hpp

-index 1edf6bf4..0477d37e 100644

---- a/modules/surface_matching/src/hash_murmur86.hpp

-+++ b/modules/surface_matching/src/hash_murmur86.hpp

-@@ -93,7 +93,7 @@ void hashMurmurx86 ( const void * key, const int len, const uint seed, void * ou

- /* Now find best way we can to READ_UINT32 */

- #ifndef WORDS_BIGENDIAN

- # define READ_UINT32(ptr)   (*((uint32_t*)(ptr)))

--#elif defined(WORDS_BIGENDIAN)

-+#elif defined(WORDS_BIGENDIAN) \

-     && defined(__GNUC__) && (__GNUC__>4 || (__GNUC__==4 && __GNUC_MINOR__>=3))

- # define READ_UINT32(ptr)   (__builtin_bswap32(*((uint32_t*)(ptr))))

- #endif

--- 

-2.18.0

-

diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-Check-for-clang-before-using-isystem.patch b/meta-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-Check-for-clang-before-using-isystem.patch
deleted file mode 100644
index fe7843304..000000000
--- a/meta-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-Check-for-clang-before-using-isystem.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From fa76d8646bb2b9b514728eeef41afed7c43a36f2 Mon Sep 17 00:00:00 2001

-From: Khem Raj <raj.khem@gmail.com>

-Date: Tue, 11 Sep 2018 18:18:33 -0700

-Subject: [PATCH] Check for clang before using -isystem

-

-When cross compiling with clang, the internal C++ headers are not found

-when adding sysroot to -isystem, that is redundant anyway because it

-will look for headers insider --sysroot path with same quality as it

-would do with -isystem otherwise

-

-Upstream-Status: Submitted [https://github.com/opencv/opencv/pull/12504]

-Signed-off-by: Khem Raj <raj.khem@gmail.com>

----

- cmake/OpenCVUtils.cmake | 2 +-

- 1 file changed, 1 insertion(+), 1 deletion(-)

-

-diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake

-index fae91c165f..60c20192dc 100644

---- a/cmake/OpenCVUtils.cmake

-+++ b/cmake/OpenCVUtils.cmake

-@@ -259,7 +259,7 @@ function(ocv_include_directories)

-     ocv_is_opencv_directory(__is_opencv_dir "${dir}")

-     if(__is_opencv_dir)

-       list(APPEND __add_before "${dir}")

--    elseif(CV_GCC AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0" AND

-+    elseif(((CV_GCC AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0") OR CV_CLANG) AND

-            dir MATCHES "/usr/include$")

-       # workaround for GCC 6.x bug

-     else()

--- 

-2.18.0

-

diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-Dont-use-isystem.patch b/meta-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-Dont-use-isystem.patch
deleted file mode 100644
index 40d3f53e1..000000000
--- a/meta-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-Dont-use-isystem.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 9659f5a1e75fc29c9879c301767bba72ecf9042a Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-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 <raj.khem@gmail.com>
-
----
- cmake/OpenCVPCHSupport.cmake | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/cmake/OpenCVPCHSupport.cmake b/cmake/OpenCVPCHSupport.cmake
-index 59bc826..055dfce 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-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch b/meta-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch
deleted file mode 100644
index f8ccd1d55..000000000
--- a/meta-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From fe27d0e2341683606704115949d16250e4cacbfa Mon Sep 17 00:00:00 2001
-From: Jason Wessel <jason.wessel@windriver.com>
-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 <jason.wessel@windriver.com>
-
----
- 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 0d360ad..566df66 100644
---- a/modules/videoio/src/cap_ffmpeg_impl.hpp
-+++ b/modules/videoio/src/cap_ffmpeg_impl.hpp
-@@ -736,6 +736,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-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0002-Make-opencv-ts-create-share-library-intead-of-static.patch b/meta-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0002-Make-opencv-ts-create-share-library-intead-of-static.patch
deleted file mode 100644
index 46198fb7b..000000000
--- a/meta-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0002-Make-opencv-ts-create-share-library-intead-of-static.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 46ffa1f8f443b71673774fcb864eb741bbc26200 Mon Sep 17 00:00:00 2001
-From: Bian Naimeng <biannm@cn.fujitsu.com>
-Date: Wed, 19 Apr 2017 03:11:37 +0900
-Subject: [PATCH] Make opencv-ts create share library intead of static.
-
-Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
-
----
- modules/ts/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/ts/CMakeLists.txt b/modules/ts/CMakeLists.txt
-index f95bed0..ee67858 100644
---- a/modules/ts/CMakeLists.txt
-+++ b/modules/ts/CMakeLists.txt
-@@ -4,7 +4,7 @@ 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_TYPE STATIC)
- set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE)
- 
- if(WINRT)
diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0003-To-fix-errors-as-following.patch b/meta-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0003-To-fix-errors-as-following.patch
deleted file mode 100644
index 336c2e08e..000000000
--- a/meta-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0003-To-fix-errors-as-following.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 867caccc358266f7021f076fc8c8e41bf048782c Mon Sep 17 00:00:00 2001
-From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
-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 <huangqy.fnst@cn.fujitsu.com>
-
-Also add the visibility changes for certain OpenCL-related functions in
-ts module.
-
-Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>
-
----
- 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 b9d6b74..f1ee7ee 100644
---- a/modules/ts/include/opencv2/ts.hpp
-+++ b/modules/ts/include/opencv2/ts.hpp
-@@ -622,7 +622,7 @@ protected:
-     }
- };
- 
--extern uint64 param_seed;
-+CV_EXPORTS extern uint64 param_seed;
- 
- struct DefaultRngAuto
- {
-@@ -685,7 +685,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 11572e9..438112e 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 b5cea3e..e5b0b4b 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-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/fixpkgconfig.patch b/meta-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/fixpkgconfig.patch
deleted file mode 100644
index df20aabc8..000000000
--- a/meta-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/fixpkgconfig.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: git/cmake/OpenCVGenPkgconfig.cmake

-===================================================================

---- git.orig/cmake/OpenCVGenPkgconfig.cmake

-+++ git/cmake/OpenCVGenPkgconfig.cmake

-@@ -31,7 +31,7 @@ macro(fix_prefix lst isown)

-       get_filename_component(libdir "${item}" PATH)

-       get_filename_component(_libname "${item}" NAME)

-       ocv_get_libname(libname "${_libname}")

--      list(APPEND _lst "-L${libdir}" "-l${libname}")

-+      list(APPEND _lst "-l${libname}")

-     else()

-       list(APPEND _lst "-l${item}")

-     endif()

-@@ -124,11 +124,14 @@ ocv_list_unique(_extra)

- ocv_list_unique(_3rdparty)

- 

- set(OPENCV_PC_LIBS

--  "-L\${exec_prefix}/${OPENCV_LIB_INSTALL_PATH}"

-+  "-L\${exec_prefix}/${OPENCV_3P_LIB_INSTALL_PATH}"

-   "${_modules}"

- )

- if(BUILD_SHARED_LIBS)

--  set(OPENCV_PC_LIBS_PRIVATE "${_extra}")

-+  set(OPENCV_PC_LIBS_PRIVATE

-+    "-L\${exec_prefix}/${OPENCV_LIB_INSTALL_PATH}"

-+    "${_extra}"

-+  )

- else()

-   set(OPENCV_PC_LIBS_PRIVATE

-     "-L\${exec_prefix}/${OPENCV_3P_LIB_INSTALL_PATH}"

diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/uselocalxfeatures.patch b/meta-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/uselocalxfeatures.patch
deleted file mode 100644
index 2605562ee..000000000
--- a/meta-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/uselocalxfeatures.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/modules/xfeatures2d/CMakeLists.txt b/modules/xfeatures2d/CMakeLists.txt

-index e1755595..c7009c47 100644

---- a/modules/xfeatures2d/CMakeLists.txt

-+++ b/modules/xfeatures2d/CMakeLists.txt

-@@ -5,10 +5,10 @@ ocv_define_module(xfeatures2d opencv_core opencv_imgproc opencv_features2d openc

- include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/download_vgg.cmake)

- include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/download_boostdesc.cmake)

- set(DOWNLOAD_DIR "${OpenCV_BINARY_DIR}/downloads/xfeatures2d")

--download_boost_descriptors("${DOWNLOAD_DIR}" boost_status)

--download_vgg_descriptors("${DOWNLOAD_DIR}" vgg_status)

--if(NOT boost_status OR NOT vgg_status)

--  ocv_module_disable(xfeatures2d)

--endif()

-+#download_boost_descriptors("${DOWNLOAD_DIR}" boost_status)

-+#download_vgg_descriptors("${DOWNLOAD_DIR}" vgg_status)

-+#if(NOT boost_status OR NOT vgg_status)

-+#  ocv_module_disable(xfeatures2d)

-+#endif()

- 

- ocv_module_include_directories("${DOWNLOAD_DIR}")