From f9167e9c31d55c60d6713aa4f601b012663926e3 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 19 Jan 2023 17:09:52 +0000 Subject: [PATCH] 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 Signed-off-by: Ross Burton Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 2957da09f13607ac00ddd4a87ec9ad0014326507) Signed-off-by: Steve Sakoman --- 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 94500a96bad..ce47206ac29 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\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 fc1074d8b89..c6fba3821b3 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.47.3