shaderc: add CPPFLAG to fix header location and drop the patch

Fix glslang header file location in libshaderc_util with
CXXFLAGS and drop the pending pacth.

Signed-off-by: Jose Quaresma <jose.quaresma@oss.qualcomm.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

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 (file)
index fb11fae..0000000
--- 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 <quaresma.jose@gmail.com>
-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 <quaresma.jose@gmail.com>
----
- 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 063bafaa0422b93fe151fa56d5d84a28b821daf2..d2a62a4cd45c11adc70d5feae4e479ff64644be8 100644 (file)
--- 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"