From c2c2c920ff4e2a5a722fc65c0da593a5d39b07ec Mon Sep 17 00:00:00 2001 From: Matt Madison Date: Fri, 17 Mar 2023 07:05:38 -0700 Subject: [PATCH] external/openembedded-layer: update bbappend for opencv 4.7 with an additional patch to fix breakage in OpenCVDetectCUDA.cmake. Signed-off-by: Matt Madison --- ...-Fix-search-paths-in-FindCUDNN.cmake.patch | 8 +++--- ...ide-of-CUDA_TOOLKIT_TARGET_DIR-setti.patch | 28 +++++++++++++++++++ ...v_4.6.%.bbappend => opencv_4.7.%.bbappend} | 5 +++- 3 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 external/openembedded-layer/recipes-support/opencv/opencv/0002-Fix-broken-override-of-CUDA_TOOLKIT_TARGET_DIR-setti.patch rename external/openembedded-layer/recipes-support/opencv/{opencv_4.6.%.bbappend => opencv_4.7.%.bbappend} (87%) diff --git a/external/openembedded-layer/recipes-support/opencv/opencv/0001-Fix-search-paths-in-FindCUDNN.cmake.patch b/external/openembedded-layer/recipes-support/opencv/opencv/0001-Fix-search-paths-in-FindCUDNN.cmake.patch index 8046ae40..b9c33400 100644 --- a/external/openembedded-layer/recipes-support/opencv/opencv/0001-Fix-search-paths-in-FindCUDNN.cmake.patch +++ b/external/openembedded-layer/recipes-support/opencv/opencv/0001-Fix-search-paths-in-FindCUDNN.cmake.patch @@ -1,7 +1,7 @@ -From 75afa574e33befbe7f7f67f828d5d38f498d39fa Mon Sep 17 00:00:00 2001 +From 295390cc1fb80eaedb2d9a29a1528be362e86265 Mon Sep 17 00:00:00 2001 From: Matt Madison Date: Wed, 19 Aug 2020 04:53:27 -0700 -Subject: [PATCH] Fix search paths in FindCUDNN.cmake +Subject: [PATCH 1/2] Fix search paths in FindCUDNN.cmake CuDNN libraries are not located in the CUDA toolkit for Tegra platforms. @@ -12,7 +12,7 @@ Signed-off-by: Matt Madison 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake/FindCUDNN.cmake b/cmake/FindCUDNN.cmake -index 90d8b2ea78..9efee59385 100644 +index df64db39e6..9c6bc6d971 100644 --- a/cmake/FindCUDNN.cmake +++ b/cmake/FindCUDNN.cmake @@ -41,9 +41,12 @@ The following cache variables will be set if cuDNN was found. They may also be s @@ -32,5 +32,5 @@ index 90d8b2ea78..9efee59385 100644 # find the include -- -2.25.1 +2.34.1 diff --git a/external/openembedded-layer/recipes-support/opencv/opencv/0002-Fix-broken-override-of-CUDA_TOOLKIT_TARGET_DIR-setti.patch b/external/openembedded-layer/recipes-support/opencv/opencv/0002-Fix-broken-override-of-CUDA_TOOLKIT_TARGET_DIR-setti.patch new file mode 100644 index 00000000..2887459c --- /dev/null +++ b/external/openembedded-layer/recipes-support/opencv/opencv/0002-Fix-broken-override-of-CUDA_TOOLKIT_TARGET_DIR-setti.patch @@ -0,0 +1,28 @@ +From e869296a0da1cbaf2c9863f9c4bfa007bac2deb1 Mon Sep 17 00:00:00 2001 +From: Matt Madison +Date: Fri, 17 Mar 2023 06:47:40 -0700 +Subject: [PATCH 2/2] Fix broken override of CUDA_TOOLKIT_TARGET_DIR setting + +Signed-off-by: Matt Madison +--- + cmake/OpenCVDetectCUDA.cmake | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/cmake/OpenCVDetectCUDA.cmake b/cmake/OpenCVDetectCUDA.cmake +index a3d987a2b8..08d4ce04d1 100644 +--- a/cmake/OpenCVDetectCUDA.cmake ++++ b/cmake/OpenCVDetectCUDA.cmake +@@ -11,7 +11,9 @@ endif() + #set(OPENCV_CMAKE_CUDA_DEBUG 1) + + if(CUDA_TOOLKIT_ROOT_DIR) +- set(CUDA_TOOLKIT_TARGET_DIR ${CUDA_TOOLKIT_ROOT_DIR}) ++ if(NOT CUDA_TOOLKIT_TARGET_DIR) ++ set(CUDA_TOOLKIT_TARGET_DIR ${CUDA_TOOLKIT_ROOT_DIR}) ++ endif() + endif() + + if(((NOT CMAKE_VERSION VERSION_LESS "3.9.0") # requires https://gitlab.kitware.com/cmake/cmake/merge_requests/663 +-- +2.34.1 + diff --git a/external/openembedded-layer/recipes-support/opencv/opencv_4.6.%.bbappend b/external/openembedded-layer/recipes-support/opencv/opencv_4.7.%.bbappend similarity index 87% rename from external/openembedded-layer/recipes-support/opencv/opencv_4.6.%.bbappend rename to external/openembedded-layer/recipes-support/opencv/opencv_4.7.%.bbappend index 2063f10a..e7198f23 100644 --- a/external/openembedded-layer/recipes-support/opencv/opencv_4.6.%.bbappend +++ b/external/openembedded-layer/recipes-support/opencv/opencv_4.7.%.bbappend @@ -14,7 +14,10 @@ OPENCV_CUDA_SUPPORT ?= "${@'cuda dnn' if opencv_cuda_flags(d) else ''}" PACKAGECONFIG:append:cuda = " ${OPENCV_CUDA_SUPPORT}" EXTRA_OECMAKE:append:cuda = ' -DOPENCV_CUDA_DETECTION_NVCC_FLAGS="-ccbin ${CUDAHOSTCXX}"' -SRC_URI:append:cuda = " file://0001-Fix-search-paths-in-FindCUDNN.cmake.patch" +SRC_URI:append:cuda = " \ + file://0001-Fix-search-paths-in-FindCUDNN.cmake.patch \ + file://0002-Fix-broken-override-of-CUDA_TOOLKIT_TARGET_DIR-setti.patch \ +" OPTICALFLOW_MD5 = "a73cd48b18dcc0cc8933b30796074191" OPTICALFLOW_HASH = "edb50da3cf849840d680249aa6dbef248ebce2ca"