summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/include/maintainers.inc1
-rw-r--r--meta/recipes-graphics/glslang/glslang_1.3.268.0.bb (renamed from meta/recipes-graphics/glslang/glslang_1.3.261.1.bb)6
-rw-r--r--meta/recipes-graphics/spir/spirv-headers_1.3.268.0.bb (renamed from meta/recipes-graphics/spir/spirv-headers_1.3.261.1.bb)3
-rw-r--r--meta/recipes-graphics/spir/spirv-tools_1.3.268.0.bb (renamed from meta/recipes-graphics/spir/spirv-tools_1.3.261.1.bb)3
-rw-r--r--meta/recipes-graphics/vulkan/vulkan-headers_1.3.268.0.bb (renamed from meta/recipes-graphics/vulkan/vulkan-headers_1.3.261.1.bb)5
-rw-r--r--meta/recipes-graphics/vulkan/vulkan-loader_1.3.268.0.bb (renamed from meta/recipes-graphics/vulkan/vulkan-loader_1.3.261.1.bb)7
-rw-r--r--meta/recipes-graphics/vulkan/vulkan-tools_1.3.268.0.bb (renamed from meta/recipes-graphics/vulkan/vulkan-tools_1.3.261.1.bb)3
-rw-r--r--meta/recipes-graphics/vulkan/vulkan-utility-libraries_1.3.268.0.bb33
-rw-r--r--meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.268.0.bb (renamed from meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.261.1.bb)9
9 files changed, 57 insertions, 13 deletions
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 35f8a72fa4..2c59db56ac 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -837,6 +837,7 @@ RECIPE_MAINTAINER:pn-vulkan-headers = "Anuj Mittal <anuj.mittal@intel.com>"
837RECIPE_MAINTAINER:pn-vulkan-loader = "Anuj Mittal <anuj.mittal@intel.com>" 837RECIPE_MAINTAINER:pn-vulkan-loader = "Anuj Mittal <anuj.mittal@intel.com>"
838RECIPE_MAINTAINER:pn-vulkan-samples = "Ross Burton <ross.burton@arm.com>" 838RECIPE_MAINTAINER:pn-vulkan-samples = "Ross Burton <ross.burton@arm.com>"
839RECIPE_MAINTAINER:pn-vulkan-tools = "Anuj Mittal <anuj.mittal@intel.com>" 839RECIPE_MAINTAINER:pn-vulkan-tools = "Anuj Mittal <anuj.mittal@intel.com>"
840RECIPE_MAINTAINER:pn-vulkan-utility-libraries = "Anuj Mittal <anuj.mittal@intel.com>"
840RECIPE_MAINTAINER:pn-vulkan-validation-layers = "Vincent Davis Jr <vince@underview.tech>" 841RECIPE_MAINTAINER:pn-vulkan-validation-layers = "Vincent Davis Jr <vince@underview.tech>"
841RECIPE_MAINTAINER:pn-waffle = "Ross Burton <ross.burton@arm.com>" 842RECIPE_MAINTAINER:pn-waffle = "Ross Burton <ross.burton@arm.com>"
842RECIPE_MAINTAINER:pn-watchdog = "Alexander Kanavin <alex.kanavin@gmail.com>" 843RECIPE_MAINTAINER:pn-watchdog = "Alexander Kanavin <alex.kanavin@gmail.com>"
diff --git a/meta/recipes-graphics/glslang/glslang_1.3.261.1.bb b/meta/recipes-graphics/glslang/glslang_1.3.268.0.bb
index e607045148..033830ba36 100644
--- a/meta/recipes-graphics/glslang/glslang_1.3.261.1.bb
+++ b/meta/recipes-graphics/glslang/glslang_1.3.268.0.bb
@@ -8,13 +8,14 @@ HOMEPAGE = "https://www.khronos.org/opengles/sdk/tools/Reference-Compiler"
8LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception" 8LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception"
9LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3" 9LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3"
10 10
11SRCREV = "76b52ebf77833908dc4c0dd6c70a9c357ac720bd" 11SRCREV = "36d08c0d940cf307a23928299ef52c7970d8cee6"
12SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=main \ 12SRC_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 "
15PE = "1" 15PE = "1"
16# These recipes need to be updated in lockstep with each other: 16# These recipes need to be updated in lockstep with each other:
17# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools 17# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
18# vulkan-validation-layers, vulkan-utility-libraries.
18# The tags versions should always be sdk-x.y.z, as this is what 19# The tags versions should always be sdk-x.y.z, as this is what
19# upstream considers a release. 20# upstream considers a release.
20UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" 21UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
@@ -22,12 +23,15 @@ S = "${WORKDIR}/git"
22 23
23inherit cmake python3native 24inherit cmake python3native
24 25
26DEPENDS = "spirv-tools"
27
25EXTRA_OECMAKE = " \ 28EXTRA_OECMAKE = " \
26 -DCMAKE_BUILD_TYPE=Release \ 29 -DCMAKE_BUILD_TYPE=Release \
27 -DBUILD_SHARED_LIBS=ON \ 30 -DBUILD_SHARED_LIBS=ON \
28 -DENABLE_PCH=OFF \ 31 -DENABLE_PCH=OFF \
29 -DENABLE_CTEST=OFF \ 32 -DENABLE_CTEST=OFF \
30 -DBUILD_EXTERNAL=OFF \ 33 -DBUILD_EXTERNAL=OFF \
34 -DALLOW_EXTERNAL_SPIRV_TOOLS=ON \
31" 35"
32 36
33BBCLASSEXTEND = "native nativesdk" 37BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-graphics/spir/spirv-headers_1.3.261.1.bb b/meta/recipes-graphics/spir/spirv-headers_1.3.268.0.bb
index 945f0879f5..7045f70473 100644
--- a/meta/recipes-graphics/spir/spirv-headers_1.3.261.1.bb
+++ b/meta/recipes-graphics/spir/spirv-headers_1.3.268.0.bb
@@ -4,11 +4,12 @@ HOMEPAGE = "https://www.khronos.org/registry/spir-v"
4LICENSE = "MIT" 4LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d" 5LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d"
6 6
7SRCREV = "124a9665e464ef98b8b718d572d5f329311061eb" 7SRCREV = "e867c06631767a2d96424cbec530f9ee5e78180f"
8SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main" 8SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main"
9PE = "1" 9PE = "1"
10# These recipes need to be updated in lockstep with each other: 10# These recipes need to be updated in lockstep with each other:
11# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools 11# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
12# vulkan-validation-layers, vulkan-utility-libraries.
12# The tags versions should always be sdk-x.y.z, as this is what 13# The tags versions should always be sdk-x.y.z, as this is what
13# upstream considers a release. 14# upstream considers a release.
14UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" 15UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/meta/recipes-graphics/spir/spirv-tools_1.3.261.1.bb b/meta/recipes-graphics/spir/spirv-tools_1.3.268.0.bb
index 6904288299..1cccafdad0 100644
--- a/meta/recipes-graphics/spir/spirv-tools_1.3.261.1.bb
+++ b/meta/recipes-graphics/spir/spirv-tools_1.3.268.0.bb
@@ -7,11 +7,12 @@ SECTION = "graphics"
7LICENSE = "Apache-2.0" 7LICENSE = "Apache-2.0"
8LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" 8LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
9 9
10SRCREV = "e553b884c7c9febaa4e52334f683641fb5f196a0" 10SRCREV = "360d469b9eac54d6c6e20f609f9ec35e3a5380ad"
11SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https" 11SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https"
12PE = "1" 12PE = "1"
13# These recipes need to be updated in lockstep with each other: 13# These recipes need to be updated in lockstep with each other:
14# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools 14# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
15# vulkan-validation-layers, vulkan-utility-libraries.
15# The tags versions should always be sdk-x.y.z, as this is what 16# The tags versions should always be sdk-x.y.z, as this is what
16# upstream considers a release. 17# upstream considers a release.
17UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" 18UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/meta/recipes-graphics/vulkan/vulkan-headers_1.3.261.1.bb b/meta/recipes-graphics/vulkan/vulkan-headers_1.3.268.0.bb
index 01eb14b9fb..a1a83317da 100644
--- a/meta/recipes-graphics/vulkan/vulkan-headers_1.3.261.1.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-headers_1.3.268.0.bb
@@ -11,7 +11,7 @@ LICENSE = "Apache-2.0 & MIT"
11LIC_FILES_CHKSUM = "file://LICENSE.md;md5=1bc355d8c4196f774c8b87ed1a8dd625" 11LIC_FILES_CHKSUM = "file://LICENSE.md;md5=1bc355d8c4196f774c8b87ed1a8dd625"
12SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol=https" 12SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol=https"
13 13
14SRCREV = "85c2334e92e215cce34e8e0ed8b2dce4700f4a50" 14SRCREV = "7b3466a1f47a9251ac1113efbe022ff016e2f95b"
15 15
16S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"
17 17
@@ -21,7 +21,8 @@ FILES:${PN} += "${datadir}/vulkan"
21RDEPENDS:${PN} += "python3-core" 21RDEPENDS:${PN} += "python3-core"
22 22
23# These recipes need to be updated in lockstep with each other: 23# These recipes need to be updated in lockstep with each other:
24# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools 24# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools,
25# vulkan-validation-layers, vulkan-utility-libraries.
25# The tags versions should always be sdk-x.y.z, as this is what 26# The tags versions should always be sdk-x.y.z, as this is what
26# upstream considers a release. 27# upstream considers a release.
27UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" 28UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/meta/recipes-graphics/vulkan/vulkan-loader_1.3.261.1.bb b/meta/recipes-graphics/vulkan/vulkan-loader_1.3.268.0.bb
index 01cbeafa3e..5a5749d40c 100644
--- a/meta/recipes-graphics/vulkan/vulkan-loader_1.3.261.1.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-loader_1.3.268.0.bb
@@ -9,8 +9,8 @@ SECTION = "libs"
9 9
10LICENSE = "Apache-2.0" 10LICENSE = "Apache-2.0"
11LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac" 11LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac"
12SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=main;protocol=https" 12SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=vulkan-sdk-1.3.268;protocol=https"
13SRCREV = "afdd025ead2b63b2c73d900ab128a2d3b512cdf0" 13SRCREV = "f4c838e2e7358fc450f8112119bbdbb5b03e03fa"
14 14
15S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
16 16
@@ -36,7 +36,8 @@ PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SU
36RRECOMMENDS:${PN} = "mesa-vulkan-drivers" 36RRECOMMENDS:${PN} = "mesa-vulkan-drivers"
37 37
38# These recipes need to be updated in lockstep with each other: 38# These recipes need to be updated in lockstep with each other:
39# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools 39# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools,
40# vulkan-validation-layers, vulkan-utility-libraries.
40# The tags versions should always be sdk-x.y.z, as this is what 41# The tags versions should always be sdk-x.y.z, as this is what
41# upstream considers a release. 42# upstream considers a release.
42UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" 43UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/meta/recipes-graphics/vulkan/vulkan-tools_1.3.261.1.bb b/meta/recipes-graphics/vulkan/vulkan-tools_1.3.268.0.bb
index 7a7edc9ebd..78bd9b0e04 100644
--- a/meta/recipes-graphics/vulkan/vulkan-tools_1.3.261.1.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-tools_1.3.268.0.bb
@@ -7,7 +7,7 @@ SECTION = "libs"
7LICENSE = "Apache-2.0" 7LICENSE = "Apache-2.0"
8LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" 8LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
9SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=main;protocol=https" 9SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=main;protocol=https"
10SRCREV = "a7da7027ca9fd0901639f02619c226da9c6036f1" 10SRCREV = "1532001f7edae559af1988293eec90bc5e2607d5"
11 11
12S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
13 13
@@ -31,6 +31,7 @@ PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SU
31 31
32# These recipes need to be updated in lockstep with each other: 32# These recipes need to be updated in lockstep with each other:
33# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools 33# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
34# vulkan-validation-layers, vulkan-utility-libraries.
34# The tags versions should always be sdk-x.y.z, as this is what 35# The tags versions should always be sdk-x.y.z, as this is what
35# upstream considers a release. 36# upstream considers a release.
36UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" 37UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/meta/recipes-graphics/vulkan/vulkan-utility-libraries_1.3.268.0.bb b/meta/recipes-graphics/vulkan/vulkan-utility-libraries_1.3.268.0.bb
new file mode 100644
index 0000000000..fee4ba6cc9
--- /dev/null
+++ b/meta/recipes-graphics/vulkan/vulkan-utility-libraries_1.3.268.0.bb
@@ -0,0 +1,33 @@
1SUMMARY = "Vulkan Utility Libraries"
2DESCRIPTION = "Common libraries created to share code across various \
3Vulkan repositories, solving long standing issues for Vulkan SDK \
4developers and users."
5HOMEPAGE = "https://www.khronos.org/vulkan/"
6BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Utility-Libraries"
7SECTION = "libs"
8
9LICENSE = "Apache-2.0"
10LIC_FILES_CHKSUM = "file://LICENSE.md;md5=4ca2d6799091aaa98a8520f1b793939b"
11
12SRC_URI = "git://github.com/KhronosGroup/Vulkan-Utility-Libraries.git;branch=main;protocol=https"
13SRCREV = "c9ca4ac620a238a93c65d864f2eaa33954d74509"
14
15S = "${WORKDIR}/git"
16
17REQUIRED_DISTRO_FEATURES = "vulkan"
18
19DEPENDS = "vulkan-headers"
20
21EXTRA_OECMAKE = "\
22 -DBUILD_TESTS=OFF \
23 "
24
25inherit cmake features_check pkgconfig
26
27# These recipes need to be updated in lockstep with each other:
28# glslang, vulkan-headers, vulkan-loader, vulkan-tools,
29# vulkan-validation-layers, spirv-headers, spirv-tools,
30# vulkan-utility-libraries.
31# The tags versions should always be sdk-x.y.z, as this is what
32# upstream considers a release.
33UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.261.1.bb b/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.268.0.bb
index 1e2a0acedb..6c2715b041 100644
--- a/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.261.1.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.268.0.bb
@@ -8,14 +8,14 @@ SECTION = "libs"
8LICENSE = "Apache-2.0 & MIT" 8LICENSE = "Apache-2.0 & MIT"
9LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd3c0bc366cd9b6a906e22f0bcb5910f" 9LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd3c0bc366cd9b6a906e22f0bcb5910f"
10 10
11SRC_URI = "git://git@github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=sdk-1.3.261;protocol=https" 11SRC_URI = "git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=vulkan-sdk-1.3.268;protocol=https"
12SRCREV = "628cd310bef6d54b4e6b25b5ac2ed013473409d6" 12SRCREV = "3c64adb4e052062fc60b6580c365429fddfbcfbf"
13 13
14S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
15 15
16REQUIRED_DISTRO_FEATURES = "vulkan" 16REQUIRED_DISTRO_FEATURES = "vulkan"
17 17
18DEPENDS = "vulkan-headers vulkan-loader spirv-headers spirv-tools glslang" 18DEPENDS = "vulkan-headers vulkan-loader spirv-headers spirv-tools glslang vulkan-utility-libraries"
19 19
20# BUILD_TESTS - Not required for OE builds 20# BUILD_TESTS - Not required for OE builds
21# USE_ROBIN_HOOD_HASHING - Provides substantial performance improvements on all platforms. 21# USE_ROBIN_HOOD_HASHING - Provides substantial performance improvements on all platforms.
@@ -42,7 +42,8 @@ FILES_SOLIBSDEV = ""
42 42
43# These recipes need to be updated in lockstep with each other: 43# These recipes need to be updated in lockstep with each other:
44# glslang, vulkan-headers, vulkan-loader, vulkan-tools, 44# glslang, vulkan-headers, vulkan-loader, vulkan-tools,
45# vulkan-validation-layers, spirv-headers, spirv-tools 45# vulkan-validation-layers, spirv-headers, spirv-tools,
46# vulkan-utility-libraries.
46# The tags versions should always be sdk-x.y.z, as this is what 47# The tags versions should always be sdk-x.y.z, as this is what
47# upstream considers a release. 48# upstream considers a release.
48UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" 49UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"