opencv: Upgrade to 4.4.0

Add a patch to workaround a gcc bug on rv64

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2020-08-18 00:43:40 -07:00
parent 74152e82da
commit fa9f26ee02
2 changed files with 38 additions and 3 deletions
@@ -0,0 +1,31 @@
From 59fafe6e39759e193b5764b36b4c5a93da352123 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 18 Aug 2020 00:36:49 -0700
Subject: [PATCH] Use -Os to compile tinyxml2.cpp
This workarounds issue [1] seen on riscv with gcc
[1] https://github.com/riscv/riscv-gnu-toolchain/issues/624
Upstream-Status: Inappropriate [ OE-Specific ]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
modules/datasets/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/datasets/CMakeLists.txt b/modules/datasets/CMakeLists.txt
index 56ca9e310..99b7a33f6 100644
--- a/modules/datasets/CMakeLists.txt
+++ b/modules/datasets/CMakeLists.txt
@@ -2,7 +2,7 @@ set(the_description "datasets framework")
set(filter_srcs "${CMAKE_CURRENT_LIST_DIR}/src/tinyxml2/tinyxml2.cpp")
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
- ocv_append_source_files_cxx_compiler_options(filter_srcs "-Wno-suggest-override") # GCC
+ ocv_append_source_files_cxx_compiler_options(filter_srcs "-Wno-suggest-override -Os") # GCC
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
ocv_append_source_files_cxx_compiler_options(filter_srcs "-Wno-inconsistent-missing-override") # Clang
endif()
--
2.28.0
@@ -10,8 +10,8 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp"
SRCREV_opencv = "01b2c5a77ca6dbef3baef24ebc0a5984579231d9"
SRCREV_contrib = "e6f32c6a69043456a806a4e802ee3ce7b7059c93"
SRCREV_opencv = "c3bb57afeaf030f10939204d48d7c2a3842f4293"
SRCREV_contrib = "5fae4082cc493efa5cb7a7486f9e009618a5198b"
SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274"
SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"
SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"
@@ -50,7 +50,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \
file://download.patch \
file://0001-Make-ts-module-external.patch \
"
PV = "4.3.0"
SRC_URI_append_riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib"
S = "${WORKDIR}/git"
@@ -80,6 +80,8 @@ do_unpack_extra() {
}
addtask unpack_extra after do_unpack before do_patch
CMAKE_VERBOSE = "VERBOSE=1"
EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
-DWITH_1394=OFF \
-DENABLE_PRECOMPILED_HEADERS=OFF \
@@ -204,3 +206,5 @@ do_install_append() {
rm -rf ${D}/usr/lib
fi
}
TOOLCHAIN = "gcc"