opencl-icd-loader: Update 2020.12.18 -> v2022.01.04

- Fix recipe style WARNINGS from oe-stylize.

    ./contrib/oe-stylize.py
    meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb

    Reminder:  Tabs should not be used (use spaces instead)  in : '
    ${bindir}/icd_loader_test \ '

    Reminder:  The correct spacing for a variable is FOO = "BAR"
    in : '
    SUMMARY  = "OpenCL ICD Loader" '

- Fix missing lib for CL applications

    strace clinfo:
    openat(AT_FDCWD, "/usr/lib/libOpenCL.so.1", O_RDONLY|O_CLOEXEC) =
    -1 ENOENT (No such file or directory)
    newfstatat(AT_FDCWD, "/usr/lib", {st_mode=S_IFDIR|0755, st_size=36864, ...}, 0) = 0
    writev(2, [{iov_base="clinfo", iov_len=6}, {iov_base=": ", iov_len=2},
    {iov_base="error while loading shared libra"..., iov_len=36},
    {iov_base=": ", iov_len=2}, {iov_base="libOpenCL.so.1", iov_len=14},
    {iov_base=": ", iov_len=2}, {iov_base="cannot open shared object file", iov_len=30},
    {iov_base=": ", iov_len=2}, {iov
    _base="No such file or directory", iov_len=25}, {iov_base="\n", iov_len=1}], 10
    clinfo: error while loading shared libraries: libOpenCL.so.1: cannot open shared
    object file: No such file or directory) = 120
    exit_group(127)                         = ?

- Change branch name master -> main according to upstream repository.

Signed-off-by: Daniel Gomez <daniel@qtec.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

1 files changed, 30 insertions, 24 deletions

diff --git a/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb b/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb
index 45b1ad5494..67437732d8 100644
--- a/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb
+++ b/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb
@@ -1,30 +1,36 @@
-SUMMARY  = "OpenCL ICD Loader"
+SUMMARY = "OpenCL ICD Loader"
 DESCRIPTION = "OpenCL compute ICD Loader from Khronos Group"
-LICENSE  = "Apache-2.0"
+LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
 SECTION = "base"
 
+inherit pkgconfig cmake
+
 DEPENDS += "opencl-headers"
 
-inherit pkgconfig cmake
+PROVIDES = "virtual/opencl-icd"
 
 S = "${WORKDIR}/git"
-PV = "2020.12.18+git${SRCPV}"
-SRCREV = "1d5315c3ed30d026acb79a1aa53a276fc833ffa7"
-SRC_URI = "git://github.com/KhronosGroup/OpenCL-ICD-Loader.git;branch=master;protocol=https"
-
-do_install () {
-        install -d ${D}${bindir}
-        install -m 0755 ${B}/test/loader_test/icd_loader_test ${D}${bindir}/
-        chrpath -d ${D}${bindir}/icd_loader_test
-        install -d ${D}${libdir}
-        install -m 0644 ${B}/test/log/libIcdLog.so ${D}${libdir}/
-        install -m 0644 ${B}/test/driver_stub/libOpenCLDriverStub.so ${D}${libdir}/
-        chrpath -d ${D}${libdir}/libOpenCLDriverStub.so
-        install -m 0644 ${B}/libOpenCL.so.1.2 ${D}${libdir}/
-        cd ${D}${libdir}
-        ln -s libOpenCL.so.1.2 libOpenCL.so.1
-        ln -s libOpenCL.so.1 libOpenCL.so
+PV = "v2022.01.04+git${SRCPV}"
+SRCREV = "169f05d026e65948b30cfe2200595fda92198cf7"
+SRC_URI = "git://github.com/KhronosGroup/OpenCL-ICD-Loader.git;branch=main;protocol=https"
+
+EXTRA_OECMAKE:append = " \
+    -DOPENCL_ICD_LOADER_HEADERS_DIR=${STAGING_INCDIR} \
+"
+
+do_install() {
+    install -d ${D}${bindir}
+    install -m 0755 ${B}/test/loader_test/icd_loader_test ${D}${bindir}/
+    chrpath -d ${D}${bindir}/icd_loader_test
+    install -d ${D}${libdir}
+    install -m 0644 ${B}/test/log/libIcdLog.so ${D}${libdir}/
+    install -m 0644 ${B}/test/driver_stub/libOpenCLDriverStub.so ${D}${libdir}/
+    chrpath -d ${D}${libdir}/libOpenCLDriverStub.so
+    install -m 0644 ${B}/libOpenCL.so.1.2 ${D}${libdir}/
+    cd ${D}${libdir}
+    ln -s libOpenCL.so.1.2 libOpenCL.so.1
+    ln -s libOpenCL.so.1 libOpenCL.so
 }
 
 PACKAGES = "opencl-icd-loader opencl-icd-loader-dev"
@@ -32,13 +38,13 @@ PACKAGES += "libicdlog libicdlog-dbg"
 PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
 
 FILES:${PN} = " \
-        ${bindir}/icd_loader_test \
-        ${libdir}/libOpenCLDriverStub.so \
-        ${libdir}/libOpenCL.so.1.2 \
+    ${bindir}/icd_loader_test \
+    ${libdir}/libOpenCLDriverStub.so \
+    ${libdir}/libOpenCL.so.1.2 \
+    ${libdir}/libOpenCL.so.1 \
 "
 FILES:${PN}-dev = " \
-        ${libdir}/libOpenCL.so \
-        ${libdir}/libOpenCL.so.1 \
+    ${libdir}/libOpenCL.so \
 "
 
 FILES:libicdlog = "${libdir}/libIcdLog.so"