diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2023-05-03 10:54:01 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-05-05 11:07:26 +0100 |
commit | 861299995fce4b241084a853cc60685d69173e4e (patch) | |
tree | d79afcc68ece49d0573cc995051d96052fcb27c9 | |
parent | d71cf0224dc6034a0808066deec5dc2135d510a5 (diff) | |
download | poky-861299995fce4b241084a853cc60685d69173e4e.tar.gz |
vulkan: add a comment explaining upstream version policy
(From OE-Core rev: 7484c71ca3a932bcb4c3679e25b0233c06be4404)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
6 files changed, 24 insertions, 0 deletions
diff --git a/meta/recipes-graphics/glslang/glslang_1.3.239.0.bb b/meta/recipes-graphics/glslang/glslang_1.3.239.0.bb index 6bcde521e2..295a8fe190 100644 --- a/meta/recipes-graphics/glslang/glslang_1.3.239.0.bb +++ b/meta/recipes-graphics/glslang/glslang_1.3.239.0.bb | |||
@@ -13,6 +13,10 @@ SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=main | |||
13 | file://0001-generate-glslang-pkg-config.patch \ | 13 | file://0001-generate-glslang-pkg-config.patch \ |
14 | " | 14 | " |
15 | PE = "1" | 15 | PE = "1" |
16 | # These recipes need to be updated in lockstep with each other: | ||
17 | # glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools | ||
18 | # The tags versions should always be sdk-x.y.z, as this is what | ||
19 | # upstream considers a release. | ||
16 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" | 20 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" |
17 | S = "${WORKDIR}/git" | 21 | S = "${WORKDIR}/git" |
18 | 22 | ||
diff --git a/meta/recipes-graphics/spir/spirv-headers_1.3.243.0.bb b/meta/recipes-graphics/spir/spirv-headers_1.3.243.0.bb index 4c39b0c351..8e4402a94e 100644 --- a/meta/recipes-graphics/spir/spirv-headers_1.3.243.0.bb +++ b/meta/recipes-graphics/spir/spirv-headers_1.3.243.0.bb | |||
@@ -10,6 +10,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d" | |||
10 | SRCREV = "1feaf4414eb2b353764d01d88f8aa4bcc67b60db" | 10 | SRCREV = "1feaf4414eb2b353764d01d88f8aa4bcc67b60db" |
11 | SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main" | 11 | SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main" |
12 | PE = "1" | 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 | # The tags versions should always be sdk-x.y.z, as this is what | ||
16 | # upstream considers a release. | ||
13 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" | 17 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" |
14 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
15 | 19 | ||
diff --git a/meta/recipes-graphics/spir/spirv-tools_1.3.243.0.bb b/meta/recipes-graphics/spir/spirv-tools_1.3.243.0.bb index 290c53e8e4..44ffc72b08 100644 --- a/meta/recipes-graphics/spir/spirv-tools_1.3.243.0.bb +++ b/meta/recipes-graphics/spir/spirv-tools_1.3.243.0.bb | |||
@@ -10,6 +10,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | |||
10 | SRCREV = "44d72a9b36702f093dd20815561a56778b2d181e" | 10 | SRCREV = "44d72a9b36702f093dd20815561a56778b2d181e" |
11 | SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https" | 11 | SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https" |
12 | PE = "1" | 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 | # The tags versions should always be sdk-x.y.z, as this is what | ||
16 | # upstream considers a release. | ||
13 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" | 17 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" |
14 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
15 | 19 | ||
diff --git a/meta/recipes-graphics/vulkan/vulkan-headers_1.3.239.0.bb b/meta/recipes-graphics/vulkan/vulkan-headers_1.3.239.0.bb index a6b30fa831..19b13bce63 100644 --- a/meta/recipes-graphics/vulkan/vulkan-headers_1.3.239.0.bb +++ b/meta/recipes-graphics/vulkan/vulkan-headers_1.3.239.0.bb | |||
@@ -20,4 +20,8 @@ inherit cmake | |||
20 | FILES:${PN} += "${datadir}/vulkan" | 20 | FILES:${PN} += "${datadir}/vulkan" |
21 | RDEPENDS:${PN} += "python3-core" | 21 | RDEPENDS:${PN} += "python3-core" |
22 | 22 | ||
23 | # These recipes need to be updated in lockstep with each other: | ||
24 | # glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools | ||
25 | # The tags versions should always be sdk-x.y.z, as this is what | ||
26 | # upstream considers a release. | ||
23 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" | 27 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" |
diff --git a/meta/recipes-graphics/vulkan/vulkan-loader_1.3.239.0.bb b/meta/recipes-graphics/vulkan/vulkan-loader_1.3.239.0.bb index e11f936a0a..e45996e5a5 100644 --- a/meta/recipes-graphics/vulkan/vulkan-loader_1.3.239.0.bb +++ b/meta/recipes-graphics/vulkan/vulkan-loader_1.3.239.0.bb | |||
@@ -35,4 +35,8 @@ PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SU | |||
35 | 35 | ||
36 | RRECOMMENDS:${PN} = "mesa-vulkan-drivers" | 36 | RRECOMMENDS:${PN} = "mesa-vulkan-drivers" |
37 | 37 | ||
38 | # These recipes need to be updated in lockstep with each other: | ||
39 | # glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools | ||
40 | # The tags versions should always be sdk-x.y.z, as this is what | ||
41 | # upstream considers a release. | ||
38 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" | 42 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" |
diff --git a/meta/recipes-graphics/vulkan/vulkan-tools_1.3.239.0.bb b/meta/recipes-graphics/vulkan/vulkan-tools_1.3.239.0.bb index 934bd53ee1..5dc6bcad45 100644 --- a/meta/recipes-graphics/vulkan/vulkan-tools_1.3.239.0.bb +++ b/meta/recipes-graphics/vulkan/vulkan-tools_1.3.239.0.bb | |||
@@ -29,4 +29,8 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" | |||
29 | PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr" | 29 | PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr" |
30 | PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland" | 30 | PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland" |
31 | 31 | ||
32 | # These recipes need to be updated in lockstep with each other: | ||
33 | # glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools | ||
34 | # The tags versions should always be sdk-x.y.z, as this is what | ||
35 | # upstream considers a release. | ||
32 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" | 36 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" |