diff options
Diffstat (limited to 'poky/meta/recipes-graphics/spir')
-rw-r--r-- | poky/meta/recipes-graphics/spir/files/0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch | 35 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/spir/files/0001-fix-strncpy-bound-error.patch | 30 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/spir/spirv-headers_1.5.4.bb | 3 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/spir/spirv-tools_2020.7.bb (renamed from poky/meta/recipes-graphics/spir/spirv-tools_2020.6.bb) | 8 |
4 files changed, 37 insertions, 39 deletions
diff --git a/poky/meta/recipes-graphics/spir/files/0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch b/poky/meta/recipes-graphics/spir/files/0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch deleted file mode 100644 index 5d37da8fe..000000000 --- a/poky/meta/recipes-graphics/spir/files/0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch +++ /dev/null @@ -1,35 +0,0 @@ -From caf59c46ea5dc49e4dbf756c642b03e52c1b5468 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -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 <raj.khem@gmail.com> ---- - 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 diff --git a/poky/meta/recipes-graphics/spir/files/0001-fix-strncpy-bound-error.patch b/poky/meta/recipes-graphics/spir/files/0001-fix-strncpy-bound-error.patch new file mode 100644 index 000000000..bc59faa37 --- /dev/null +++ b/poky/meta/recipes-graphics/spir/files/0001-fix-strncpy-bound-error.patch @@ -0,0 +1,30 @@ +From 1ba007583b83468494c4146bcb7267d863de6a7b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 26 Feb 2021 23:54:10 -0800 +Subject: [PATCH] fix strncpy bound error + +This patch fixes the following error while using gcc 11 +error: 'char* __builtin_strncpy(char*, const char*, long unsigned int)' specified bound depends on the length of the source argument [-Werror=stringop-overflow=] + +Upstream-Status: Submitted [https://github.com/KhronosGroup/SPIRV-Tools/pull/4151] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + source/diagnostic.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/source/diagnostic.cpp b/source/diagnostic.cpp +index edc27c8fd..77c29d70c 100644 +--- a/source/diagnostic.cpp ++++ b/source/diagnostic.cpp +@@ -37,7 +37,7 @@ spv_diagnostic spvDiagnosticCreate(const spv_position position, + diagnostic->position = *position; + diagnostic->isTextSource = false; + memset(diagnostic->error, 0, length); +- strncpy(diagnostic->error, message, length); ++ memcpy(diagnostic->error, message, length); + return diagnostic; + } + +-- +2.30.1 + diff --git a/poky/meta/recipes-graphics/spir/spirv-headers_1.5.4.bb b/poky/meta/recipes-graphics/spir/spirv-headers_1.5.4.bb index 14723f951..7a43af5e6 100644 --- a/poky/meta/recipes-graphics/spir/spirv-headers_1.5.4.bb +++ b/poky/meta/recipes-graphics/spir/spirv-headers_1.5.4.bb @@ -7,10 +7,11 @@ HOMEPAGE = "https://www.khronos.org/registry/spir-v" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d" -SRCREV = "f027d53ded7e230e008d37c8b47ede7cd308e19d" +SRCREV = "bcf55210f13a4fa3c3d0963b509ff1070e434c79" SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https" UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$" S = "${WORKDIR}/git" +PV .= "+git${SRCPV}" inherit cmake diff --git a/poky/meta/recipes-graphics/spir/spirv-tools_2020.6.bb b/poky/meta/recipes-graphics/spir/spirv-tools_2020.7.bb index f1fe40096..8be698533 100644 --- a/poky/meta/recipes-graphics/spir/spirv-tools_2020.6.bb +++ b/poky/meta/recipes-graphics/spir/spirv-tools_2020.7.bb @@ -7,12 +7,14 @@ SECTION = "graphics" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRCREV = "b27b1afd12d05bf238ac7368bb49de73cd620a8e" -SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git" +SRCREV = "2573fd781b5408cd7fe5755a78b60d767a748ff9" +SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git \ + file://0001-fix-strncpy-bound-error.patch \ + " UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>\d+(\.\d+)+)$" S = "${WORKDIR}/git" -inherit cmake +inherit cmake python3native DEPENDS = "spirv-headers" |