summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-12-06 19:09:41 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-09 12:00:43 +0000
commit9ad29096a811ba7f5de3bcac0ac672a3d97426ed (patch)
treec78b11780254f6f5f2b8d3f29d272d865876fa85 /meta
parent132b37ff52c464ca10301581f42dc77d14ec81a5 (diff)
downloadpoky-9ad29096a811ba7f5de3bcac0ac672a3d97426ed.tar.gz
vulkan: update to 1.1.126
Disable assembly for vulkan-loader, as it tries to execute a target binary (previously it would fail to detect a working assembler and do the same fallback quietly). (From OE-Core rev: fe2db77803846faa29226b821aaa985e009ac3cc) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/vulkan/vulkan-headers_1.1.126.0.bb (renamed from meta/recipes-graphics/vulkan/vulkan-headers_1.1.108.bb)4
-rw-r--r--meta/recipes-graphics/vulkan/vulkan-loader_1.1.126.0.bb (renamed from meta/recipes-graphics/vulkan/vulkan-loader_1.1.108.bb)5
-rw-r--r--meta/recipes-graphics/vulkan/vulkan-tools_1.1.126.0.bb (renamed from meta/recipes-graphics/vulkan/vulkan-tools_1.1.108.bb)4
3 files changed, 7 insertions, 6 deletions
diff --git a/meta/recipes-graphics/vulkan/vulkan-headers_1.1.108.bb b/meta/recipes-graphics/vulkan/vulkan-headers_1.1.126.0.bb
index 284c19d797..72c29a72a2 100644
--- a/meta/recipes-graphics/vulkan/vulkan-headers_1.1.108.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-headers_1.1.126.0.bb
@@ -5,9 +5,9 @@ SECTION = "libs"
5 5
6LICENSE = "Apache-2.0" 6LICENSE = "Apache-2.0"
7LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" 7LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
8SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=sdk-${PV}" 8SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=sdk-1.1.126"
9 9
10SRCREV = "097a1045098213919fd56442f52c716fc78eeb27" 10SRCREV = "5bc459e2921304c32568b73edaac8d6df5f98b84"
11 11
12S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
13 13
diff --git a/meta/recipes-graphics/vulkan/vulkan-loader_1.1.108.bb b/meta/recipes-graphics/vulkan/vulkan-loader_1.1.126.0.bb
index a539c5a3ce..504cf85a2b 100644
--- a/meta/recipes-graphics/vulkan/vulkan-loader_1.1.108.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-loader_1.1.126.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=sdk-${PV}" 12SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-1.1.126"
13SRCREV = "ecb0b1e69fb2f4d3cae262e6da24c170ce62ae13" 13SRCREV = "4adad4ff705fa76f9edb2d37cb57e593decb60ed"
14 14
15S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
16 16
@@ -24,6 +24,7 @@ DEPENDS += "vulkan-headers"
24EXTRA_OECMAKE = "\ 24EXTRA_OECMAKE = "\
25 -DBUILD_TESTS=OFF \ 25 -DBUILD_TESTS=OFF \
26 -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \ 26 -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \
27 -DASSEMBLER_WORKS=FALSE \
27 " 28 "
28 29
29# must choose x11 or wayland or both 30# must choose x11 or wayland or both
diff --git a/meta/recipes-graphics/vulkan/vulkan-tools_1.1.108.bb b/meta/recipes-graphics/vulkan/vulkan-tools_1.1.126.0.bb
index 4ac1bafd17..2fd61c989a 100644
--- a/meta/recipes-graphics/vulkan/vulkan-tools_1.1.108.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-tools_1.1.126.0.bb
@@ -5,8 +5,8 @@ SECTION = "libs"
5 5
6LICENSE = "Apache-2.0" 6LICENSE = "Apache-2.0"
7LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" 7LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
8SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=sdk-${PV}" 8SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=sdk-1.1.126"
9SRCREV = "3ccd7f6ebae3e1919adf837718c04feb6c2acc61" 9SRCREV = "09695dfc5dbe54f869aeaff8db93bb7bb6a220e0"
10 10
11S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
12 12