diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-12-01 04:53:16 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-12-01 04:53:21 +0300 |
commit | 7eb438a61ba2d5b3cc7f0ac3fea1ca2e47390529 (patch) | |
tree | f3aee6c10811ebe6196859c998bd78d8dad36589 /meta-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-Add-missing-multi-line-separator.patch | |
parent | a59e4ee570958d218c22cd0513fbaefcf4a27563 (diff) | |
download | openbmc-7eb438a61ba2d5b3cc7f0ac3fea1ca2e47390529.tar.xz |
meta-xilinx: subtree update:874b9cee5e..569f52f275
Jaewon Lee (1):
xilinx-board.inc: Introducing inc file to add BOARD/BOARD_VARIANT
Madhurkiran Harikrishnan (2):
weston.ini: Do not set hard requirement for input devices
libmali-xlnx: Update the mali userspace libraries to 2020.2
Mark Hatle (2):
libmali-xlnx: Fix the package arch
Various: Packages using libGL may need to be declared SOC_VARIANT_ARCH
Raju Kumar Pothuraju (1):
versal-generic.conf:zynqmp-generic.conf: Add MACHINE_ESSENTIAL_EXTRA_RDEPENDS variable only for specific machines.
Sai Hari Chandana Kalluri (7):
Add meta-python2 in bblayers.conf
xrt_git.bb: Replace deprecated boost macros
perf: Fix compilation issues Fix perf variable definition and libtraceevent with binutils. The above errors are fixed by including the following patches to the kernel tree: 0001-libtraceevent-Fix-build-with-binutils-2.35.patch 0001-perf-bench-Share-some-global-variables-to-fix-build-.patch 0001-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch 0001-perf-tests-bp_account-Make-global-variable-static.patch
opencv_3.4.3: Remove support for opencv 3.4
Update commit id and branch for components for 2020.2 release
update XILINX_VER_MAIN to 2020.2
bootgen: Update commit id for 2020.2 release
Sandeep Gundlupet Raju (1):
kernel-module-dp: Add support for Xilinx DP drivers
Vishal Sagar (1):
kernel-module-hdmi: Update commit id and license md5sum for 2020.2
ch vamshi krishna (3):
updating xrt commit id
updating final XRT commit id for 2020.2
updating XRT/Zocl commit id for 2020.2
rbramand (1):
] CR-1076958 Put libxrt libs softlinks in the main package
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I4c6b12024c4d07388334e29177417e34fe6dea87
Diffstat (limited to 'meta-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-Add-missing-multi-line-separator.patch')
-rw-r--r-- | meta-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-Add-missing-multi-line-separator.patch | 36 |
1 files changed, 0 insertions, 36 deletions
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
-
|