deleted file mode 100644
@@ -1,39 +0,0 @@
-From 67ccf77d97b76e8260c9d793ab172577e2393dbc Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 19 Dec 2019 21:33:46 -0800
-Subject: [PATCH] use GNUInstallDirs for detecting install paths
-
-This helps with multilib builds
-
-Upstream-Status: Submitted [https://github.com/opencv/ade/pull/19]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- sources/ade/CMakeLists.txt | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/sources/ade/CMakeLists.txt b/sources/ade/CMakeLists.txt
-index 2d1dd20..46415d1 100644
---- a/sources/ade/CMakeLists.txt
-+++ b/sources/ade/CMakeLists.txt
-@@ -47,12 +47,14 @@ if(BUILD_ADE_DOCUMENTATION)
- VERBATIM)
- endif()
-
-+include(GNUInstallDirs)
-+
- install(TARGETS ade COMPONENT dev
- EXPORT adeTargets
-- ARCHIVE DESTINATION lib
-- LIBRARY DESTINATION lib
-- RUNTIME DESTINATION lib
-- INCLUDES DESTINATION include)
-+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+ RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-
- install(EXPORT adeTargets DESTINATION share/ade COMPONENT dev)
-
-2.24.1
-
similarity index 79%
rename from meta-oe/recipes-support/opencv/ade_0.1.1f.bb
rename to meta-oe/recipes-support/opencv/ade_0.1.2.bb
@@ -4,11 +4,9 @@ and processing framework. ADE Framework is suitable for \
organizing data flow processing and execution."
HOMEPAGE = "https://github.com/opencv/ade"
-SRC_URI = "git://github.com/opencv/ade.git;branch=master;protocol=https \
- file://0001-use-GNUInstallDirs-for-detecting-install-paths.patch \
- "
+SRC_URI = "git://github.com/opencv/ade.git;branch=master;protocol=https"
-SRCREV = "58b2595a1a95cc807be8bf6222f266a9a1f393a9"
+SRCREV = "1e02d7486bdb9c87993d91b9910e7cc6c4ddbf66"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
0001-use-GNUInstallDirs-for-detecting-install-paths.patch removed since it's included in 0.1.2 Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- ...tallDirs-for-detecting-install-paths.patch | 39 ------------------- .../opencv/{ade_0.1.1f.bb => ade_0.1.2.bb} | 6 +-- 2 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch rename meta-oe/recipes-support/opencv/{ade_0.1.1f.bb => ade_0.1.2.bb} (79%)