diff options
-rw-r--r-- | meta-oe/recipes-support/opencv/opencv/0001-core-vsx-update-vec_absd-workaround-condition.patch | 28 | ||||
-rw-r--r-- | meta-oe/recipes-support/opencv/opencv_4.5.5.bb | 1 |
2 files changed, 29 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/opencv/opencv/0001-core-vsx-update-vec_absd-workaround-condition.patch b/meta-oe/recipes-support/opencv/opencv/0001-core-vsx-update-vec_absd-workaround-condition.patch new file mode 100644 index 0000000000..d2d3b81fbe --- /dev/null +++ b/meta-oe/recipes-support/opencv/opencv/0001-core-vsx-update-vec_absd-workaround-condition.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From c7ce902eed0eb7926c0973b1127037fdd27b99ca Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Alekhin <alexander.a.alekhin@gmail.com> | ||
3 | Date: Tue, 15 Feb 2022 07:23:32 +0300 | ||
4 | Subject: [PATCH] core(vsx): update vec_absd() workaround condition | ||
5 | |||
6 | Upstream-Status: Backport [https://github.com/opencv/opencv/commit/8d88bb06b230b5c4b5bca78d84102f5d1adf48cf] | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | ||
9 | modules/core/include/opencv2/core/vsx_utils.hpp | 3 ++- | ||
10 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/modules/core/include/opencv2/core/vsx_utils.hpp b/modules/core/include/opencv2/core/vsx_utils.hpp | ||
13 | index 68863ffb36..5cbc066784 100644 | ||
14 | --- a/modules/core/include/opencv2/core/vsx_utils.hpp | ||
15 | +++ b/modules/core/include/opencv2/core/vsx_utils.hpp | ||
16 | @@ -684,7 +684,8 @@ VSX_IMPL_LOAD_L8(vec_double2, double) | ||
17 | #endif | ||
18 | |||
19 | // absolute difference | ||
20 | -#ifndef vec_absd | ||
21 | +#ifndef _ARCH_PWR9 | ||
22 | +# undef vec_absd | ||
23 | # define vec_absd(a, b) vec_sub(vec_max(a, b), vec_min(a, b)) | ||
24 | #endif | ||
25 | |||
26 | -- | ||
27 | 2.36.0 | ||
28 | |||
diff --git a/meta-oe/recipes-support/opencv/opencv_4.5.5.bb b/meta-oe/recipes-support/opencv/opencv_4.5.5.bb index 4449596dae..e4fb676f7e 100644 --- a/meta-oe/recipes-support/opencv/opencv_4.5.5.bb +++ b/meta-oe/recipes-support/opencv/opencv_4.5.5.bb | |||
@@ -51,6 +51,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol | |||
51 | file://0001-Dont-use-isystem.patch \ | 51 | file://0001-Dont-use-isystem.patch \ |
52 | file://download.patch \ | 52 | file://download.patch \ |
53 | file://0001-Make-ts-module-external.patch \ | 53 | file://0001-Make-ts-module-external.patch \ |
54 | file://0001-core-vsx-update-vec_absd-workaround-condition.patch \ | ||
54 | " | 55 | " |
55 | SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib" | 56 | SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib" |
56 | 57 | ||