summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-05-15 07:06:25 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-05-18 12:43:00 +0100
commit169f863cf380396a5aca2dedafce00d9938e9370 (patch)
tree1f2da480422411f4cb19bdfba3837524d0bca59e
parent709ff9bd1ce5fcdeef0c9220bc178d04fdef68fe (diff)
downloadpoky-169f863cf380396a5aca2dedafce00d9938e9370.tar.gz
shaderc: upgrade 2020.5 -> 2021.0
(From OE-Core rev: 9ff9536efdc4e5cc7c9934ab739bb7a75b55fb29) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/shaderc/files/0002-libshaderc_util-fix-glslang-header-file-location.patch12
-rw-r--r--meta/recipes-graphics/shaderc/shaderc_2021.0.bb (renamed from meta/recipes-graphics/shaderc/shaderc_2020.5.bb)2
2 files changed, 6 insertions, 8 deletions
diff --git a/meta/recipes-graphics/shaderc/files/0002-libshaderc_util-fix-glslang-header-file-location.patch b/meta/recipes-graphics/shaderc/files/0002-libshaderc_util-fix-glslang-header-file-location.patch
index df670cdded..0e8ad7e4d2 100644
--- a/meta/recipes-graphics/shaderc/files/0002-libshaderc_util-fix-glslang-header-file-location.patch
+++ b/meta/recipes-graphics/shaderc/files/0002-libshaderc_util-fix-glslang-header-file-location.patch
@@ -1,17 +1,18 @@
1From 046c3c2da9c4ff66f14db5bd68e9557504a49241 Mon Sep 17 00:00:00 2001 1From d02ad48d5c9b48af70ddea2e6998081347ef82f3 Mon Sep 17 00:00:00 2001
2From: Jose Quaresma <quaresma.jose@gmail.com> 2From: Jose Quaresma <quaresma.jose@gmail.com>
3Date: Sat, 13 Feb 2021 00:45:56 +0000 3Date: Sat, 13 Feb 2021 00:45:56 +0000
4Subject: [PATCH 2/3] libshaderc_util: fix glslang header file location 4Subject: [PATCH] libshaderc_util: fix glslang header file location
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
8Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> 8Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
9
9--- 10---
10 libshaderc_util/src/compiler.cc | 2 +- 11 libshaderc_util/src/compiler.cc | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-) 12 1 file changed, 1 insertion(+), 1 deletion(-)
12 13
13diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc 14diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc
14index c5ce37e..4703634 100644 15index 051558b..9c4476c 100644
15--- a/libshaderc_util/src/compiler.cc 16--- a/libshaderc_util/src/compiler.cc
16+++ b/libshaderc_util/src/compiler.cc 17+++ b/libshaderc_util/src/compiler.cc
17@@ -20,7 +20,7 @@ 18@@ -20,7 +20,7 @@
@@ -21,8 +22,5 @@ index c5ce37e..4703634 100644
21-#include "SPIRV/GlslangToSpv.h" 22-#include "SPIRV/GlslangToSpv.h"
22+#include "glslang/SPIRV/GlslangToSpv.h" 23+#include "glslang/SPIRV/GlslangToSpv.h"
23 #include "libshaderc_util/format.h" 24 #include "libshaderc_util/format.h"
24 #include "libshaderc_util/io.h" 25 #include "libshaderc_util/io_shaderc.h"
25 #include "libshaderc_util/message.h" 26 #include "libshaderc_util/message.h"
26--
272.30.1
28
diff --git a/meta/recipes-graphics/shaderc/shaderc_2020.5.bb b/meta/recipes-graphics/shaderc/shaderc_2021.0.bb
index ce51aab034..3d59e0c38c 100644
--- a/meta/recipes-graphics/shaderc/shaderc_2020.5.bb
+++ b/meta/recipes-graphics/shaderc/shaderc_2021.0.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/google/shaderc"
6LICENSE = "Apache-2.0" 6LICENSE = "Apache-2.0"
7LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" 7LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
8 8
9SRCREV = "f3e39a7eed682faececb73f0b85717f2f44ee9ba" 9SRCREV = "1a3e2aaab191f44644e899e29ab7bac50bebdeb8"
10SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main \ 10SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main \
11 file://0001-cmake-disable-building-external-dependencies.patch \ 11 file://0001-cmake-disable-building-external-dependencies.patch \
12 file://0002-libshaderc_util-fix-glslang-header-file-location.patch \ 12 file://0002-libshaderc_util-fix-glslang-header-file-location.patch \