From fe2db77803846faa29226b821aaa985e009ac3cc Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 6 Dec 2019 19:09:41 +0100 Subject: [PATCH] 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). Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...vulkan-headers_1.1.108.bb => vulkan-headers_1.1.126.0.bb} | 4 ++-- .../{vulkan-loader_1.1.108.bb => vulkan-loader_1.1.126.0.bb} | 5 +++-- .../{vulkan-tools_1.1.108.bb => vulkan-tools_1.1.126.0.bb} | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) rename meta/recipes-graphics/vulkan/{vulkan-headers_1.1.108.bb => vulkan-headers_1.1.126.0.bb} (87%) rename meta/recipes-graphics/vulkan/{vulkan-loader_1.1.108.bb => vulkan-loader_1.1.126.0.bb} (92%) rename meta/recipes-graphics/vulkan/{vulkan-tools_1.1.108.bb => vulkan-tools_1.1.126.0.bb} (94%) 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 similarity index 87% rename from meta/recipes-graphics/vulkan/vulkan-headers_1.1.108.bb rename to meta/recipes-graphics/vulkan/vulkan-headers_1.1.126.0.bb index 284c19d7979..72c29a72a2c 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" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=sdk-${PV}" +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=sdk-1.1.126" -SRCREV = "097a1045098213919fd56442f52c716fc78eeb27" +SRCREV = "5bc459e2921304c32568b73edaac8d6df5f98b84" S = "${WORKDIR}/git" 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 similarity index 92% rename from meta/recipes-graphics/vulkan/vulkan-loader_1.1.108.bb rename to meta/recipes-graphics/vulkan/vulkan-loader_1.1.126.0.bb index a539c5a3ce8..504cf85a2b7 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" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac" -SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-${PV}" -SRCREV = "ecb0b1e69fb2f4d3cae262e6da24c170ce62ae13" +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-1.1.126" +SRCREV = "4adad4ff705fa76f9edb2d37cb57e593decb60ed" S = "${WORKDIR}/git" @@ -24,6 +24,7 @@ DEPENDS += "vulkan-headers" EXTRA_OECMAKE = "\ -DBUILD_TESTS=OFF \ -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \ + -DASSEMBLER_WORKS=FALSE \ " # 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 similarity index 94% rename from meta/recipes-graphics/vulkan/vulkan-tools_1.1.108.bb rename to meta/recipes-graphics/vulkan/vulkan-tools_1.1.126.0.bb index 4ac1bafd173..2fd61c989ab 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" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=sdk-${PV}" -SRCREV = "3ccd7f6ebae3e1919adf837718c04feb6c2acc61" +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=sdk-1.1.126" +SRCREV = "09695dfc5dbe54f869aeaff8db93bb7bb6a220e0" S = "${WORKDIR}/git" -- 2.47.2