Fix glslang header file location in libshaderc_util with CXXFLAGS and drop the pending pacth.
Signed-off-by: Jose Quaresma <[email protected]> --- ...til-fix-glslang-header-file-location.patch | 25 ------------------- .../shaderc/shaderc_2026.3.bb | 3 ++- 2 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 meta/recipes-graphics/shaderc/files/0002-libshaderc_util-fix-glslang-header-file-location.patch 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 deleted file mode 100644 index fb11fae014..0000000000 --- a/meta/recipes-graphics/shaderc/files/0002-libshaderc_util-fix-glslang-header-file-location.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8f2350e4172758bf6ef3464c998352864b90988f Mon Sep 17 00:00:00 2001 -From: Jose Quaresma <[email protected]> -Date: Sat, 13 Feb 2021 00:45:56 +0000 -Subject: [PATCH] libshaderc_util: fix glslang header file location - -Upstream-Status: Pending - -Signed-off-by: Jose Quaresma <[email protected]> ---- - libshaderc_util/src/compiler.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc -index 41bdba7..db7f329 100644 ---- a/libshaderc_util/src/compiler.cc -+++ b/libshaderc_util/src/compiler.cc -@@ -20,7 +20,7 @@ - #include <thread> - #include <tuple> - --#include "SPIRV/GlslangToSpv.h" -+#include "glslang/SPIRV/GlslangToSpv.h" - #include "libshaderc_util/format.h" - #include "libshaderc_util/io_shaderc.h" - #include "libshaderc_util/message.h" diff --git a/meta/recipes-graphics/shaderc/shaderc_2026.3.bb b/meta/recipes-graphics/shaderc/shaderc_2026.3.bb index 063bafaa04..d2a62a4cd4 100644 --- a/meta/recipes-graphics/shaderc/shaderc_2026.3.bb +++ b/meta/recipes-graphics/shaderc/shaderc_2026.3.bb @@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRCREV = "82757e4f72af8518fb679604d352623450cb761f" SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main;tag=v${PV} \ file://0001-cmake-disable-building-external-dependencies.patch \ - file://0002-libshaderc_util-fix-glslang-header-file-location.patch \ " UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>\d+(\.\d+)+)$" @@ -25,4 +24,6 @@ EXTRA_OECMAKE = " \ -DSHADERC_SKIP_COPYRIGHT_CHECK=ON \ " +CXXFLAGS += "-I${STAGING_INCDIR}/glslang" + BBCLASSEXTEND = "native nativesdk" -- 2.55.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#241170): https://lists.openembedded.org/g/openembedded-core/message/241170 Mute This Topic: https://lists.openembedded.org/mt/120313790/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
