From bd1f761d20767dbcb2e6c3fe5239cca8eba6222e Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Mon, 20 May 2024 16:11:03 -0700 Subject: spirv-tools: upgrade to 1.3.283.0 https://github.com/KhronosGroup/SPIRV-Tools/compare/vulkan-sdk-1.3.280.0...vulkan-sdk-1.3.283 (From OE-Core rev: 7fc9e8bd171a2208f20de9ba31cfa05bc2b29761) Signed-off-by: Tim Orling Signed-off-by: Richard Purdie --- .../recipes-graphics/spir/spirv-tools_1.3.280.0.bb | 47 ---------------------- .../recipes-graphics/spir/spirv-tools_1.3.283.0.bb | 47 ++++++++++++++++++++++ 2 files changed, 47 insertions(+), 47 deletions(-) delete mode 100644 meta/recipes-graphics/spir/spirv-tools_1.3.280.0.bb create mode 100644 meta/recipes-graphics/spir/spirv-tools_1.3.283.0.bb (limited to 'meta/recipes-graphics/spir') diff --git a/meta/recipes-graphics/spir/spirv-tools_1.3.280.0.bb b/meta/recipes-graphics/spir/spirv-tools_1.3.280.0.bb deleted file mode 100644 index d2b6acf946..0000000000 --- a/meta/recipes-graphics/spir/spirv-tools_1.3.280.0.bb +++ /dev/null @@ -1,47 +0,0 @@ -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." -HOMEPAGE = "https://github.com/KhronosGroup/SPIRV-Tools" -SECTION = "graphics" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRCREV = "04896c462d9f3f504c99a4698605b6524af813c1" -SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https" -PE = "1" -# These recipes need to be updated in lockstep with each other: -# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools -# vulkan-validation-layers, vulkan-utility-libraries. -# The tags versions should always be sdk-x.y.z, as this is what -# upstream considers a release. -UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" -S = "${WORKDIR}/git" - -inherit cmake - -DEPENDS = "spirv-headers" - -EXTRA_OECMAKE += "\ - -DSPIRV-Headers_SOURCE_DIR=${STAGING_EXECPREFIXDIR} \ - -DSPIRV_TOOLS_BUILD_STATIC=OFF \ - -DBUILD_SHARED_LIBS=ON \ - -DSPIRV_SKIP_TESTS=ON \ -" - -do_install:append:class-target() { - # Properly set _IMPORT_PREFIX in INTERFACE_LINK_LIBRARIES so that dependent - # tools can find the right library - sed -i ${D}${libdir}/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake \ - -e 's:INTERFACE_LINK_LIBRARIES.*$:INTERFACE_LINK_LIBRARIES "\$\{_IMPORT_PREFIX\}/${baselib}":' -} - -# all the libraries are unversioned, so don't pack it on PN-dev -SOLIBS = ".so" -FILES_SOLIBSDEV = "" - -PACKAGES =+ "${PN}-lesspipe" -FILES:${PN}-lesspipe = "${base_bindir}/spirv-lesspipe.sh" -RDEPENDS:${PN}-lesspipe += "${PN} bash" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/spir/spirv-tools_1.3.283.0.bb b/meta/recipes-graphics/spir/spirv-tools_1.3.283.0.bb new file mode 100644 index 0000000000..292a17f00d --- /dev/null +++ b/meta/recipes-graphics/spir/spirv-tools_1.3.283.0.bb @@ -0,0 +1,47 @@ +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." +HOMEPAGE = "https://github.com/KhronosGroup/SPIRV-Tools" +SECTION = "graphics" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRCREV = "dd4b663e13c07fea4fbb3f70c1c91c86731099f7" +SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https" +PE = "1" +# These recipes need to be updated in lockstep with each other: +# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools +# vulkan-validation-layers, vulkan-utility-libraries, vulkan-volk. +# The tags versions should always be sdk-x.y.z, as this is what +# upstream considers a release. +UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" +S = "${WORKDIR}/git" + +inherit cmake + +DEPENDS = "spirv-headers" + +EXTRA_OECMAKE += "\ + -DSPIRV-Headers_SOURCE_DIR=${STAGING_EXECPREFIXDIR} \ + -DSPIRV_TOOLS_BUILD_STATIC=OFF \ + -DBUILD_SHARED_LIBS=ON \ + -DSPIRV_SKIP_TESTS=ON \ +" + +do_install:append:class-target() { + # Properly set _IMPORT_PREFIX in INTERFACE_LINK_LIBRARIES so that dependent + # tools can find the right library + sed -i ${D}${libdir}/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake \ + -e 's:INTERFACE_LINK_LIBRARIES.*$:INTERFACE_LINK_LIBRARIES "\$\{_IMPORT_PREFIX\}/${baselib}":' +} + +# all the libraries are unversioned, so don't pack it on PN-dev +SOLIBS = ".so" +FILES_SOLIBSDEV = "" + +PACKAGES =+ "${PN}-lesspipe" +FILES:${PN}-lesspipe = "${base_bindir}/spirv-lesspipe.sh" +RDEPENDS:${PN}-lesspipe += "${PN} bash" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf