new file mode 100644
@@ -0,0 +1,61 @@
+From e936977934ac450d8bb7c66635c02105a29f7ea8 Mon Sep 17 00:00:00 2001
+From: Ben Ashbaugh <ben.ashbaugh@intel.com>
+Date: Wed, 27 Aug 2025 03:43:29 -0700
+Subject: [PATCH] remove checks for the command-buffer pending state (#2504)
+
+This is a very small subset of the changes in #2477 to get things
+building again, since the command-buffer pending state is no longer in
+the spec or headers.
+
+
+Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
+Upstream-Status: Backport [https://github.com/KhronosGroup/OpenCL-CTS/commit/e936977934ac450d8bb7c66635c02105a29f7ea8]
+---
+ .../command_buffer_get_command_buffer_info.cpp | 3 ---
+ .../cl_khr_command_buffer/negative_command_buffer_enqueue.cpp | 2 --
+ .../cl_khr_command_buffer/negative_command_buffer_finalize.cpp | 2 --
+ 3 files changed, 7 deletions(-)
+
+diff --git a/test_conformance/extensions/cl_khr_command_buffer/command_buffer_get_command_buffer_info.cpp b/test_conformance/extensions/cl_khr_command_buffer/command_buffer_get_command_buffer_info.cpp
+index 88ea906b1ce5..add0a5319d9e 100644
+--- a/test_conformance/extensions/cl_khr_command_buffer/command_buffer_get_command_buffer_info.cpp
++++ b/test_conformance/extensions/cl_khr_command_buffer/command_buffer_get_command_buffer_info.cpp
+@@ -250,9 +250,6 @@ struct CommandBufferGetCommandBufferInfo : public BasicCommandBufferTest
+ &trigger_event, &execute_event);
+ test_error(error, "clEnqueueCommandBufferKHR failed");
+
+- // verify pending state
+- error = verify_state(CL_COMMAND_BUFFER_STATE_PENDING_KHR);
+-
+ // execute command buffer
+ cl_int signal_error = clSetUserEventStatus(trigger_event, CL_COMPLETE);
+
+diff --git a/test_conformance/extensions/cl_khr_command_buffer/negative_command_buffer_enqueue.cpp b/test_conformance/extensions/cl_khr_command_buffer/negative_command_buffer_enqueue.cpp
+index bb59118d2995..ae14b87bcc09 100644
+--- a/test_conformance/extensions/cl_khr_command_buffer/negative_command_buffer_enqueue.cpp
++++ b/test_conformance/extensions/cl_khr_command_buffer/negative_command_buffer_enqueue.cpp
+@@ -124,8 +124,6 @@ struct EnqueueCommandBufferWithoutSimultaneousUseNotInPendingState
+
+ error = EnqueueCommandBuffer();
+ test_error(error, "EnqueueCommandBuffer failed");
+- error = verify_state(CL_COMMAND_BUFFER_STATE_PENDING_KHR);
+- test_error(error, "State is not Pending");
+
+ return CL_SUCCESS;
+ }
+diff --git a/test_conformance/extensions/cl_khr_command_buffer/negative_command_buffer_finalize.cpp b/test_conformance/extensions/cl_khr_command_buffer/negative_command_buffer_finalize.cpp
+index 8d00ca86344e..05f43506cb76 100644
+--- a/test_conformance/extensions/cl_khr_command_buffer/negative_command_buffer_finalize.cpp
++++ b/test_conformance/extensions/cl_khr_command_buffer/negative_command_buffer_finalize.cpp
+@@ -89,8 +89,6 @@ struct FinalizeCommandBufferNotRecordingState : public BasicCommandBufferTest
+
+ error = EnqueueCommandBuffer();
+ test_error(error, "EnqueueCommandBuffer failed");
+- error = verify_state(CL_COMMAND_BUFFER_STATE_PENDING_KHR);
+- test_error(error, "State is not Pending");
+
+ error = clFinalizeCommandBufferKHR(command_buffer);
+ test_failure_error_ret(error, CL_INVALID_OPERATION,
+--
+2.53.0
+
similarity index 91%
rename from meta-oe/recipes-core/opencl/opencl-clhpp_2025.07.22.bb
rename to meta-oe/recipes-core/opencl/opencl-clhpp_2026.05.29.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
DEPENDS = "opencl-headers"
-SRCREV = "2a608428f725cad7903ef55e1ce5b995895838f5"
+SRCREV = "5661a0efc215b1e05d3b90315c64f670101fdbde"
SRC_URI = "git://github.com/KhronosGroup/OpenCL-CLHPP.git;protocol=https;branch=main"
@@ -12,7 +12,9 @@ RDEPENDS:${PN} += "python3-core python3-io"
SRC_URI = "git://github.com/KhronosGroup/OpenCL-CTS.git;protocol=https;branch=main;lfs=0 \
- file://0001-Ignore-Compiler-Warnings.patch"
+ file://0001-Ignore-Compiler-Warnings.patch \
+ file://0001-remove-checks-for-the-command-buffer-pending-state-2.patch \
+ "
SRCREV = "e96edaef8b582c2412a2aab4b82f5c88af88617d"
similarity index 89%
rename from meta-oe/recipes-core/opencl/opencl-headers_2025.07.22.bb
rename to meta-oe/recipes-core/opencl/opencl-headers_2026.05.29.bb
@@ -4,7 +4,7 @@ LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
SECTION = "base"
-SRCREV = "8a97ebc88daa3495d6f57ec10bb515224400186f"
+SRCREV = "6fe718c31a45fe25151362a72ef041c3a1047cbd"
SRC_URI = "git://github.com/KhronosGroup/OpenCL-Headers.git;branch=main;protocol=https \
"
similarity index 96%
rename from meta-oe/recipes-core/opencl/opencl-icd-loader_2025.07.22.bb
rename to meta-oe/recipes-core/opencl/opencl-icd-loader_2026.05.29.bb
@@ -12,7 +12,7 @@ DEPENDS += "opencl-headers"
PROVIDES = "virtual/libopencl1"
-SRCREV = "ad770a1b64c6b8d5f2ed4e153f22e4f45939f27f"
+SRCREV = "b7bd2803acc779c03d96588e9ca9e9568a18698a"
SRC_URI = "git://github.com/KhronosGroup/OpenCL-ICD-Loader.git;branch=main;protocol=https"
EXTRA_OECMAKE:append = " \
Synchronize OpenCL headers and ICD loader with OpenCL v3.1.1 specification release. Apply the patch to opencl-cts to fix building with this release. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> --- ...r-the-command-buffer-pending-state-2.patch | 61 +++++++++++++++++++ ...25.07.22.bb => opencl-clhpp_2026.05.29.bb} | 2 +- .../opencl/opencl-cts_2025.04.14.bb | 4 +- ....07.22.bb => opencl-headers_2026.05.29.bb} | 2 +- ....22.bb => opencl-icd-loader_2026.05.29.bb} | 2 +- 5 files changed, 67 insertions(+), 4 deletions(-) create mode 100644 meta-oe/recipes-core/opencl/files/0001-remove-checks-for-the-command-buffer-pending-state-2.patch rename meta-oe/recipes-core/opencl/{opencl-clhpp_2025.07.22.bb => opencl-clhpp_2026.05.29.bb} (91%) rename meta-oe/recipes-core/opencl/{opencl-headers_2025.07.22.bb => opencl-headers_2026.05.29.bb} (89%) rename meta-oe/recipes-core/opencl/{opencl-icd-loader_2025.07.22.bb => opencl-icd-loader_2026.05.29.bb} (96%)