4 files changed, 176 insertions, 0 deletions

diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0004-refactor-use-std-numeric_limits-to-get-max-value.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0004-refactor-use-std-numeric_limits-to-get-max-value.patch
new file mode 100644
index 00000000..2d857c6b
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0004-refactor-use-std-numeric_limits-to-get-max-value.patch
@@ -0,0 +1,107 @@
+From 3e7b32bf2d6042314772249532e80517e9126bc5 Mon Sep 17 00:00:00 2001
+From: Bartosz Dunajski <bartosz.dunajski@intel.com>
+Date: Wed, 7 Jan 2026 08:11:57 +0000
+Subject: [PATCH] refactor: use std::numeric_limits to get max value
+
+Newer GCC (16.x) no longer pulls in <climits> transitively, so the use
+of ULONG_MAX failed to build. Upstream replaced ULONG_MAX with
+std::numeric_limits<uint64_t>::max(), which removes the dependency on
+the macro entirely. Backported verbatim to fix the build on the pinned
+releases/25.48 branch.
+
+Upstream-Status: Backport [https://github.com/intel/compute-runtime/commit/3e7b32bf2d6042314772249532e80517e9126bc5]
+
+Signed-off-by: Bartosz Dunajski <bartosz.dunajski@intel.com>
+Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
+---
+ shared/source/os_interface/linux/pmt_util.cpp            | 9 ++++-----
+ .../linux/product_helper_uuid_xehp_and_later.inl         | 4 ++--
+ shared/source/xe_hpc_core/linux/product_helper_pvc.cpp   | 4 +++-
+ 3 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/shared/source/os_interface/linux/pmt_util.cpp b/shared/source/os_interface/linux/pmt_util.cpp
+index 1f8546afb8e17..6ac63aa99a400 100644
+--- a/shared/source/os_interface/linux/pmt_util.cpp
++++ b/shared/source/os_interface/linux/pmt_util.cpp
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2021-2023 Intel Corporation
++ * Copyright (C) 2021-2026 Intel Corporation
+  *
+  * SPDX-License-Identifier: MIT
+  *
+@@ -11,12 +11,11 @@
+ #include "shared/source/os_interface/linux/sys_calls.h"
+ #include "shared/source/utilities/directory.h"
+ 
+-#include <climits>
+-
+ #include <algorithm>
+ #include <array>
+ #include <cstdint>
+ #include <fcntl.h>
++#include <limits>
+ #include <map>
+ #include <sstream>
+ #include <string_view>
+@@ -75,7 +74,7 @@ bool PmtUtil::readOffset(std::string_view telemDir, uint64_t &offset) {
+     ssize_t bytesRead = 0;
+     std::array<char, 16> offsetString = {'\0'};
+     if (fd > 0) {
+-        offset = ULONG_MAX;
++        offset = std::numeric_limits<uint64_t>::max();
+         bytesRead = SysCalls::pread(fd, offsetString.data(), offsetString.size() - 1, 0);
+     }
+     if (bytesRead <= 0) {
+@@ -85,7 +84,7 @@ bool PmtUtil::readOffset(std::string_view telemDir, uint64_t &offset) {
+     std::replace(offsetString.begin(), offsetString.end(), '\n', '\0');
+     offset = std::strtoul(offsetString.data(), nullptr, 10);
+ 
+-    if (offset == ULONG_MAX) {
++    if (offset == std::numeric_limits<uint64_t>::max()) {
+         return false;
+     }
+     return true;
+diff --git a/shared/source/os_interface/linux/product_helper_uuid_xehp_and_later.inl b/shared/source/os_interface/linux/product_helper_uuid_xehp_and_later.inl
+index d2187052db709..cd940cd149b41 100644
+--- a/shared/source/os_interface/linux/product_helper_uuid_xehp_and_later.inl
++++ b/shared/source/os_interface/linux/product_helper_uuid_xehp_and_later.inl
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2021-2025 Intel Corporation
++ * Copyright (C) 2021-2026 Intel Corporation
+  *
+  * SPDX-License-Identifier: MIT
+  *
+@@ -37,7 +37,7 @@ bool ProductHelperHw<gfxProduct>::getUuid(DriverModel *driverModel, const uint32
+         return false;
+     }
+ 
+-    uint64_t offset = ULONG_MAX;
++    uint64_t offset = std::numeric_limits<uint64_t>::max();
+     if (!PmtUtil::readOffset(telemDir, offset)) {
+         return false;
+     }
+diff --git a/shared/source/xe_hpc_core/linux/product_helper_pvc.cpp b/shared/source/xe_hpc_core/linux/product_helper_pvc.cpp
+index 6451de9b4f6a6..8ea0239c7ef90 100644
+--- a/shared/source/xe_hpc_core/linux/product_helper_pvc.cpp
++++ b/shared/source/xe_hpc_core/linux/product_helper_pvc.cpp
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2021-2025 Intel Corporation
++ * Copyright (C) 2021-2026 Intel Corporation
+  *
+  * SPDX-License-Identifier: MIT
+  *
+@@ -18,6 +18,8 @@
+ #include "shared/source/utilities/directory.h"
+ #include "shared/source/xe_hpc_core/hw_cmds_pvc.h"
+ 
++#include <limits>
++
+ constexpr static auto gfxProduct = IGFX_PVC;
+ 
+ namespace NEO {
+-- 
+2.34.1
+
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0005-include-cstdint-for-drm-tip-helper.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0005-include-cstdint-for-drm-tip-helper.patch
new file mode 100644
index 00000000..5aed9c60
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0005-include-cstdint-for-drm-tip-helper.patch
@@ -0,0 +1,30 @@
+From 1c113f79f6ad9c6a2f943ea7e5f82f81de98b739 Mon Sep 17 00:00:00 2001
+From: Yogesh Tyagi <yogesh.tyagi@intel.com>
+Date: Mon, 9 Jun 2026 12:05:00 +0000
+Subject: [PATCH] include cstdint for drm tip helper
+
+Fixes compile failure where fixed-width integer types are used without
+including <cstdint> in drm_tip_helper.cpp.
+
+This is only required on the pinned releases/25.48 branch. Upstream
+removed this file entirely when deprecating DG1 support, so there is no
+upstream change to submit:
+  873fbd09c38dba9416b62526fa601d1ffe480142
+  ("refactor: Remove deprecated code for DG1")
+
+Upstream-Status: Inappropriate [file removed upstream in 873fbd09c38d; needed only on releases/25.48]
+
+Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
+---
+ .../source/os_interface/linux/local/dg1/drm_tip_helper.cpp     | 1 +
+ 1 file changed, 1 insertion(+)
+
+Index: intel-compute-runtime-25.48.36300.8/shared/source/os_interface/linux/local/dg1/drm_tip_helper.cpp
+===================================================================
+--- intel-compute-runtime-25.48.36300.8.orig/shared/source/os_interface/linux/local/dg1/drm_tip_helper.cpp
++++ intel-compute-runtime-25.48.36300.8/shared/source/os_interface/linux/local/dg1/drm_tip_helper.cpp
+@@ -10,1 +10,2 @@
+-#include <memory>
++#include <cstdint>
++#include <memory>
+
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0006-test-excludes-include-cstdint.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0006-test-excludes-include-cstdint.patch
new file mode 100644
index 00000000..278f1e13
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0006-test-excludes-include-cstdint.patch
@@ -0,0 +1,32 @@
+From c6f4f71684d40f96f0f401ecf5f873fc855b9231 Mon Sep 17 00:00:00 2001
+From: Yogesh Tyagi <yogesh.tyagi@intel.com>
+Date: Tue, 10 Jun 2026 00:00:00 +0000
+Subject: [PATCH] test excludes include cstdint
+
+Fixes compile failure in shared test helper where uint32_t is used
+without including <cstdint>.
+
+Upstream already added this include on master; backported here for the
+pinned releases/25.48 branch:
+  d682c49ef1c9782873ed3c7684e6a07180531b48
+  ("test: add more missing headers for GCC 15")
+
+Upstream-Status: Backport [https://github.com/intel/compute-runtime/commit/d682c49ef1c9782873ed3c7684e6a07180531b48]
+
+Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
+---
+ .../shared/test/common/test_macros/test_excludes.cpp        | 1 +
+ 1 file changed, 1 insertion(+)
+
+Index: intel-compute-runtime-25.48.36300.8/shared/test/common/test_macros/test_excludes.cpp
+===================================================================
+--- intel-compute-runtime-25.48.36300.8.orig/shared/test/common/test_macros/test_excludes.cpp
++++ intel-compute-runtime-25.48.36300.8/shared/test/common/test_macros/test_excludes.cpp
+@@ -12,6 +12,7 @@
+ #include <map>
+ #include <memory>
+ #include <string>
++#include <cstdint>
+ #include <unordered_set>
+ 
+ using namespace NEO;
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_25.48.36300.8.bb b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_25.48.36300.8.bb
index c1209e33..de8ecaa4 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_25.48.36300.8.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_25.48.36300.8.bb
@@ -11,6 +11,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eca6ec6997e18db166db7109cdbe611c \
 SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https;branch=releases/25.48 \
            file://0002-Build-not-able-to-locate-cpp_generation_tool.patch \
            file://0003-external-ocloc.patch \
+           file://0004-refactor-use-std-numeric_limits-to-get-max-value.patch \
+           file://0005-include-cstdint-for-drm-tip-helper.patch \
+           file://0006-test-excludes-include-cstdint.patch \
            "
 
 SRCREV = "762b34beb3f6991e57d1562f587ab91ff220d708"
@@ -42,6 +45,10 @@ EXTRA_OECMAKE:append:class-target = " \
                                      -DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper \
                                      "
 
+# Newer compilers emit -Wsfinae-incomplete in templates included by image.cpp/task_information.cpp.
+# Keep -Werror globally but do not fail on this single warning class.
+CXXFLAGS:append = " -Wno-error=sfinae-incomplete"
+
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[levelzero] = "-DBUILD_WITH_L0=ON, -DBUILD_WITH_L0=OFF, level-zero"