diff options
Diffstat (limited to 'meta/recipes-graphics/spir')
-rw-r--r-- | meta/recipes-graphics/spir/files/0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch | 35 | ||||
-rw-r--r-- | meta/recipes-graphics/spir/spirv-headers_1.3.280.0.bb | 20 | ||||
-rw-r--r-- | meta/recipes-graphics/spir/spirv-headers_1.5.4.bb | 17 | ||||
-rw-r--r-- | meta/recipes-graphics/spir/spirv-tools_1.3.280.0.bb (renamed from meta/recipes-graphics/spir/spirv-tools_2020.6.bb) | 23 |
4 files changed, 35 insertions, 60 deletions
diff --git a/meta/recipes-graphics/spir/files/0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch b/meta/recipes-graphics/spir/files/0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch deleted file mode 100644 index 5d37da8fe0..0000000000 --- a/meta/recipes-graphics/spir/files/0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From caf59c46ea5dc49e4dbf756c642b03e52c1b5468 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 20 Dec 2019 07:02:24 -0800 | ||
4 | Subject: [PATCH] Respect CMAKE_INSTALL_LIBDIR in installed CMake files | ||
5 | |||
6 | Upstream-Status: Submitted [https://github.com/google/effcee/pull/36] | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | ||
9 | CMakeLists.txt | 1 + | ||
10 | effcee/CMakeLists.txt | 4 ++-- | ||
11 | 2 files changed, 3 insertions(+), 2 deletions(-) | ||
12 | |||
13 | --- a/external/effcee/CMakeLists.txt | ||
14 | +++ b/external/effcee/CMakeLists.txt | ||
15 | @@ -27,6 +27,7 @@ endif() | ||
16 | |||
17 | include(cmake/setup_build.cmake) | ||
18 | include(cmake/utils.cmake) | ||
19 | +include(GNUInstallDirs) | ||
20 | |||
21 | add_subdirectory(third_party) | ||
22 | add_subdirectory(effcee) | ||
23 | --- a/external/effcee/effcee/CMakeLists.txt | ||
24 | +++ b/external/effcee/effcee/CMakeLists.txt | ||
25 | @@ -14,8 +14,8 @@ install( | ||
26 | DESTINATION | ||
27 | include/effcee) | ||
28 | install(TARGETS effcee | ||
29 | - LIBRARY DESTINATION lib | ||
30 | - ARCHIVE DESTINATION lib) | ||
31 | + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
32 | + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) | ||
33 | |||
34 | if(EFFCEE_BUILD_TESTING) | ||
35 | add_executable(effcee-test | ||
diff --git a/meta/recipes-graphics/spir/spirv-headers_1.3.280.0.bb b/meta/recipes-graphics/spir/spirv-headers_1.3.280.0.bb new file mode 100644 index 0000000000..26bfd9c4fa --- /dev/null +++ b/meta/recipes-graphics/spir/spirv-headers_1.3.280.0.bb | |||
@@ -0,0 +1,20 @@ | |||
1 | SUMMARY = "Machine-readable files for the SPIR-V Registry" | ||
2 | SECTION = "graphics" | ||
3 | HOMEPAGE = "https://www.khronos.org/registry/spir-v" | ||
4 | LICENSE = "MIT" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d14ee3b13f42e9c9674acc5925c3d741" | ||
6 | |||
7 | SRCREV = "8b246ff75c6615ba4532fe4fde20f1be090c3764" | ||
8 | SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main" | ||
9 | PE = "1" | ||
10 | # These recipes need to be updated in lockstep with each other: | ||
11 | # glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools | ||
12 | # vulkan-validation-layers, vulkan-utility-libraries. | ||
13 | # The tags versions should always be sdk-x.y.z, as this is what | ||
14 | # upstream considers a release. | ||
15 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" | ||
16 | S = "${WORKDIR}/git" | ||
17 | |||
18 | inherit cmake | ||
19 | |||
20 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta/recipes-graphics/spir/spirv-headers_1.5.4.bb b/meta/recipes-graphics/spir/spirv-headers_1.5.4.bb deleted file mode 100644 index 14723f951b..0000000000 --- a/meta/recipes-graphics/spir/spirv-headers_1.5.4.bb +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | SUMMARY = "Machine-readable files for the SPIR-V Registry" | ||
2 | DESCRIPTION = "Headers are provided in the include directory, with up-to-date \ | ||
3 | headers in the unified1 subdirectory. Older headers are provided according to \ | ||
4 | their version." | ||
5 | SECTION = "graphics" | ||
6 | HOMEPAGE = "https://www.khronos.org/registry/spir-v" | ||
7 | LICENSE = "MIT" | ||
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d" | ||
9 | |||
10 | SRCREV = "f027d53ded7e230e008d37c8b47ede7cd308e19d" | ||
11 | SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https" | ||
12 | UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$" | ||
13 | S = "${WORKDIR}/git" | ||
14 | |||
15 | inherit cmake | ||
16 | |||
17 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta/recipes-graphics/spir/spirv-tools_2020.6.bb b/meta/recipes-graphics/spir/spirv-tools_1.3.280.0.bb index f1fe40096e..d2b6acf946 100644 --- a/meta/recipes-graphics/spir/spirv-tools_2020.6.bb +++ b/meta/recipes-graphics/spir/spirv-tools_1.3.280.0.bb | |||
@@ -7,9 +7,15 @@ SECTION = "graphics" | |||
7 | LICENSE = "Apache-2.0" | 7 | LICENSE = "Apache-2.0" |
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" |
9 | 9 | ||
10 | SRCREV = "b27b1afd12d05bf238ac7368bb49de73cd620a8e" | 10 | SRCREV = "04896c462d9f3f504c99a4698605b6524af813c1" |
11 | SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git" | 11 | SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https" |
12 | UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>\d+(\.\d+)+)$" | 12 | PE = "1" |
13 | # These recipes need to be updated in lockstep with each other: | ||
14 | # glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools | ||
15 | # vulkan-validation-layers, vulkan-utility-libraries. | ||
16 | # The tags versions should always be sdk-x.y.z, as this is what | ||
17 | # upstream considers a release. | ||
18 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" | ||
13 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
14 | 20 | ||
15 | inherit cmake | 21 | inherit cmake |
@@ -23,10 +29,11 @@ EXTRA_OECMAKE += "\ | |||
23 | -DSPIRV_SKIP_TESTS=ON \ | 29 | -DSPIRV_SKIP_TESTS=ON \ |
24 | " | 30 | " |
25 | 31 | ||
26 | do_install_append_class-target() { | 32 | do_install:append:class-target() { |
27 | # reproducibility: remove build host path | 33 | # Properly set _IMPORT_PREFIX in INTERFACE_LINK_LIBRARIES so that dependent |
34 | # tools can find the right library | ||
28 | sed -i ${D}${libdir}/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake \ | 35 | sed -i ${D}${libdir}/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake \ |
29 | -e 's:${STAGING_DIR_HOST}::g' | 36 | -e 's:INTERFACE_LINK_LIBRARIES.*$:INTERFACE_LINK_LIBRARIES "\$\{_IMPORT_PREFIX\}/${baselib}":' |
30 | } | 37 | } |
31 | 38 | ||
32 | # all the libraries are unversioned, so don't pack it on PN-dev | 39 | # all the libraries are unversioned, so don't pack it on PN-dev |
@@ -34,7 +41,7 @@ SOLIBS = ".so" | |||
34 | FILES_SOLIBSDEV = "" | 41 | FILES_SOLIBSDEV = "" |
35 | 42 | ||
36 | PACKAGES =+ "${PN}-lesspipe" | 43 | PACKAGES =+ "${PN}-lesspipe" |
37 | FILES_${PN}-lesspipe = "${base_bindir}/spirv-lesspipe.sh" | 44 | FILES:${PN}-lesspipe = "${base_bindir}/spirv-lesspipe.sh" |
38 | RDEPENDS_${PN}-lesspipe += "${PN} bash" | 45 | RDEPENDS:${PN}-lesspipe += "${PN} bash" |
39 | 46 | ||
40 | BBCLASSEXTEND = "native nativesdk" | 47 | BBCLASSEXTEND = "native nativesdk" |