mirror of
https://git.yoctoproject.org/poky
synced 2026-04-19 15:32:13 +02:00
shaderc: fix the build with glslang 11.1.0
Drop patches:
* 0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch
is rejected upstream and is not need when glslang as shared libs.
Update pacthes:
* 0001-cmake-de-vendor-libs-and-disable-git-versioning.patch
renamed and refreshed from 0003-cmake-de-vendor-libs-and-disable-git-versioning.patch.
(From OE-Core rev: 496c69d56806a2521bfc51b4de9575637db2ac02)
Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
e4d03c40f6
commit
73e83acb24
@@ -1,49 +0,0 @@
|
||||
From 0b9468d4face34879214f500b15e810cdd1a81a1 Mon Sep 17 00:00:00 2001
|
||||
From: Niklas Haas <git@haasn.xyz>
|
||||
Date: Tue, 29 May 2018 07:34:00 +0200
|
||||
Subject: [PATCH] Fix the link order of libglslang and libHLSL
|
||||
|
||||
libglslang depends on libHLSL, so the latter needs to be specified last.
|
||||
This fixes an issue when trying to build shaderc against system-wide
|
||||
versions of libglslang/libHLSL, rather than the in-tree versions from
|
||||
third_party.
|
||||
|
||||
Additionally, libshaderc_util also depends on SPIRV-Tools
|
||||
|
||||
Upstream-Status: Backport [21c8be385b3fab5edcb934a6d99f69fd389c4e67]
|
||||
|
||||
Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
|
||||
|
||||
---
|
||||
glslc/CMakeLists.txt | 2 +-
|
||||
libshaderc_util/CMakeLists.txt | 4 ++--
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt
|
||||
index 31664d1..35b3f19 100644
|
||||
--- a/glslc/CMakeLists.txt
|
||||
+++ b/glslc/CMakeLists.txt
|
||||
@@ -43,7 +43,7 @@ if (SHADERC_ENABLE_WGSL_OUTPUT)
|
||||
endif(SHADERC_ENABLE_WGSL_OUTPUT)
|
||||
|
||||
target_link_libraries(glslc PRIVATE
|
||||
- glslang OSDependent OGLCompiler HLSL glslang SPIRV # Glslang libraries
|
||||
+ glslang OSDependent OGLCompiler glslang SPIRV HLSL # Glslang libraries
|
||||
$<$<BOOL:${SHADERC_ENABLE_WGSL_OUTPUT}>:libtint> # Tint libraries, optional
|
||||
shaderc_util shaderc # internal Shaderc libraries
|
||||
${CMAKE_THREAD_LIBS_INIT})
|
||||
diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt
|
||||
index 48f9991..984cc06 100644
|
||||
--- a/libshaderc_util/CMakeLists.txt
|
||||
+++ b/libshaderc_util/CMakeLists.txt
|
||||
@@ -46,8 +46,8 @@ add_definitions(-DENABLE_HLSL)
|
||||
|
||||
find_package(Threads)
|
||||
target_link_libraries(shaderc_util PRIVATE
|
||||
- glslang OSDependent OGLCompiler HLSL glslang SPIRV
|
||||
- SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})
|
||||
+ glslang OSDependent OGLCompiler glslang HLSL SPIRV
|
||||
+ SPIRV-Tools-opt SPIRV-Tools ${CMAKE_THREAD_LIBS_INIT})
|
||||
|
||||
shaderc_add_tests(
|
||||
TEST_PREFIX shaderc_util
|
||||
@@ -1,4 +1,4 @@
|
||||
From 180250f098e0ab899eff0db3708d9693f3486ff4 Mon Sep 17 00:00:00 2001
|
||||
From a07ac322a5a5fd4f0339913eb4456321ad1a69fd Mon Sep 17 00:00:00 2001
|
||||
From: Jose Quaresma <quaresma.jose@gmail.com>
|
||||
Date: Sat, 17 Oct 2020 12:51:50 +0100
|
||||
Subject: [PATCH] cmake: de-vendor libs and disable git versioning
|
||||
@@ -32,7 +32,7 @@ index 5c74cd8..9451fbc 100644
|
||||
add_custom_target(build-version
|
||||
${PYTHON_EXECUTABLE}
|
||||
diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt
|
||||
index 35b3f19..52006b8 100644
|
||||
index 31664d1..358d91b 100644
|
||||
--- a/glslc/CMakeLists.txt
|
||||
+++ b/glslc/CMakeLists.txt
|
||||
@@ -53,7 +53,6 @@ shaderc_default_compile_options(glslc_exe)
|
||||
@@ -8,16 +8,20 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
|
||||
|
||||
SRCREV = "0dbd899941a43ffd55df527d65128b3b66e75c9c"
|
||||
SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main \
|
||||
file://0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch \
|
||||
file://0003-cmake-de-vendor-libs-and-disable-git-versioning.patch \
|
||||
file://0001-cmake-de-vendor-libs-and-disable-git-versioning.patch \
|
||||
"
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit cmake python3native
|
||||
|
||||
DEPENDS = "spirv-tools glslang"
|
||||
|
||||
EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DSHADERC_SKIP_TESTS=ON"
|
||||
EXTRA_OECMAKE = " \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DSHADERC_SKIP_TESTS=ON \
|
||||
-Dglslang_SOURCE_DIR=${STAGING_INCDIR}/glslang \
|
||||
"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user