diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2023-06-25 23:22:34 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-06-27 16:23:34 +0100 |
| commit | aa9c8b31f681f4a97fd1bdaf4f43d05aef5a403d (patch) | |
| tree | f0ed6a465ad3db506c571c10bbb8eb7e0851e9fd /meta/recipes-graphics/vulkan | |
| parent | f4d9dc2fb3ff0370917c37f61a46d47503d94420 (diff) | |
| download | openembedded-core-contrib-aa9c8b31f681f4a97fd1bdaf4f43d05aef5a403d.tar.gz | |
vulkan-validation-layers: update 1.3.243 -> 1.3.250
Backport a patch to unbreak cross-builds.
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>
Diffstat (limited to 'meta/recipes-graphics/vulkan')
| -rw-r--r-- | meta/recipes-graphics/vulkan/vulkan-validation-layers/0001-scripts-CMakeLists.txt-append-to-CMAKE_FIND_ROOT_PAT.patch | 28 | ||||
| -rw-r--r-- | meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.250.0.bb (renamed from meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.243.0.bb) | 6 |
2 files changed, 32 insertions, 2 deletions
diff --git a/meta/recipes-graphics/vulkan/vulkan-validation-layers/0001-scripts-CMakeLists.txt-append-to-CMAKE_FIND_ROOT_PAT.patch b/meta/recipes-graphics/vulkan/vulkan-validation-layers/0001-scripts-CMakeLists.txt-append-to-CMAKE_FIND_ROOT_PAT.patch new file mode 100644 index 0000000000..4db686fe2f --- /dev/null +++ b/meta/recipes-graphics/vulkan/vulkan-validation-layers/0001-scripts-CMakeLists.txt-append-to-CMAKE_FIND_ROOT_PAT.patch @@ -0,0 +1,28 @@ +From ea7b9e6fc0b3f45d6032ce624bed85bbde5ec0bf Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Wed, 21 Jun 2023 20:03:03 +0200 +Subject: [PATCH] scripts/CMakeLists.txt: append to CMAKE_FIND_ROOT_PATH + instead of replacing it + +Resetting CMAKE_FIND_ROOT_PATH in particular breaks builds in Yocto +(which is a major cross compiling framework). + +Upstream-Status: Backport [https://github.com/KhronosGroup/Vulkan-ValidationLayers/commit/e1b11dc7856765cf45a283ac805ea5066c81cd9b] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + scripts/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt +index 94c8528c8..cd86c54eb 100644 +--- a/scripts/CMakeLists.txt ++++ b/scripts/CMakeLists.txt +@@ -124,7 +124,7 @@ if (MIMALLOC_INSTALL_DIR) + endif() + + if (CMAKE_CROSSCOMPILING) +- set(CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE) ++ set(CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH} ${CMAKE_PREFIX_PATH} PARENT_SCOPE) + else() + set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE) + endif() diff --git a/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.243.0.bb b/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.250.0.bb index bfb4b370b8..62c6343c45 100644 --- a/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.243.0.bb +++ b/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.250.0.bb @@ -8,8 +8,10 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8df9e8826734226d08cb412babfa599c" -SRC_URI = "git://git@github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=sdk-1.3.243;protocol=https" -SRCREV = "4ac0fd8e6cb3d49105d707d9ec07f0f3aa0943d6" +SRC_URI = "git://git@github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=sdk-1.3.250;protocol=https \ + file://0001-scripts-CMakeLists.txt-append-to-CMAKE_FIND_ROOT_PAT.patch \ + " +SRCREV = "1541e00a63cd125f15d231d5a8059ebe66503b25" S = "${WORKDIR}/git" |