diff --git a/meta-oe/recipes-core/opencl/files/0001-Always-enable-beta-extensions-2330.patch b/meta-oe/recipes-core/opencl/files/0001-Always-enable-beta-extensions-2330.patch deleted file mode 100644 index 430f9575c4..0000000000 --- a/meta-oe/recipes-core/opencl/files/0001-Always-enable-beta-extensions-2330.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 3a275fe81b6d436194f563e7a3d24f302d14a211 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?K=C3=A9vin=20Petit?= -Date: Tue, 11 Mar 2025 18:40:29 +0000 -Subject: [PATCH] Always enable beta extensions (#2330) - -`CL_ENABLE_BETA_EXTENSIONS` was just introduced in -https://github.com/KhronosGroup/OpenCL-Headers/pull/276 -to guard provisional and other experimental extensions. The CTS -currently assumes -all definitions are always present. - -Signed-off-by: Kevin Petit -Upstream-Status: Backport [https://github.com/KhronosGroup/OpenCL-CTS/commit/3a275fe81b6d436194f563e7a3d24f302d14a211] ---- - CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 898f62e97bdc..8a93ea9fb843 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -18,6 +18,7 @@ add_definitions(-DCL_USE_DEPRECATED_OPENCL_1_2_APIS=1) - add_definitions(-DCL_USE_DEPRECATED_OPENCL_1_1_APIS=1) - add_definitions(-DCL_USE_DEPRECATED_OPENCL_1_0_APIS=1) - add_definitions(-DCL_NO_EXTENSION_PROTOTYPES) -+add_definitions(-DCL_ENABLE_BETA_EXTENSIONS) - - option(USE_CL_EXPERIMENTAL "Use Experimental definitions" OFF) - if(USE_CL_EXPERIMENTAL) --- -2.47.2 - diff --git a/meta-oe/recipes-core/opencl/opencl-cts_2025.01.22.bb b/meta-oe/recipes-core/opencl/opencl-cts_2025.04.14.bb similarity index 90% rename from meta-oe/recipes-core/opencl/opencl-cts_2025.01.22.bb rename to meta-oe/recipes-core/opencl/opencl-cts_2025.04.14.bb index 52c8c59f27..9c6a55691f 100644 --- a/meta-oe/recipes-core/opencl/opencl-cts_2025.01.22.bb +++ b/meta-oe/recipes-core/opencl/opencl-cts_2025.04.14.bb @@ -10,10 +10,9 @@ RDEPENDS:${PN} += "python3-core python3-io" SRC_URI = "git://github.com/KhronosGroup/OpenCL-CTS.git;protocol=https;branch=main;lfs=0 \ - file://0001-Always-enable-beta-extensions-2330.patch \ file://0001-Ignore-Compiler-Warnings.patch" -SRCREV = "5b3518096ca7b82854daadb2b2fae704fe2d9cb5" +SRCREV = "e96edaef8b582c2412a2aab4b82f5c88af88617d" EXTRA_OECMAKE:append = " -DENABLE_WERROR=OFF -DCL_INCLUDE_DIR=${STAGING_INCDIR} -DCL_LIB_DIR=${STAGING_LIBDIR} -DOPENCL_LIBRARIES=OpenCL"