spirv-tools: import from meta-oe to OE core
PATCH v3 1/5 spirv-tools: import from meta-oe to OE core
This receipe is needed to build the new shaderc
--- ...0001-Avoid-pessimizing-std-move-3124.patch | 50 +++++++++++++++++++ ...STALL_LIBDIR-in-installed-CMake-file.patch | 35 +++++++++++++ meta/recipes-graphics/spir/spirv-tools_git.bb | 35 +++++++++++++ 3 files changed, 120 insertions(+) create mode 100644 meta/recipes-graphics/spir/files/0001-Avoid-pessimizing-std-move-3124.patch create mode 100644 meta/recipes-graphics/spir/files/0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch create mode 100644 meta/recipes-graphics/spir/spirv-tools_git.bb
meta/recipes-graphics/spir/files/0001-Avoid-pessimizing-std-move-3124.patch new file +50 -0
@@ -0,0 +1,50 @@ +From 4fffcd275b50d08b54b0411679ead98970651bad Mon Sep 17 00:00:00 2001 +From: David Neto <[email protected]> +Date: Fri, 27 Dec 2019 12:05:58 -0500 +Subject: [PATCH] Avoid pessimizing std::move (#3124) + +Should fix a warning + +Upstream-Status: Backport [https://github.com/KhronosGroup/SPIRV-Tools/commit/8aa423930db37e37086665efcc55944d577c06e5] +Signed-off-by: Khem Raj <[email protected]> +--- + test/opt/pass_fixture.h | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +diff --git a/test/opt/pass_fixture.h b/test/opt/pass_fixture.h +index 53fb206f..64c089d8 100644 +--- a/test/opt/pass_fixture.h ++++ b/test/opt/pass_fixture.h +@@ -60,8 +60,7 @@ class PassTest : public TestT { + // from pass Process() function. + std::tuple<std::vector<uint32_t>, Pass::Status> OptimizeToBinary( + Pass* pass, const std::string& original, bool skip_nop) { +- context_ = +- std::move(BuildModule(env_, consumer_, original, assemble_options_)); ++ context_ = BuildModule(env_, consumer_, original, assemble_options_); + EXPECT_NE(nullptr, context()) << "Assembling failed for shader:\n" + << original << std::endl; + if (!context()) { +@@ -197,8 +196,7 @@ class PassTest : public TestT { + // messages. + template <typename PassT, typename... Args> + void SinglePassRunAndFail(const std::string& original, Args&&... args) { +- context_ = +- std::move(BuildModule(env_, consumer_, original, assemble_options_)); ++ context_ = BuildModule(env_, consumer_, original, assemble_options_); + EXPECT_NE(nullptr, context()) << "Assembling failed for shader:\n" + << original << std::endl; + std::ostringstream errs; +@@ -235,8 +233,7 @@ class PassTest : public TestT { + void RunAndCheck(const std::string& original, const std::string& expected) { + assert(manager_->NumPasses()); + +- context_ = +- std::move(BuildModule(env_, nullptr, original, assemble_options_)); ++ context_ = BuildModule(env_, nullptr, original, assemble_options_); + ASSERT_NE(nullptr, context()); + + context()->set_preserve_bindings(OptimizerOptions()->preserve_bindings_); +-- +2.24.1 +
meta/recipes-graphics/spir/files/0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch new file +35 -0
@@ -0,0 +1,35 @@ +From caf59c46ea5dc49e4dbf756c642b03e52c1b5468 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Fri, 20 Dec 2019 07:02:24 -0800 +Subject: [PATCH] Respect CMAKE_INSTALL_LIBDIR in installed CMake files + +Upstream-Status: Submitted [https://github.com/google/effcee/pull/36] +Signed-off-by: Khem Raj <[email protected]> +--- + CMakeLists.txt | 1 + + effcee/CMakeLists.txt | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +--- a/external/effcee/CMakeLists.txt ++++ b/external/effcee/CMakeLists.txt +@@ -27,6 +27,7 @@ endif() + + include(cmake/setup_build.cmake) + include(cmake/utils.cmake) ++include(GNUInstallDirs) + + add_subdirectory(third_party) + add_subdirectory(effcee) +--- a/external/effcee/effcee/CMakeLists.txt ++++ b/external/effcee/effcee/CMakeLists.txt +@@ -14,8 +14,8 @@ install( + DESTINATION + include/effcee) + install(TARGETS effcee +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + if(EFFCEE_BUILD_TESTING) + add_executable(effcee-test
meta/recipes-graphics/spir/spirv-tools_git.bb new file +35 -0
@@ -0,0 +1,35 @@ +SUMMARY = "The SPIR-V Tools project provides an API and commands for \ +processing SPIR-V modules" +DESCRIPTION = "The project includes an assembler, binary module parser, \ +disassembler, validator, and optimizer for SPIR-V." +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" +SECTION = "graphics" + +S = "${WORKDIR}/git" +DEST_DIR = "${S}/external" +SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;name=spirv-tools \ + git://github.com/KhronosGroup/SPIRV-Headers.git;name=spirv-headers;destsuffix=${DEST_DIR}/spirv-headers \ + git://github.com/google/effcee.git;name=effcee;destsuffix=${DEST_DIR}/effcee \ + git://github.com/google/re2.git;name=re2;destsuffix=${DEST_DIR}/re2 \ + git://github.com/google/googletest.git;name=googletest;destsuffix=${DEST_DIR}/googletest \ + file://0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch \ + file://0001-Avoid-pessimizing-std-move-3124.patch \ +" +SRCREV_spirv-tools = "c413b982c316b14e784f50d941814fc737b55b4a" +SRCREV_spirv-headers = "af64a9e826bf5bb5fcd2434dd71be1e41e922563" +SRCREV_effcee = "cd25ec17e9382f99a895b9ef53ff3c277464d07d" +SRCREV_re2 = "5bd613749fd530b576b890283bfb6bc6ea6246cb" +SRCREV_googletest = "f2fb48c3b3d79a75a88a99fba6576b25d42ec528" + +inherit cmake python3native + +EXTRA_OECMAKE += "-DSPIRV_WERROR=OFF" + +do_install_append() { + install -d ${D}/${includedir}/spirv + install -m 0644 ${DEST_DIR}/spirv-headers/include/spirv/1.2/* ${D}/${includedir}/spirv +} + +FILES_SOLIBSDEV = "" +FILES_${PN} += "${libdir}/*.so"
Signature · 1 line
2.28.0
PATCH v3 2/5 spirv-tools: enable native build and install more header files
--- meta/recipes-graphics/spir/spirv-tools_git.bb | 4 ++++ 1 file changed, 4 insertions(+)
meta/recipes-graphics/spir/spirv-tools_git.bb +4 -0
@@ -29,7 +29,11 @@ EXTRA_OECMAKE += "-DSPIRV_WERROR=OFF" do_install_append() { install -d ${D}/${includedir}/spirv install -m 0644 ${DEST_DIR}/spirv-headers/include/spirv/1.2/* ${D}/${includedir}/spirv + install -d ${D}/${includedir}/spirv/unified1 + install -m 0644 ${DEST_DIR}/spirv-headers/include/spirv/unified1/* ${D}/${includedir}/spirv/unified1 } FILES_SOLIBSDEV = "" FILES_${PN} += "${libdir}/*.so" + +BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.28.0
PATCH v3 3/5 glslang: add receipe
In reply to Jose QuaresmaGlslang is the official reference compiler front end for the
OpenGL ES and OpenGL shading languages. It implements a strict interpretation of the specifications for these languages. It is open and free for anyone to use, either from a command line or programmatically.
This receipe is needed to build the new shaderc
--- .../glslang/glslang_8.13.3559.bb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 meta/recipes-graphics/glslang/glslang_8.13.3559.bb
meta/recipes-graphics/glslang/glslang_8.13.3559.bb new file +17 -0
@@ -0,0 +1,17 @@ +SUMMARY = "OpenGL / OpenGL ES Reference Compiler" +DESCRIPTION = "Glslang is the official reference compiler front end for the \ +OpenGL ES and OpenGL shading languages. It implements a strict interpretation \ +of the specifications for these languages. It is open and free for anyone to use, \ +either from a command line or programmatically." +SECTION = "graphics" +HOMEPAGE = "https://www.khronos.org/opengles/sdk/tools/Reference-Compiler" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=918e668376010a04448a312fb37ae69b" + +SRCREV = "8db9eccc0baf30c9d22c496ab28db0fe1e4e97c5" +SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https" +S = "${WORKDIR}/git" + +inherit cmake python3native + +BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.28.0
PATCH v3 4/5 shaderc: add receipe
In reply to Jose QuaresmaA collection of tools, libraries and tests for shader compilation
This receipe is needed to build the gstreamer vulkan plugin as it provides the binary glslc.
It is based on arch linux shaderc packge including the patches
https://github.com/archlinux/svntogit-packages/blob/91f0fa6ee3a220264a448527c1a8cf037caaad8e/trunk/PKGBUILD
* 0001-fix-glslang-link-order.patch
Upstream-Status: Backport [21c8be385b3fab5edcb934a6d99f69fd389c4e67]
* 0002-shaderc-2019.0-fix-build-against-new-glslang.patch
Upstream-Status: Pending
* 0003-cmake-de-vendor-libs-and-disable-git-versioning.patch
Upstream-Status: Inappropriate [configuration]
--- ...link-order-of-libglslang-and-libHLSL.patch | 51 +++++++++++++ ...2019.0-fix-build-against-new-glslang.patch | 73 +++++++++++++++++++ ...ndor-libs-and-disable-git-versioning.patch | 53 ++++++++++++++ .../shaderc/shaderc_2019.0.bb | 34 +++++++++ 4 files changed, 211 insertions(+) create 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/0002-shaderc-2019.0-fix-build-against-new-glslang.patch create mode 100644 meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch create mode 100644 meta/recipes-graphics/shaderc/shaderc_2019.0.bb
meta/recipes-graphics/shaderc/files/0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch new file +51 -0
@@ -0,0 +1,51 @@ +From 53f1f5c714df1f0a2eb57c1ce00bc66fc9a1690e Mon Sep 17 00:00:00 2001 +From: Niklas Haas <[email protected]> +Date: Tue, 29 May 2018 07:34:00 +0200 +Subject: [PATCH 1/3] 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 <[email protected]> +--- + 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 acf6fb0..0f5d888 100644 +--- a/glslc/CMakeLists.txt ++++ b/glslc/CMakeLists.txt +@@ -18,7 +18,7 @@ add_library(glslc STATIC + shaderc_default_compile_options(glslc) + target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR}) + target_link_libraries(glslc PRIVATE glslang OSDependent OGLCompiler +- HLSL glslang SPIRV ${CMAKE_THREAD_LIBS_INIT}) ++ glslang SPIRV HLSL ${CMAKE_THREAD_LIBS_INIT}) + target_link_libraries(glslc PRIVATE shaderc_util shaderc) + + add_executable(glslc_exe src/main.cc) +diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt +index ec0e8fb..ded089d 100644 +--- a/libshaderc_util/CMakeLists.txt ++++ b/libshaderc_util/CMakeLists.txt +@@ -28,8 +28,8 @@ target_include_directories(shaderc_util + + 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 +-- +2.28.0 +
meta/recipes-graphics/shaderc/files/0002-shaderc-2019.0-fix-build-against-new-glslang.patch new file +73 -0
73 lines not on this page · raw message
meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch new file +53 -0
53 lines not on this page · raw message
meta/recipes-graphics/shaderc/shaderc_2019.0.bb new file +34 -0
@@ -0,0 +1,34 @@ +SUMMARY = "A collection of tools, libraries and tests for shader compilation" +DESCRIPTION = "The Shaderc library provides an API for compiling GLSL/HLSL \ +source code to SPIRV modules. It has been shipping in the Android NDK since version r12b." +SECTION = "graphics" +HOMEPAGE = "https://github.com/google/shaderc" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +SRCREV = "34c412f21f945f4ef6ed4453f8b5dc4bb9d739e4" +SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main \ + file://0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch \ + file://0002-shaderc-2019.0-fix-build-against-new-glslang.patch \ + file://0003-cmake-de-vendor-libs-and-disable-git-versioning.patch \ + " +S = "${WORKDIR}/git" + +inherit cmake python3native + +DEPENDS = "spirv-tools glslang" + +EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Releas -DSHADERC_SKIP_TESTS=ON" + +do_configure_prepend() { + # TODO: probably there is better solution for this. + # I dont know any method for get the version of a receipe in DEPENDS + # so do this ugly hack + cat <<- EOF > ${S}/glslc/src/build-version.inc +"${PV}\\n" +"$(pkg-config --modversion SPIRV-Tools)\\n" +"$(glslangValidator --version | head -1 | cut -d' ' -f3)\\n" +EOF +} + +BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.28.0
PATCH v3 5/5 spirv-tools: fix identation
In reply to Jose Quaresmareplace tabs with spaces and remove extra spaces
--- meta/recipes-graphics/spir/spirv-tools_git.bb | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
meta/recipes-graphics/spir/spirv-tools_git.bb +10 -10
@@ -9,12 +9,12 @@ SECTION = "graphics" S = "${WORKDIR}/git" DEST_DIR = "${S}/external" SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;name=spirv-tools \ - git://github.com/KhronosGroup/SPIRV-Headers.git;name=spirv-headers;destsuffix=${DEST_DIR}/spirv-headers \ - git://github.com/google/effcee.git;name=effcee;destsuffix=${DEST_DIR}/effcee \ - git://github.com/google/re2.git;name=re2;destsuffix=${DEST_DIR}/re2 \ - git://github.com/google/googletest.git;name=googletest;destsuffix=${DEST_DIR}/googletest \ - file://0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch \ - file://0001-Avoid-pessimizing-std-move-3124.patch \ + git://github.com/KhronosGroup/SPIRV-Headers.git;name=spirv-headers;destsuffix=${DEST_DIR}/spirv-headers \ + git://github.com/google/effcee.git;name=effcee;destsuffix=${DEST_DIR}/effcee \ + git://github.com/google/re2.git;name=re2;destsuffix=${DEST_DIR}/re2 \ + git://github.com/google/googletest.git;name=googletest;destsuffix=${DEST_DIR}/googletest \ + file://0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch;destsuffix=${DEST_DIR}/effcee \ + file://0001-Avoid-pessimizing-std-move-3124.patch \ " SRCREV_spirv-tools = "c413b982c316b14e784f50d941814fc737b55b4a" SRCREV_spirv-headers = "af64a9e826bf5bb5fcd2434dd71be1e41e922563"
@@ -27,10 +27,10 @@ inherit cmake python3native EXTRA_OECMAKE += "-DSPIRV_WERROR=OFF" do_install_append() { - install -d ${D}/${includedir}/spirv - install -m 0644 ${DEST_DIR}/spirv-headers/include/spirv/1.2/* ${D}/${includedir}/spirv - install -d ${D}/${includedir}/spirv/unified1 - install -m 0644 ${DEST_DIR}/spirv-headers/include/spirv/unified1/* ${D}/${includedir}/spirv/unified1 + install -d ${D}/${includedir}/spirv + install -m 0644 ${DEST_DIR}/spirv-headers/include/spirv/1.2/* ${D}/${includedir}/spirv + install -d ${D}/${includedir}/spirv/unified1 + install -m 0644 ${DEST_DIR}/spirv-headers/include/spirv/unified1/* ${D}/${includedir}/spirv/unified1 } FILES_SOLIBSDEV = ""
Signature · 1 line
2.28.0
Re: [OE-core] [PATCH v3 5/5] spirv-tools: fix identation
Quoted 40 lines
-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Jose Quaresma
Sent: den 17 oktober 2020 16:30
To: [email protected]
Cc: Jose Quaresma <[email protected]>
Subject: [OE-core] [PATCH v3 5/5] spirv-tools: fix identationreplace tabs with spaces and remove extra spaces
Signed-off-by Jose Quaresma <[email protected]>--- meta/recipes-graphics/spir/spirv-tools_git.bb | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)meta/recipes-graphics/spir/spirv-tools_git.bb +6
-6@@ -9,12 +9,12 @@ SECTION = "graphics" S = "${WORKDIR}/git" DEST_DIR = "${S}/external" SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;name=spirv-tools \ - git://github.com/KhronosGroup/SPIRV-Headers.git;name=spirv-headers;destsuffix=${DEST_DIR}/spirv-headers \ - git://github.com/google/effcee.git;name=effcee;destsuffix=${DEST_DIR}/effcee \ - git://github.com/google/re2.git;name=re2;destsuffix=${DEST_DIR}/re2 \ - git://github.com/google/googletest.git;name=googletest;destsuffix=${DEST_DIR}/googletest \ - file://0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch \ - file://0001-Avoid-pessimizing-std-move-3124.patch \ + git://github.com/KhronosGroup/SPIRV-Headers.git;name=spirv-headers;destsuffix=${DEST_DIR}/spirv-headers \ + git://github.com/google/effcee.git;name=effcee;destsuffix=${DEST_DIR}/effcee \ + git://github.com/google/re2.git;name=re2;destsuffix=${DEST_DIR}/re2 \ + git://github.com/google/googletest.git;name=googletest;destsuffix=${DEST_DIR}/googletest \ + file://0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch;destsuffix=${DEST_DIR}/effcee \ + file://0001-Avoid-pessimizing-std-move-3124.patch \ " SRCREV_spirv-tools = "c413b982c316b14e784f50d941814fc737b55b4a" SRCREV_spirv-headers = "af64a9e826bf5bb5fcd2434dd71be1e41e922563"@@ -27,10 +27,10 @@ inherit cmake python3native EXTRA_OECMAKE += "-DSPIRV_WERROR=OFF"
meta/recipes-graphics/spir/spirv-tools_git.bb inherit cmake python3native · line 33
Quoted 10 lines
meta/recipes-graphics/spir/spirv-tools_git.bb +4
-4do_install_append() { - install -d ${D}/${includedir}/spirv - install -m 0644 ${DEST_DIR}/spirv-headers/include/spirv/1.2/* ${D}/${includedir}/spirv - install -d ${D}/${includedir}/spirv/unified1 - install -m 0644 ${DEST_DIR}/spirv-headers/include/spirv/unified1/* ${D}/${includedir}/spirv/unified1 + install -d ${D}/${includedir}/spirv + install -m 0644 ${DEST_DIR}/spirv-headers/include/spirv/1.2/* ${D}/${includedir}/spirv + install -d ${D}/${includedir}/spirv/unified1 + install -m 0644 ${DEST_DIR}/spirv-headers/include/spirv/unified1/* ${D}/${includedir}/spirv/unified1
Shell code in OE-Core is actually expected to be indented using tabs, so this part should be reverted. However, while you are here, you should change "${D}/${includedir}" to "${D}${includedir}".
Quoted 5 lines
meta/recipes-graphics/spir/spirv-tools_git.bb +0
-1} FILES_SOLIBSDEV = "" --2.28.0
//Peter
Re: [OE-core] [PATCH v3 5/5] spirv-tools: fix identation
This patch it's only a little fix in the identencion and it can be dropped from the series.
This is not really necessary for now and I don't need a new revision only to fix this patch.
Peter Kjellerstedt <[email protected]> escreveu no dia segunda, 19/10/2020 à(s) 09:29:
Quoted 64 lines
Quoted 41 lines
-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Jose Quaresma
Sent: den 17 oktober 2020 16:30
To: [email protected]
Cc: Jose Quaresma <[email protected]>
Subject: [OE-core] [PATCH v3 5/5] spirv-tools: fix identationreplace tabs with spaces and remove extra spaces
Signed-off-by Jose Quaresma <[email protected]>--- meta/recipes-graphics/spir/spirv-tools_git.bb | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)meta/recipes-graphics/spir/spirv-tools_git.bb +6
-6@@ -9,12 +9,12 @@ SECTION = "graphics" S = "${WORKDIR}/git" DEST_DIR = "${S}/external" SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;name=spirv-tools \ - git://github.com/KhronosGroup/SPIRV-Headers.git;name=spirv-headers;destsuffix=${DEST_DIR}/spirv-headers \ - git://github.com/google/effcee.git;name=effcee;destsuffix=${DEST_DIR}/effcee \ - git://github.com/google/re2.git;name=re2;destsuffix=${DEST_DIR}/re2 \ - git://github.com/google/googletest.git;name=googletest;destsuffix=${DEST_DIR}/googletest \ - file://0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch \ - file://0001-Avoid-pessimizing-std-move-3124.patch \ + git://github.com/KhronosGroup/SPIRV-Headers.git;name=spirv-headers;destsuffix=${DEST_DIR}/spirv-headers \ + git://github.com/google/effcee.git;name=effcee;destsuffix=${DEST_DIR}/effcee \ + git://github.com/google/re2.git;name=re2;destsuffix=${DEST_DIR}/re2 \ + git://github.com/google/googletest.git;name=googletest;destsuffix=${DEST_DIR}/googletest \ + file://0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch;destsuffix=${DEST_DIR}/effcee \ + file://0001-Avoid-pessimizing-std-move-3124.patch \ " SRCREV_spirv-tools = "c413b982c316b14e784f50d941814fc737b55b4a" SRCREV_spirv-headers = "af64a9e826bf5bb5fcd2434dd71be1e41e922563"@@ -27,10 +27,10 @@ inherit cmake python3native EXTRA_OECMAKE += "-DSPIRV_WERROR=OFF"meta/recipes-graphics/spir/spirv-tools_git.bb inherit cmake python3native · line 33
Quoted 10 lines
meta/recipes-graphics/spir/spirv-tools_git.bb +4
-4do_install_append() { - install -d ${D}/${includedir}/spirv - install -m 0644 ${DEST_DIR}/spirv-headers/include/spirv/1.2/* ${D}/${includedir}/spirv - install -d ${D}/${includedir}/spirv/unified1 - install -m 0644 ${DEST_DIR}/spirv-headers/include/spirv/unified1/* ${D}/${includedir}/spirv/unified1 + install -d ${D}/${includedir}/spirv + install -m 0644 ${DEST_DIR}/spirv-headers/include/spirv/1.2/* ${D}/${includedir}/spirv + install -d ${D}/${includedir}/spirv/unified1 + install -m 0644 ${DEST_DIR}/spirv-headers/include/spirv/unified1/* ${D}/${includedir}/spirv/unified1Shell code in OE-Core is actually expected to be indented using tabs, so this part should be reverted. However, while you are here, you should change "${D}/${includedir}" to "${D}${includedir}".
Quoted 5 lines
meta/recipes-graphics/spir/spirv-tools_git.bb +0
-1} FILES_SOLIBSDEV = "" --2.28.0
//Peter
Signature · 2 lines
best regards, José Quaresma
Re: [OE-core] [PATCH v3 5/5] spirv-tools: fix identation
Hi Peter,
This has been fixed on V4 with your suggestion.
Thanks.
Jose Quaresma <[email protected]> escreveu no dia segunda, 19/10/2020 à(s) 11:10:
Quoted 77 lines
This patch it's only a little fix in the identencion and it can be dropped from the series.
This is not really necessary for now and I don't need a new revision only to fix this patch.Peter Kjellerstedt <[email protected]> escreveu no dia segunda, 19/10/2020 à(s) 09:29:
Quoted 56 lines
Quoted 41 lines
-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Jose Quaresma
Sent: den 17 oktober 2020 16:30
To: [email protected]
Cc: Jose Quaresma <[email protected]>
Subject: [OE-core] [PATCH v3 5/5] spirv-tools: fix identationreplace tabs with spaces and remove extra spaces
Signed-off-by Jose Quaresma <[email protected]>--- meta/recipes-graphics/spir/spirv-tools_git.bb | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)meta/recipes-graphics/spir/spirv-tools_git.bb +6
-6@@ -9,12 +9,12 @@ SECTION = "graphics" S = "${WORKDIR}/git" DEST_DIR = "${S}/external" SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;name=spirv-tools \ - git://github.com/KhronosGroup/SPIRV-Headers.git;name=spirv-headers;destsuffix=${DEST_DIR}/spirv-headers \ - git://github.com/google/effcee.git;name=effcee;destsuffix=${DEST_DIR}/effcee \ - git://github.com/google/re2.git;name=re2;destsuffix=${DEST_DIR}/re2 \ - git://github.com/google/googletest.git;name=googletest;destsuffix=${DEST_DIR}/googletest \ - file://0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch \ - file://0001-Avoid-pessimizing-std-move-3124.patch \ + git://github.com/KhronosGroup/SPIRV-Headers.git;name=spirv-headers;destsuffix=${DEST_DIR}/spirv-headers \ + git://github.com/google/effcee.git;name=effcee;destsuffix=${DEST_DIR}/effcee \ + git://github.com/google/re2.git;name=re2;destsuffix=${DEST_DIR}/re2 \ + git://github.com/google/googletest.git;name=googletest;destsuffix=${DEST_DIR}/googletest \ + file://0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch;destsuffix=${DEST_DIR}/effcee \ + file://0001-Avoid-pessimizing-std-move-3124.patch \ " SRCREV_spirv-tools = "c413b982c316b14e784f50d941814fc737b55b4a" SRCREV_spirv-headers = "af64a9e826bf5bb5fcd2434dd71be1e41e922563"@@ -27,10 +27,10 @@ inherit cmake python3native EXTRA_OECMAKE += "-DSPIRV_WERROR=OFF"meta/recipes-graphics/spir/spirv-tools_git.bb inherit cmake python3native · line 33
Quoted 10 lines
meta/recipes-graphics/spir/spirv-tools_git.bb +4
-4do_install_append() { - install -d ${D}/${includedir}/spirv - install -m 0644 ${DEST_DIR}/spirv-headers/include/spirv/1.2/* ${D}/${includedir}/spirv - install -d ${D}/${includedir}/spirv/unified1 - install -m 0644 ${DEST_DIR}/spirv-headers/include/spirv/unified1/* ${D}/${includedir}/spirv/unified1 + install -d ${D}/${includedir}/spirv + install -m 0644 ${DEST_DIR}/spirv-headers/include/spirv/1.2/* ${D}/${includedir}/spirv + install -d ${D}/${includedir}/spirv/unified1 + install -m 0644 ${DEST_DIR}/spirv-headers/include/spirv/unified1/* ${D}/${includedir}/spirv/unified1Shell code in OE-Core is actually expected to be indented using tabs, so this part should be reverted. However, while you are here, you should change "${D}/${includedir}" to "${D}${includedir}".
Quoted 8 lines
Quoted 5 lines
meta/recipes-graphics/spir/spirv-tools_git.bb +0
-1} FILES_SOLIBSDEV = "" --2.28.0
//Peter
--
best regards,
José Quaresma
Signature · 2 lines
best regards, José Quaresma
Quoted 11 lines · Jose Quaresma
This receipe is needed to build the new shaderc
Signed-off-by Jose Quaresma <[email protected]>--- ...0001-Avoid-pessimizing-std-move-3124.patch | 50 +++++++++++++++++++ ...STALL_LIBDIR-in-installed-CMake-file.patch | 35 +++++++++++++ meta/recipes-graphics/spir/spirv-tools_git.bb | 35 +++++++++++++ 3 files changed, 120 insertions(+) create mode 100644 meta/recipes-graphics/spir/files/0001-Avoid-pessimizing-std-move-3124.patch create mode 100644 meta/recipes-graphics/spir/files/0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch create mode 100644 meta/recipes-graphics/spir/spirv-tools_git.bb
Hi,
I did run some brief tests on these, I noticed there is no maintainer set for the new recipes. We need to set one for recipes in OE-Core, see:
meta/conf/distro/include/maintainers.inc
https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/1490/steps/8/logs/step2d
Cheers,
Richard
Hi Richard,
The following recipes do not have a maintainer assigned to them.
Please add an entry to meta/conf/distro/include/maintainers.inc file.
glslang (/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/recipes-graphics/glslang/glslang_8.13.3559.bb) shaderc (/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/recipes-graphics/shaderc/shaderc_2019.0.bb) spirv-tools (/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/recipes-graphics/spir/spirv-tools_git.bb)
spirv-tools comes from meta-oe, I can assign the same maintainer found in meta-oe or it is not possible?
glslang and shaderc don't exist in other layers and it is created by me. You are saying that I can be the mateiner or have to be someone else.
Richard Purdie <[email protected]> escreveu no dia domingo, 25/10/2020 à(s) 14:52:
Quoted 28 lines · Jose Quaresma
Quoted 11 lines
This receipe is needed to build the new shaderc
Signed-off-by Jose Quaresma <[email protected]>--- ...0001-Avoid-pessimizing-std-move-3124.patch | 50 +++++++++++++++++++ ...STALL_LIBDIR-in-installed-CMake-file.patch | 35 +++++++++++++ meta/recipes-graphics/spir/spirv-tools_git.bb | 35 +++++++++++++ 3 files changed, 120 insertions(+) create mode 100644 meta/recipes-graphics/spir/files/0001-Avoid-pessimizing-std-move-3124.patch create mode 100644 meta/recipes-graphics/spir/files/0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch create mode 100644 meta/recipes-graphics/spir/spirv-tools_git.bbHi,
I did run some brief tests on these, I noticed there is no maintainer set for the new recipes. We need to set one for recipes in OE-Core, see:
meta/conf/distro/include/maintainers.inc
https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/1490/steps/8/logs/step2d
Cheers,
Richard
Signature · 2 lines
best regards, José Quaresma
Almost always the person adding the recipes to core should be the maintainer for them as well - unless you can nominate someone else and they confirm.
Alex
Quoted 62 lines · Jose Quaresma
Hi Richard,
The following recipes do not have a maintainer assigned to them.
Please add an entry to meta/conf/distro/include/maintainers.inc file. glslang (/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/recipes-graphics/glslang/glslang_8.13.3559.bb)
shaderc (/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/recipes-graphics/shaderc/shaderc_2019.0.bb)
spirv-tools (/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/recipes-graphics/spir/spirv-tools_git.bb)spirv-tools comes from meta-oe, I can assign the same maintainer found in meta-oe or it is not possible?
glslang and shaderc don't exist in other layers and it is created by me. You are saying that I can be the mateiner or have to be someone else.
Richard Purdie <[email protected]> escreveu no dia domingo, 25/10/2020 à(s) 14:52:
Quoted 11 lines · Jose Quaresma
Quoted 9 lines
This receipe is needed to build the new shaderc
Signed-off-by Jose Quaresma <[email protected]>--- ...0001-Avoid-pessimizing-std-move-3124.patch | 50 +++++++++++++++++++ ...STALL_LIBDIR-in-installed-CMake-file.patch | 35 +++++++++++++ meta/recipes-graphics/spir/spirv-tools_git.bb | 35 +++++++++++++ 3 files changed, 120 insertions(+) create mode 100644
meta/recipes-graphics/spir/files/0001-Avoid-pessimizing-std-move-3124.patchQuoted 1 line
Quoted 1 line
create mode 100644
meta/recipes-graphics/spir/files/0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patchQuoted 11 lines
Quoted 1 line
create mode 100644 meta/recipes-graphics/spir/spirv-tools_git.bbHi,
I did run some brief tests on these, I noticed there is no maintainer set for the new recipes. We need to set one for recipes in OE-Core, see:
meta/conf/distro/include/maintainers.inc
https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/1490/steps/8/logs/step2d
Quoted 5 lines
Cheers,
Richard
--
best regards,
José Quaresma
For now I will add myself as the maintainer of these three recipes if it is possible
and send a new version of the series with this fixes for meta/conf/distro/include/maintainers.inc
The author of the spirv-tools recipe on meta-oe was Ankit Navik <[email protected]>.
I can try to contact him to know if he wants to be the maintainer of the spirv-tools on OE-core.
if he accepts a will send a new patch for this.
Alexander Kanavin <[email protected]> escreveu no dia domingo, 25/10/2020 à(s) 18:00:
Quoted 59 lines
Almost always the person adding the recipes to core should be the maintainer for them as well - unless you can nominate someone else and they confirm.
Alex
Quoted 53 lines · Jose Quaresma
Hi Richard,
The following recipes do not have a maintainer assigned to them.
Please add an entry to meta/conf/distro/include/maintainers.inc file.
glslang (/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/recipes-graphics/glslang/glslang_8.13.3559.bb) shaderc (/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/recipes-graphics/shaderc/shaderc_2019.0.bb) spirv-tools (/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/recipes-graphics/spir/spirv-tools_git.bb)spirv-tools comes from meta-oe, I can assign the same maintainer found in meta-oe or it is not possible?
glslang and shaderc don't exist in other layers and it is created by me. You are saying that I can be the mateiner or have to be someone else.
Richard Purdie <[email protected]> escreveu no dia domingo, 25/10/2020 à(s) 14:52:
Quoted 20 lines · Jose Quaresma
Quoted 11 lines
This receipe is needed to build the new shaderc
Signed-off-by Jose Quaresma <[email protected]>--- ...0001-Avoid-pessimizing-std-move-3124.patch | 50 +++++++++++++++++++ ...STALL_LIBDIR-in-installed-CMake-file.patch | 35 +++++++++++++ meta/recipes-graphics/spir/spirv-tools_git.bb | 35 +++++++++++++ 3 files changed, 120 insertions(+) create mode 100644 meta/recipes-graphics/spir/files/0001-Avoid-pessimizing-std-move-3124.patch create mode 100644 meta/recipes-graphics/spir/files/0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch create mode 100644 meta/recipes-graphics/spir/spirv-tools_git.bbHi,
I did run some brief tests on these, I noticed there is no maintainer set for the new recipes. We need to set one for recipes in OE-Core, see:
Quoted 8 lines
meta/conf/distro/include/maintainers.inc
https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/1490/steps/8/logs/step2d
Cheers,
Richard
--
best regards,
José Quaresma
Signature · 2 lines
best regards, José Quaresma