From 0b3f156219f9e04af56b9f5dadcf8220e7821efe Mon Sep 17 00:00:00 2001
From: Teoh Suh Haw <suh.haw.teoh@intel.com>
Date: Thu, 27 Apr 2023 10:55:52 +0800
Subject: intel-compute-runtime: upgrade 23.05.25593.11 -> 23.09.25812.14

Release Notes:
https://github.com/intel/compute-runtime/releases/tag/23.09.25812.14

Adapt external-ocloc.patch

Signed-off-by: Teoh Suh Haw <suh.haw.teoh@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 .../intel-compute-runtime/external-ocloc.patch     |  4 +-
 .../intel-compute-runtime_23.05.25593.11.bb        | 62 ----------------------
 .../intel-compute-runtime_23.09.25812.14.bb        | 62 ++++++++++++++++++++++
 3 files changed, 64 insertions(+), 64 deletions(-)
 delete mode 100644 dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_23.05.25593.11.bb
 create mode 100644 dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_23.09.25812.14.bb

diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/external-ocloc.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/external-ocloc.patch
index c3c5d017..5f93b7b6 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/external-ocloc.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/external-ocloc.patch
@@ -22,12 +22,12 @@ index 2b44330831..03067c9df0 100644
 -  set(ocloc_cmd_prefix ocloc)
 -else()
 -  if(DEFINED NEO__IGC_LIBRARY_PATH)
--    set(ocloc_cmd_prefix LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${NEO__IGC_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib> $<TARGET_FILE:ocloc>)
+-    set(ocloc_cmd_prefix ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${NEO__IGC_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib>" $<TARGET_FILE:ocloc>)
 +if(NOT DEFINED ocloc_cmd_prefix)
 +  if(WIN32)
 +    set(ocloc_cmd_prefix ocloc)
    else()
--    set(ocloc_cmd_prefix LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib> $<TARGET_FILE:ocloc>)
+-    set(ocloc_cmd_prefix ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib>" $<TARGET_FILE:ocloc>)
 +    if(DEFINED NEO__IGC_LIBRARY_PATH)
 +      set(ocloc_cmd_prefix LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${NEO__IGC_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib> $<TARGET_FILE:ocloc>)
 +    else()
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_23.05.25593.11.bb b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_23.05.25593.11.bb
deleted file mode 100644
index 4848c507..00000000
--- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_23.05.25593.11.bb
+++ /dev/null
@@ -1,62 +0,0 @@
-SUMMARY = "The Intel(R) Graphics Compute Runtime for OpenCL(TM)"
-DESCRIPTION = "The Intel(R) Graphics Compute Runtime for OpenCL(TM) \
-is an open source project to converge Intel's development efforts \
-on OpenCL(TM) compute stacks supporting the GEN graphics hardware \
-architecture."
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eca6ec6997e18db166db7109cdbe611c \
-                    file://third_party/opencl_headers/LICENSE;md5=dcefc90f4c3c689ec0c2489064e7273b"
-
-SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https;branch=releases/23.05 \
-          "
-
-SRC_URI:append:class-target = "file://allow-to-find-cpp-generation-tool.patch \
-                               file://external-ocloc.patch \
-                              "
-
-SRCREV = "4adb15f14975b10138939acbe17e05f2f010fc36"
-
-S = "${WORKDIR}/git"
-
-DEPENDS += " intel-graphics-compiler gmmlib"
-DEPENDS:append:class-target = " intel-compute-runtime-native libva"
-
-RDEPENDS:${PN} += " intel-graphics-compiler gmmlib"
-
-inherit cmake pkgconfig
-
-COMPATIBLE_HOST = '(x86_64).*-linux'
-COMPATIBLE_HOST:libc-musl = "null"
-
-EXTRA_OECMAKE = " \
-                 -DIGC_DIR=${STAGING_INCDIR}/igc \
-                 -DBUILD_TYPE=Release \
-                 -DSKIP_UNIT_TESTS=1 \
-                 -DCCACHE_ALLOWED=FALSE \
-                 -DNEO_DISABLE_LD_LLD=ON \
-                 -DNEO_DISABLE_LD_GOLD=ON \
-                 "
-
-EXTRA_OECMAKE:append:class-target = " \
-                                     -Docloc_cmd_prefix=ocloc \
-                                    "
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[levelzero] = "-DBUILD_WITH_L0=ON, -DBUILD_WITH_L0=OFF, level-zero"
-
-do_install:append:class-native() {
-    install -d ${D}${bindir}
-    install ${B}/bin/cpp_generate_tool ${D}${bindir}/
-}
-
-FILES:${PN} += " \
-                 ${libdir}/intel-opencl/libigdrcl.so \
-                 ${libdir}/libocloc.so \
-                 "
-
-FILES:${PN}-dev = "${includedir}"
-
-BBCLASSEXTEND = "native nativesdk"
-
-UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_23.09.25812.14.bb b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_23.09.25812.14.bb
new file mode 100644
index 00000000..cd8eae45
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_23.09.25812.14.bb
@@ -0,0 +1,62 @@
+SUMMARY = "The Intel(R) Graphics Compute Runtime for OpenCL(TM)"
+DESCRIPTION = "The Intel(R) Graphics Compute Runtime for OpenCL(TM) \
+is an open source project to converge Intel's development efforts \
+on OpenCL(TM) compute stacks supporting the GEN graphics hardware \
+architecture."
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eca6ec6997e18db166db7109cdbe611c \
+                    file://third_party/opencl_headers/LICENSE;md5=dcefc90f4c3c689ec0c2489064e7273b"
+
+SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https;branch=releases/23.09 \
+          "
+
+SRC_URI:append:class-target = "file://allow-to-find-cpp-generation-tool.patch \
+                               file://external-ocloc.patch \
+                              "
+
+SRCREV = "d26a2d106c2f0973cdf9fd8c91ba35a377988c1e"
+
+S = "${WORKDIR}/git"
+
+DEPENDS += " intel-graphics-compiler gmmlib"
+DEPENDS:append:class-target = " intel-compute-runtime-native libva"
+
+RDEPENDS:${PN} += " intel-graphics-compiler gmmlib"
+
+inherit cmake pkgconfig
+
+COMPATIBLE_HOST = '(x86_64).*-linux'
+COMPATIBLE_HOST:libc-musl = "null"
+
+EXTRA_OECMAKE = " \
+                 -DIGC_DIR=${STAGING_INCDIR}/igc \
+                 -DBUILD_TYPE=Release \
+                 -DSKIP_UNIT_TESTS=1 \
+                 -DCCACHE_ALLOWED=FALSE \
+                 -DNEO_DISABLE_LD_LLD=ON \
+                 -DNEO_DISABLE_LD_GOLD=ON \
+                 "
+
+EXTRA_OECMAKE:append:class-target = " \
+                                     -Docloc_cmd_prefix=ocloc \
+                                    "
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[levelzero] = "-DBUILD_WITH_L0=ON, -DBUILD_WITH_L0=OFF, level-zero"
+
+do_install:append:class-native() {
+    install -d ${D}${bindir}
+    install ${B}/bin/cpp_generate_tool ${D}${bindir}/
+}
+
+FILES:${PN} += " \
+                 ${libdir}/intel-opencl/libigdrcl.so \
+                 ${libdir}/libocloc.so \
+                 "
+
+FILES:${PN}-dev = "${includedir}"
+
+BBCLASSEXTEND = "native nativesdk"
+
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
-- 
cgit v1.2.3-54-g00ecf