From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 24 Mar 2026 23:08:33 +0000 (-0700)
Subject: spirv-llvm-translation: Upgrade to 22.0
X-Git-Tag: yocto-6.0_M3~148
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71dea8ec70160730b0afab4532325ea56071d53c;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

spirv-llvm-translation: Upgrade to 22.0

major version of spirv translator should match clang major version

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---

diff --git a/meta/recipes-graphics/spir/spirv-llvm-translator_21.1.5.bb b/meta/recipes-graphics/spir/spirv-llvm-translator_22.0.0.bb
similarity index 75%
rename from meta/recipes-graphics/spir/spirv-llvm-translator_21.1.5.bb
rename to meta/recipes-graphics/spir/spirv-llvm-translator_22.0.0.bb
index a727079a43..20f4ba8464 100644
--- a/meta/recipes-graphics/spir/spirv-llvm-translator_21.1.5.bb
+++ b/meta/recipes-graphics/spir/spirv-llvm-translator_22.0.0.bb
@@ -5,10 +5,10 @@ LICENSE = "NCSA"
 LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=47e311aa9caedd1b3abf098bd7814d1d"
 
 # pattern: llvm_branch_200, currently there are no minor releases, so, no llvm_branch_201
-SPIRV_BRANCH = "llvm_release_${@oe.utils.trim_version('${PV}', 1).replace('.', '')}0"
-SRCREV = "a76fd0702de564476fb31e8a15f1415f05ad8951"
+SPIRV_BRANCH = "main"
+SRCREV = "f821423888319dd2f0c436fc9ab86c798ac48ba1"
 SRC_URI = " \
-    git://github.com/KhronosGroup/SPIRV-LLVM-Translator;protocol=https;tag=v${PV};branch=${SPIRV_BRANCH} \
+    git://github.com/KhronosGroup/SPIRV-LLVM-Translator;protocol=https;branch=${SPIRV_BRANCH} \
 "
 
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
@@ -18,7 +18,7 @@ DEPENDS = "llvm spirv-tools spirv-headers"
 inherit cmake pkgconfig lib_package
 
 EXTRA_OECMAKE = "\
-    -DBASE_LLVM_VERSION='${@oe.utils.trim_version('${PV}', 3)}' \
+    -DBASE_LLVM_VERSION=22.1.0 \
     -DCMAKE_SKIP_BUILD_RPATH=ON \
     -DBUILD_SHARED_LIBS=ON \
     -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${STAGING_INCDIR}/.. \