[langdale 08/17] spirv-headers/spirv-tools: set correct branch name


Steve Sakoman
 

From: Ross Burton <ross.burton@...>

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

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

Signed-off-by: Ross Burton <ross.burton@...>
Signed-off-by: Luca Ceresoli <luca.ceresoli@...>
Signed-off-by: Richard Purdie <richard.purdie@...>
(cherry picked from commit 2957da09f13607ac00ddd4a87ec9ad0014326507)
Signed-off-by: Steve Sakoman <steve@...>
---
meta/recipes-graphics/spir/spirv-headers_1.3.216.0.bb | 2 +-
meta/recipes-graphics/spir/spirv-tools_1.3.216.0.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/spir/spirv-headers_1.3.216.0.bb b/meta/recipes-graphics/spir/spirv-headers_1.3.216.0.bb
index 94500a96ba..ce47206ac2 100644
--- a/meta/recipes-graphics/spir/spirv-headers_1.3.216.0.bb
+++ b/meta/recipes-graphics/spir/spirv-headers_1.3.216.0.bb
@@ -8,7 +8,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d"

SRCREV = "b2a156e1c0434bc8c99aaebba1c7be98be7ac580"
-SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=master"
+SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main"
PE = "1"
UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-graphics/spir/spirv-tools_1.3.216.0.bb b/meta/recipes-graphics/spir/spirv-tools_1.3.216.0.bb
index fc1074d8b8..c6fba3821b 100644
--- a/meta/recipes-graphics/spir/spirv-tools_1.3.216.0.bb
+++ b/meta/recipes-graphics/spir/spirv-tools_1.3.216.0.bb
@@ -8,7 +8,7 @@ LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"

SRCREV = "c94501352d545e84c821ce031399e76d1af32d18"
-SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=master;protocol=https \
+SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https \
file://0001-Remove-default-copy-constructor-in-header.-4879.patch \
"
PE = "1"
--
2.25.1