diff options
Diffstat (limited to 'poky/meta/recipes-graphics/vulkan')
-rw-r--r-- | poky/meta/recipes-graphics/vulkan/vulkan-headers_1.3.261.1.bb (renamed from poky/meta/recipes-graphics/vulkan/vulkan-headers_1.3.250.0.bb) | 6 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/vulkan/vulkan-loader_1.3.261.1.bb (renamed from poky/meta/recipes-graphics/vulkan/vulkan-loader_1.3.250.0.bb) | 4 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/vulkan/vulkan-tools/0001-scripts-CMakeLists.txt-do-not-make-special-arrangeme.patch | 29 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/vulkan/vulkan-tools_1.3.261.1.bb (renamed from poky/meta/recipes-graphics/vulkan/vulkan-tools_1.3.250.0.bb) | 6 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/vulkan/vulkan-validation-layers/0001-scripts-CMakeLists.txt-append-to-CMAKE_FIND_ROOT_PAT.patch | 28 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.261.1.bb (renamed from poky/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.250.0.bb) | 10 |
6 files changed, 11 insertions, 72 deletions
diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-headers_1.3.250.0.bb b/poky/meta/recipes-graphics/vulkan/vulkan-headers_1.3.261.1.bb index 2970767ff3..01eb14b9fb 100644 --- a/poky/meta/recipes-graphics/vulkan/vulkan-headers_1.3.250.0.bb +++ b/poky/meta/recipes-graphics/vulkan/vulkan-headers_1.3.261.1.bb @@ -7,11 +7,11 @@ HOMEPAGE = "https://www.khronos.org/vulkan/" BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Headers" SECTION = "libs" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" +LICENSE = "Apache-2.0 & MIT" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=1bc355d8c4196f774c8b87ed1a8dd625" SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol=https" -SRCREV = "9e61870ecbd32514113b467e0a0c46f60ed222c7" +SRCREV = "85c2334e92e215cce34e8e0ed8b2dce4700f4a50" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-loader_1.3.250.0.bb b/poky/meta/recipes-graphics/vulkan/vulkan-loader_1.3.261.1.bb index 456c973406..01cbeafa3e 100644 --- a/poky/meta/recipes-graphics/vulkan/vulkan-loader_1.3.250.0.bb +++ b/poky/meta/recipes-graphics/vulkan/vulkan-loader_1.3.261.1.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-1.3.250;protocol=https" -SRCREV = "f372068d09fc13bcf54b8c81274f37aa5f46aea3" +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=main;protocol=https" +SRCREV = "afdd025ead2b63b2c73d900ab128a2d3b512cdf0" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-tools/0001-scripts-CMakeLists.txt-do-not-make-special-arrangeme.patch b/poky/meta/recipes-graphics/vulkan/vulkan-tools/0001-scripts-CMakeLists.txt-do-not-make-special-arrangeme.patch deleted file mode 100644 index 6b70a1e62d..0000000000 --- a/poky/meta/recipes-graphics/vulkan/vulkan-tools/0001-scripts-CMakeLists.txt-do-not-make-special-arrangeme.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9060e916ca05d34b56c62f2be0b4a77dd104e2aa Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex@linutronix.de> -Date: Fri, 2 Jun 2023 14:13:00 +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: Submitted [https://github.com/KhronosGroup/Vulkan-Tools/pull/808] -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 5b979d43..19a58bf9 100644 ---- a/scripts/CMakeLists.txt -+++ b/scripts/CMakeLists.txt -@@ -114,7 +114,7 @@ if (MOLTENVK_REPO_ROOT) - 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/poky/meta/recipes-graphics/vulkan/vulkan-tools_1.3.250.0.bb b/poky/meta/recipes-graphics/vulkan/vulkan-tools_1.3.261.1.bb index 0346b380ee..7a7edc9ebd 100644 --- a/poky/meta/recipes-graphics/vulkan/vulkan-tools_1.3.250.0.bb +++ b/poky/meta/recipes-graphics/vulkan/vulkan-tools_1.3.261.1.bb @@ -6,10 +6,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=main;protocol=https \ - file://0001-scripts-CMakeLists.txt-do-not-make-special-arrangeme.patch \ - " -SRCREV = "695887a994ef9cc00a7aa3f9c00b31a56ea79534" +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=main;protocol=https" +SRCREV = "a7da7027ca9fd0901639f02619c226da9c6036f1" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-validation-layers/0001-scripts-CMakeLists.txt-append-to-CMAKE_FIND_ROOT_PAT.patch b/poky/meta/recipes-graphics/vulkan/vulkan-validation-layers/0001-scripts-CMakeLists.txt-append-to-CMAKE_FIND_ROOT_PAT.patch deleted file mode 100644 index 4db686fe2f..0000000000 --- a/poky/meta/recipes-graphics/vulkan/vulkan-validation-layers/0001-scripts-CMakeLists.txt-append-to-CMAKE_FIND_ROOT_PAT.patch +++ /dev/null @@ -1,28 +0,0 @@ -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/poky/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.250.0.bb b/poky/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.261.1.bb index 62c6343c45..1e2a0acedb 100644 --- a/poky/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.250.0.bb +++ b/poky/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.261.1.bb @@ -5,13 +5,11 @@ HOMEPAGE = "https://www.khronos.org/vulkan/" BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-ValidationLayers" SECTION = "libs" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8df9e8826734226d08cb412babfa599c" +LICENSE = "Apache-2.0 & MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd3c0bc366cd9b6a906e22f0bcb5910f" -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" +SRC_URI = "git://git@github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=sdk-1.3.261;protocol=https" +SRCREV = "628cd310bef6d54b4e6b25b5ac2ed013473409d6" S = "${WORKDIR}/git" |