summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose Quaresma <quaresma.jose@gmail.com>2021-01-24 18:07:58 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-01-29 15:59:40 +0000
commit73e83acb24c0e041bf94dae309b13fec7626fed4 (patch)
tree333741d986d796bff5d66f4acc5a4a1f9ff51b5f
parente4d03c40f6843b05d7f9259c73a4334fee52e1a8 (diff)
downloadpoky-73e83acb24c0e041bf94dae309b13fec7626fed4.tar.gz
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>
-rw-r--r--meta/recipes-graphics/shaderc/files/0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch49
-rw-r--r--meta/recipes-graphics/shaderc/files/0001-cmake-de-vendor-libs-and-disable-git-versioning.patch (renamed from meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch)4
-rw-r--r--meta/recipes-graphics/shaderc/shaderc_2020.4.bb10
3 files changed, 9 insertions, 54 deletions
diff --git a/meta/recipes-graphics/shaderc/files/0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch b/meta/recipes-graphics/shaderc/files/0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch
deleted file mode 100644
index 7102e25bcf..0000000000
--- a/meta/recipes-graphics/shaderc/files/0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1From 0b9468d4face34879214f500b15e810cdd1a81a1 Mon Sep 17 00:00:00 2001
2From: Niklas Haas <git@haasn.xyz>
3Date: Tue, 29 May 2018 07:34:00 +0200
4Subject: [PATCH] Fix the link order of libglslang and libHLSL
5
6libglslang depends on libHLSL, so the latter needs to be specified last.
7This fixes an issue when trying to build shaderc against system-wide
8versions of libglslang/libHLSL, rather than the in-tree versions from
9third_party.
10
11Additionally, libshaderc_util also depends on SPIRV-Tools
12
13Upstream-Status: Backport [21c8be385b3fab5edcb934a6d99f69fd389c4e67]
14
15Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
16
17---
18 glslc/CMakeLists.txt | 2 +-
19 libshaderc_util/CMakeLists.txt | 4 ++--
20 2 files changed, 3 insertions(+), 3 deletions(-)
21
22diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt
23index 31664d1..35b3f19 100644
24--- a/glslc/CMakeLists.txt
25+++ b/glslc/CMakeLists.txt
26@@ -43,7 +43,7 @@ if (SHADERC_ENABLE_WGSL_OUTPUT)
27 endif(SHADERC_ENABLE_WGSL_OUTPUT)
28
29 target_link_libraries(glslc PRIVATE
30- glslang OSDependent OGLCompiler HLSL glslang SPIRV # Glslang libraries
31+ glslang OSDependent OGLCompiler glslang SPIRV HLSL # Glslang libraries
32 $<$<BOOL:${SHADERC_ENABLE_WGSL_OUTPUT}>:libtint> # Tint libraries, optional
33 shaderc_util shaderc # internal Shaderc libraries
34 ${CMAKE_THREAD_LIBS_INIT})
35diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt
36index 48f9991..984cc06 100644
37--- a/libshaderc_util/CMakeLists.txt
38+++ b/libshaderc_util/CMakeLists.txt
39@@ -46,8 +46,8 @@ add_definitions(-DENABLE_HLSL)
40
41 find_package(Threads)
42 target_link_libraries(shaderc_util PRIVATE
43- glslang OSDependent OGLCompiler HLSL glslang SPIRV
44- SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})
45+ glslang OSDependent OGLCompiler glslang HLSL SPIRV
46+ SPIRV-Tools-opt SPIRV-Tools ${CMAKE_THREAD_LIBS_INIT})
47
48 shaderc_add_tests(
49 TEST_PREFIX shaderc_util
diff --git a/meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch b/meta/recipes-graphics/shaderc/files/0001-cmake-de-vendor-libs-and-disable-git-versioning.patch
index e4e3f0be1e..40cc84df26 100644
--- a/meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch
+++ b/meta/recipes-graphics/shaderc/files/0001-cmake-de-vendor-libs-and-disable-git-versioning.patch
@@ -1,4 +1,4 @@
1From 180250f098e0ab899eff0db3708d9693f3486ff4 Mon Sep 17 00:00:00 2001 1From a07ac322a5a5fd4f0339913eb4456321ad1a69fd Mon Sep 17 00:00:00 2001
2From: Jose Quaresma <quaresma.jose@gmail.com> 2From: Jose Quaresma <quaresma.jose@gmail.com>
3Date: Sat, 17 Oct 2020 12:51:50 +0100 3Date: Sat, 17 Oct 2020 12:51:50 +0100
4Subject: [PATCH] cmake: de-vendor libs and disable git versioning 4Subject: [PATCH] cmake: de-vendor libs and disable git versioning
@@ -32,7 +32,7 @@ index 5c74cd8..9451fbc 100644
32 add_custom_target(build-version 32 add_custom_target(build-version
33 ${PYTHON_EXECUTABLE} 33 ${PYTHON_EXECUTABLE}
34diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt 34diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt
35index 35b3f19..52006b8 100644 35index 31664d1..358d91b 100644
36--- a/glslc/CMakeLists.txt 36--- a/glslc/CMakeLists.txt
37+++ b/glslc/CMakeLists.txt 37+++ b/glslc/CMakeLists.txt
38@@ -53,7 +53,6 @@ shaderc_default_compile_options(glslc_exe) 38@@ -53,7 +53,6 @@ shaderc_default_compile_options(glslc_exe)
diff --git a/meta/recipes-graphics/shaderc/shaderc_2020.4.bb b/meta/recipes-graphics/shaderc/shaderc_2020.4.bb
index e886e81d0e..18a08ee6c5 100644
--- a/meta/recipes-graphics/shaderc/shaderc_2020.4.bb
+++ b/meta/recipes-graphics/shaderc/shaderc_2020.4.bb
@@ -8,16 +8,20 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
8 8
9SRCREV = "0dbd899941a43ffd55df527d65128b3b66e75c9c" 9SRCREV = "0dbd899941a43ffd55df527d65128b3b66e75c9c"
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-Fix-the-link-order-of-libglslang-and-libHLSL.patch \ 11 file://0001-cmake-de-vendor-libs-and-disable-git-versioning.patch \
12 file://0003-cmake-de-vendor-libs-and-disable-git-versioning.patch \
13 " 12 "
13UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$"
14S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
15 15
16inherit cmake python3native 16inherit cmake python3native
17 17
18DEPENDS = "spirv-tools glslang" 18DEPENDS = "spirv-tools glslang"
19 19
20EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DSHADERC_SKIP_TESTS=ON" 20EXTRA_OECMAKE = " \
21 -DCMAKE_BUILD_TYPE=Release \
22 -DSHADERC_SKIP_TESTS=ON \
23 -Dglslang_SOURCE_DIR=${STAGING_INCDIR}/glslang \
24"
21 25
22BBCLASSEXTEND = "native nativesdk" 26BBCLASSEXTEND = "native nativesdk"
23 27