From 73e83acb24c0e041bf94dae309b13fec7626fed4 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Sun, 24 Jan 2021 18:07:58 +0000 Subject: 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 Signed-off-by: Richard Purdie --- ...-the-link-order-of-libglslang-and-libHLSL.patch | 49 ---------------------- ...de-vendor-libs-and-disable-git-versioning.patch | 48 +++++++++++++++++++++ ...de-vendor-libs-and-disable-git-versioning.patch | 48 --------------------- meta/recipes-graphics/shaderc/shaderc_2020.4.bb | 10 +++-- 4 files changed, 55 insertions(+), 100 deletions(-) delete mode 100644 meta/recipes-graphics/shaderc/files/0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch create mode 100644 meta/recipes-graphics/shaderc/files/0001-cmake-de-vendor-libs-and-disable-git-versioning.patch delete mode 100644 meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch (limited to 'meta/recipes-graphics') 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 @@ -From 0b9468d4face34879214f500b15e810cdd1a81a1 Mon Sep 17 00:00:00 2001 -From: Niklas Haas -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 - ---- - 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 - $<$: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 diff --git a/meta/recipes-graphics/shaderc/files/0001-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 new file mode 100644 index 0000000000..40cc84df26 --- /dev/null +++ b/meta/recipes-graphics/shaderc/files/0001-cmake-de-vendor-libs-and-disable-git-versioning.patch @@ -0,0 +1,48 @@ +From a07ac322a5a5fd4f0339913eb4456321ad1a69fd Mon Sep 17 00:00:00 2001 +From: Jose Quaresma +Date: Sat, 17 Oct 2020 12:51:50 +0100 +Subject: [PATCH] cmake: de-vendor libs and disable git versioning + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Jose Quaresma + +--- + CMakeLists.txt | 2 -- + glslc/CMakeLists.txt | 1 - + glslc/src/build-version.inc | 0 + 3 files changed, 3 deletions(-) + create mode 100644 glslc/src/build-version.inc + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5c74cd8..9451fbc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -102,12 +102,10 @@ endif(MSVC) + + # Configure subdirectories. + # We depend on these for later projects, so they should come first. +-add_subdirectory(third_party) + + add_subdirectory(libshaderc_util) + add_subdirectory(libshaderc) + add_subdirectory(glslc) +-add_subdirectory(examples) + + add_custom_target(build-version + ${PYTHON_EXECUTABLE} +diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt +index 31664d1..358d91b 100644 +--- a/glslc/CMakeLists.txt ++++ b/glslc/CMakeLists.txt +@@ -53,7 +53,6 @@ shaderc_default_compile_options(glslc_exe) + target_include_directories(glslc_exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/.. ${spirv-tools_SOURCE_DIR}/include) + set_target_properties(glslc_exe PROPERTIES OUTPUT_NAME glslc) + target_link_libraries(glslc_exe PRIVATE glslc shaderc_util shaderc) +-add_dependencies(glslc_exe build-version) + + shaderc_add_tests( + TEST_PREFIX glslc +diff --git a/glslc/src/build-version.inc b/glslc/src/build-version.inc +new file mode 100644 +index 0000000..e69de29 diff --git a/meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch b/meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch deleted file mode 100644 index e4e3f0be1e..0000000000 --- a/meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 180250f098e0ab899eff0db3708d9693f3486ff4 Mon Sep 17 00:00:00 2001 -From: Jose Quaresma -Date: Sat, 17 Oct 2020 12:51:50 +0100 -Subject: [PATCH] cmake: de-vendor libs and disable git versioning - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Jose Quaresma - ---- - CMakeLists.txt | 2 -- - glslc/CMakeLists.txt | 1 - - glslc/src/build-version.inc | 0 - 3 files changed, 3 deletions(-) - create mode 100644 glslc/src/build-version.inc - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5c74cd8..9451fbc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -102,12 +102,10 @@ endif(MSVC) - - # Configure subdirectories. - # We depend on these for later projects, so they should come first. --add_subdirectory(third_party) - - add_subdirectory(libshaderc_util) - add_subdirectory(libshaderc) - add_subdirectory(glslc) --add_subdirectory(examples) - - add_custom_target(build-version - ${PYTHON_EXECUTABLE} -diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt -index 35b3f19..52006b8 100644 ---- a/glslc/CMakeLists.txt -+++ b/glslc/CMakeLists.txt -@@ -53,7 +53,6 @@ shaderc_default_compile_options(glslc_exe) - target_include_directories(glslc_exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/.. ${spirv-tools_SOURCE_DIR}/include) - set_target_properties(glslc_exe PROPERTIES OUTPUT_NAME glslc) - target_link_libraries(glslc_exe PRIVATE glslc shaderc_util shaderc) --add_dependencies(glslc_exe build-version) - - shaderc_add_tests( - TEST_PREFIX glslc -diff --git a/glslc/src/build-version.inc b/glslc/src/build-version.inc -new file mode 100644 -index 0000000..e69de29 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" 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\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" -- cgit v1.2.3-54-g00ecf