oidn: upgrade 1.4.3 -> 2.1.0

Drop patch, which is not required anymore.

Update license files path.

Refreshed copyrights in license and third party programs.

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>

2 files changed, 4 insertions, 42 deletions

diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn/0001-remove-redundant-RPATH.patch b/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn/0001-remove-redundant-RPATH.patch
deleted file mode 100644
index 0f39a581..00000000
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn/0001-remove-redundant-RPATH.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 46b7de8c4ae0cc34805c2a11356c5a730fb8760a Mon Sep 17 00:00:00 2001
-From: Ezhilarasan <ezhilarasanx.s@intel.com>
-Date: Fri, 4 Mar 2022 21:04:47 +0530
-Subject: [PATCH] remove-redundant-RPATH
-
-Error Log:
-ERROR: oidn-1.4.3-r0 do_package_qa: QA Issue: oidn: /usr/lib/libOpenImageDenoise.so.1.4.3 contains probably-redundant RPATH /usr/lib
-oidn: /usr/bin/oidnTest contains probably-redundant RPATH /usr/lib
-oidn: /usr/bin/oidnDenoise contains probably-redundant RPATH /usr/lib
-oidn: /usr/bin/oidnBenchmark contains probably-redundant RPATH /usr/lib [useless-rpaths]
-ERROR: oidn-1.4.3-r0 do_package_qa: Fatal QA errors were found, failing task.
-
-Remove the redundant RPATH
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Ezhilarasan <ezhilarasanx.s@intel.com>
----
- cmake/oidn_package.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/oidn_package.cmake b/cmake/oidn_package.cmake
-index 1f76af8..46c0854 100644
---- a/cmake/oidn_package.cmake
-+++ b/cmake/oidn_package.cmake
-@@ -29,7 +29,7 @@ if(OIDN_ZIP_MODE)
-     set(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}")
-   endif()
- else()
--  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
-+#  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
- endif()
- 
- ## -----------------------------------------------------------------------------
--- 
-2.17.1
-
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn_1.4.3.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn_2.1.0.bb
index 8e055a57..4ea6ffbe 100644
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn_1.4.3.bb
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn_2.1.0.bb
@@ -7,15 +7,14 @@ HOMEPAGE = "https://www.openimagedenoise.org/"
 
 LICENSE = "Apache-2.0 & BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
-                    file://mkl-dnn/LICENSE;md5=8e17c0f9656ebaf0c380d9b22707c846 \
-                    file://mkl-dnn/src/cpu/x64/xbyak/COPYRIGHT;md5=3b9bf048d063d54cdb28964db558bcc7 \
-                    file://mkl-dnn/src/common/ittnotify/LICENSE.BSD;md5=e671ff178b24a95a382ba670503c66fb \
+                    file://external/mkl-dnn/LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \
+                    file://external/mkl-dnn/src/cpu/x64/xbyak/COPYRIGHT;md5=3b9bf048d063d54cdb28964db558bcc7 \
+                    file://external/mkl-dnn/src/common/ittnotify/LICENSE.BSD;md5=e671ff178b24a95a382ba670503c66fb \
                     file://weights/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 SRC_URI = "https://github.com/OpenImageDenoise/${BPN}/releases/download/v${PV}/${BP}.src.tar.gz\
-           file://0001-remove-redundant-RPATH.patch \
            "
-SRC_URI[sha256sum] = "3276e252297ebad67a999298d8f0c30cfb221e166b166ae5c955d88b94ad062a"
+SRC_URI[sha256sum] = "ce144ba582ff36563d9442ee07fa2a4d249bc85aa93e5b25fc527ff4ee755ed6"
 
 inherit cmake