From: Ross Burton <ross.burton@arm.com>
Date: Thu, 19 Jan 2023 17:09:52 +0000 (+0000)
Subject: spirv-headers/spirv-tools: set correct branch name
X-Git-Tag: 2023-04-mickledore~728
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2957da09f13607ac00ddd4a87ec9ad0014326507;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

spirv-headers/spirv-tools: set correct branch name

As of last week, the SPIRV repositories have renamed their master
branches to main:

https://github.com/KhronosGroup/SPIRV-Headers/issues/313

We could set branch=main, but the commits we're using are also on
release branches so use those instead.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-graphics/spir/spirv-headers_1.3.236.0.bb b/meta/recipes-graphics/spir/spirv-headers_1.3.236.0.bb
index e35628ecbf1..5b4e15756eb 100644
--- a/meta/recipes-graphics/spir/spirv-headers_1.3.236.0.bb
+++ b/meta/recipes-graphics/spir/spirv-headers_1.3.236.0.bb
@@ -8,7 +8,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d"
 
 SRCREV = "1d31a100405cf8783ca7a31e31cdd727c9fc54c3"
-SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=master"
+SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=sdk-1.3.236"
 PE = "1"
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
 S = "${WORKDIR}/git"
diff --git a/meta/recipes-graphics/spir/spirv-tools_1.3.236.0.bb b/meta/recipes-graphics/spir/spirv-tools_1.3.236.0.bb
index c921bdef721..1099925cf04 100644
--- a/meta/recipes-graphics/spir/spirv-tools_1.3.236.0.bb
+++ b/meta/recipes-graphics/spir/spirv-tools_1.3.236.0.bb
@@ -8,7 +8,7 @@ LICENSE  = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 SRCREV = "40f5bf59c6acb4754a0bffd3c53a715732883a12"
-SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=master;protocol=https"
+SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=sdk-1.3.236;protocol=https"
 PE = "1"
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
 S = "${WORKDIR}/git"