From 4aa75194e5e052b0119fdea8f40e72c69da7afc3 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 14 Jun 2023 11:29:13 +0200 Subject: vulkan: upgrade 1.3.243.0 -> 1.3.250.0 Add a patch to vulkan-tools that unbreaks cross-builds. (From OE-Core rev: 2c42e3a39cc1dfd6f145489e3e85dab17056e301) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-graphics/glslang/glslang_1.3.243.0.bb | 33 ---------------- meta/recipes-graphics/glslang/glslang_1.3.250.0.bb | 33 ++++++++++++++++ .../spir/spirv-headers_1.3.243.0.bb | 19 --------- .../spir/spirv-headers_1.3.250.0.bb | 19 +++++++++ .../recipes-graphics/spir/spirv-tools_1.3.243.0.bb | 46 ---------------------- .../recipes-graphics/spir/spirv-tools_1.3.250.0.bb | 46 ++++++++++++++++++++++ .../vulkan/vulkan-headers_1.3.243.0.bb | 27 ------------- .../vulkan/vulkan-headers_1.3.250.0.bb | 27 +++++++++++++ .../vulkan/vulkan-loader_1.3.243.0.bb | 42 -------------------- .../vulkan/vulkan-loader_1.3.250.0.bb | 42 ++++++++++++++++++++ ...keLists.txt-do-not-make-special-arrangeme.patch | 29 ++++++++++++++ .../vulkan/vulkan-tools_1.3.243.0.bb | 36 ----------------- .../vulkan/vulkan-tools_1.3.250.0.bb | 38 ++++++++++++++++++ 13 files changed, 234 insertions(+), 203 deletions(-) delete mode 100644 meta/recipes-graphics/glslang/glslang_1.3.243.0.bb create mode 100644 meta/recipes-graphics/glslang/glslang_1.3.250.0.bb delete mode 100644 meta/recipes-graphics/spir/spirv-headers_1.3.243.0.bb create mode 100644 meta/recipes-graphics/spir/spirv-headers_1.3.250.0.bb delete mode 100644 meta/recipes-graphics/spir/spirv-tools_1.3.243.0.bb create mode 100644 meta/recipes-graphics/spir/spirv-tools_1.3.250.0.bb delete mode 100644 meta/recipes-graphics/vulkan/vulkan-headers_1.3.243.0.bb create mode 100644 meta/recipes-graphics/vulkan/vulkan-headers_1.3.250.0.bb delete mode 100644 meta/recipes-graphics/vulkan/vulkan-loader_1.3.243.0.bb create mode 100644 meta/recipes-graphics/vulkan/vulkan-loader_1.3.250.0.bb create mode 100644 meta/recipes-graphics/vulkan/vulkan-tools/0001-scripts-CMakeLists.txt-do-not-make-special-arrangeme.patch delete mode 100644 meta/recipes-graphics/vulkan/vulkan-tools_1.3.243.0.bb create mode 100644 meta/recipes-graphics/vulkan/vulkan-tools_1.3.250.0.bb diff --git a/meta/recipes-graphics/glslang/glslang_1.3.243.0.bb b/meta/recipes-graphics/glslang/glslang_1.3.243.0.bb deleted file mode 100644 index c50d67a652..0000000000 --- a/meta/recipes-graphics/glslang/glslang_1.3.243.0.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "OpenGL / OpenGL ES Reference Compiler" -DESCRIPTION = "Glslang is the official reference compiler front end for the \ -OpenGL ES and OpenGL shading languages. It implements a strict interpretation \ -of the specifications for these languages. It is open and free for anyone to use, \ -either from a command line or programmatically." -SECTION = "graphics" -HOMEPAGE = "https://www.khronos.org/opengles/sdk/tools/Reference-Compiler" -LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3" - -SRCREV = "14e5a04e70057972eef8a40df422e30a3b70e4b5" -SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=main \ - file://0001-generate-glslang-pkg-config.patch \ - " -PE = "1" -# These recipes need to be updated in lockstep with each other: -# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools -# The tags versions should always be sdk-x.y.z, as this is what -# upstream considers a release. -UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" -S = "${WORKDIR}/git" - -inherit cmake python3native - -EXTRA_OECMAKE = " \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SHARED_LIBS=ON \ - -DENABLE_PCH=OFF \ - -DENABLE_CTEST=OFF \ - -DBUILD_EXTERNAL=OFF \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/glslang/glslang_1.3.250.0.bb b/meta/recipes-graphics/glslang/glslang_1.3.250.0.bb new file mode 100644 index 0000000000..6e9c666d46 --- /dev/null +++ b/meta/recipes-graphics/glslang/glslang_1.3.250.0.bb @@ -0,0 +1,33 @@ +SUMMARY = "OpenGL / OpenGL ES Reference Compiler" +DESCRIPTION = "Glslang is the official reference compiler front end for the \ +OpenGL ES and OpenGL shading languages. It implements a strict interpretation \ +of the specifications for these languages. It is open and free for anyone to use, \ +either from a command line or programmatically." +SECTION = "graphics" +HOMEPAGE = "https://www.khronos.org/opengles/sdk/tools/Reference-Compiler" +LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3" + +SRCREV = "d1517d64cfca91f573af1bf7341dc3a5113349c0" +SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=main \ + file://0001-generate-glslang-pkg-config.patch \ + " +PE = "1" +# These recipes need to be updated in lockstep with each other: +# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools +# The tags versions should always be sdk-x.y.z, as this is what +# upstream considers a release. +UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" +S = "${WORKDIR}/git" + +inherit cmake python3native + +EXTRA_OECMAKE = " \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_SHARED_LIBS=ON \ + -DENABLE_PCH=OFF \ + -DENABLE_CTEST=OFF \ + -DBUILD_EXTERNAL=OFF \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/spir/spirv-headers_1.3.243.0.bb b/meta/recipes-graphics/spir/spirv-headers_1.3.243.0.bb deleted file mode 100644 index e27c0a67dc..0000000000 --- a/meta/recipes-graphics/spir/spirv-headers_1.3.243.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Machine-readable files for the SPIR-V Registry" -SECTION = "graphics" -HOMEPAGE = "https://www.khronos.org/registry/spir-v" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d" - -SRCREV = "1feaf4414eb2b353764d01d88f8aa4bcc67b60db" -SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main" -PE = "1" -# These recipes need to be updated in lockstep with each other: -# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools -# The tags versions should always be sdk-x.y.z, as this is what -# upstream considers a release. -UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" -S = "${WORKDIR}/git" - -inherit cmake - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/spir/spirv-headers_1.3.250.0.bb b/meta/recipes-graphics/spir/spirv-headers_1.3.250.0.bb new file mode 100644 index 0000000000..d0a2e2e991 --- /dev/null +++ b/meta/recipes-graphics/spir/spirv-headers_1.3.250.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "Machine-readable files for the SPIR-V Registry" +SECTION = "graphics" +HOMEPAGE = "https://www.khronos.org/registry/spir-v" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d" + +SRCREV = "268a061764ee69f09a477a695bf6a11ffe311b8d" +SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main" +PE = "1" +# These recipes need to be updated in lockstep with each other: +# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools +# The tags versions should always be sdk-x.y.z, as this is what +# upstream considers a release. +UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" +S = "${WORKDIR}/git" + +inherit cmake + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/spir/spirv-tools_1.3.243.0.bb b/meta/recipes-graphics/spir/spirv-tools_1.3.243.0.bb deleted file mode 100644 index ba89c35c09..0000000000 --- a/meta/recipes-graphics/spir/spirv-tools_1.3.243.0.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "The SPIR-V Tools project provides an API and commands for \ -processing SPIR-V modules" -DESCRIPTION = "The project includes an assembler, binary module parser, \ -disassembler, validator, and optimizer for SPIR-V." -HOMEPAGE = "https://github.com/KhronosGroup/SPIRV-Tools" -SECTION = "graphics" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRCREV = "44d72a9b36702f093dd20815561a56778b2d181e" -SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https" -PE = "1" -# These recipes need to be updated in lockstep with each other: -# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools -# The tags versions should always be sdk-x.y.z, as this is what -# upstream considers a release. -UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" -S = "${WORKDIR}/git" - -inherit cmake - -DEPENDS = "spirv-headers" - -EXTRA_OECMAKE += "\ - -DSPIRV-Headers_SOURCE_DIR=${STAGING_EXECPREFIXDIR} \ - -DSPIRV_TOOLS_BUILD_STATIC=OFF \ - -DBUILD_SHARED_LIBS=ON \ - -DSPIRV_SKIP_TESTS=ON \ -" - -do_install:append:class-target() { - # Properly set _IMPORT_PREFIX in INTERFACE_LINK_LIBRARIES so that dependent - # tools can find the right library - sed -i ${D}${libdir}/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake \ - -e 's:INTERFACE_LINK_LIBRARIES.*$:INTERFACE_LINK_LIBRARIES "\$\{_IMPORT_PREFIX\}/${baselib}":' -} - -# all the libraries are unversioned, so don't pack it on PN-dev -SOLIBS = ".so" -FILES_SOLIBSDEV = "" - -PACKAGES =+ "${PN}-lesspipe" -FILES:${PN}-lesspipe = "${base_bindir}/spirv-lesspipe.sh" -RDEPENDS:${PN}-lesspipe += "${PN} bash" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/spir/spirv-tools_1.3.250.0.bb b/meta/recipes-graphics/spir/spirv-tools_1.3.250.0.bb new file mode 100644 index 0000000000..bde6ddd04b --- /dev/null +++ b/meta/recipes-graphics/spir/spirv-tools_1.3.250.0.bb @@ -0,0 +1,46 @@ +SUMMARY = "The SPIR-V Tools project provides an API and commands for \ +processing SPIR-V modules" +DESCRIPTION = "The project includes an assembler, binary module parser, \ +disassembler, validator, and optimizer for SPIR-V." +HOMEPAGE = "https://github.com/KhronosGroup/SPIRV-Tools" +SECTION = "graphics" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRCREV = "e7c6084fd1d6d6f5ac393e842728d8be309688ca" +SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https" +PE = "1" +# These recipes need to be updated in lockstep with each other: +# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools +# The tags versions should always be sdk-x.y.z, as this is what +# upstream considers a release. +UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" +S = "${WORKDIR}/git" + +inherit cmake + +DEPENDS = "spirv-headers" + +EXTRA_OECMAKE += "\ + -DSPIRV-Headers_SOURCE_DIR=${STAGING_EXECPREFIXDIR} \ + -DSPIRV_TOOLS_BUILD_STATIC=OFF \ + -DBUILD_SHARED_LIBS=ON \ + -DSPIRV_SKIP_TESTS=ON \ +" + +do_install:append:class-target() { + # Properly set _IMPORT_PREFIX in INTERFACE_LINK_LIBRARIES so that dependent + # tools can find the right library + sed -i ${D}${libdir}/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake \ + -e 's:INTERFACE_LINK_LIBRARIES.*$:INTERFACE_LINK_LIBRARIES "\$\{_IMPORT_PREFIX\}/${baselib}":' +} + +# all the libraries are unversioned, so don't pack it on PN-dev +SOLIBS = ".so" +FILES_SOLIBSDEV = "" + +PACKAGES =+ "${PN}-lesspipe" +FILES:${PN}-lesspipe = "${base_bindir}/spirv-lesspipe.sh" +RDEPENDS:${PN}-lesspipe += "${PN} bash" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/vulkan/vulkan-headers_1.3.243.0.bb b/meta/recipes-graphics/vulkan/vulkan-headers_1.3.243.0.bb deleted file mode 100644 index 6ddc35e5d8..0000000000 --- a/meta/recipes-graphics/vulkan/vulkan-headers_1.3.243.0.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "Vulkan Header files and API registry" -DESCRIPTION = "Vulkan is a 3D graphics and compute API providing cross-platform access \ -to modern GPUs with low overhead and targeting realtime graphics applications such as \ -games and interactive media. This package contains the development headers \ -for packages wanting to make use of Vulkan." -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" -SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol=https" - -SRCREV = "65ad768d8603671fc1085fe115019e72a595ced8" - -S = "${WORKDIR}/git" - -inherit cmake - -FILES:${PN} += "${datadir}/vulkan" -RDEPENDS:${PN} += "python3-core" - -# These recipes need to be updated in lockstep with each other: -# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools -# The tags versions should always be sdk-x.y.z, as this is what -# upstream considers a release. -UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" diff --git a/meta/recipes-graphics/vulkan/vulkan-headers_1.3.250.0.bb b/meta/recipes-graphics/vulkan/vulkan-headers_1.3.250.0.bb new file mode 100644 index 0000000000..2970767ff3 --- /dev/null +++ b/meta/recipes-graphics/vulkan/vulkan-headers_1.3.250.0.bb @@ -0,0 +1,27 @@ +SUMMARY = "Vulkan Header files and API registry" +DESCRIPTION = "Vulkan is a 3D graphics and compute API providing cross-platform access \ +to modern GPUs with low overhead and targeting realtime graphics applications such as \ +games and interactive media. This package contains the development headers \ +for packages wanting to make use of Vulkan." +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" +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol=https" + +SRCREV = "9e61870ecbd32514113b467e0a0c46f60ed222c7" + +S = "${WORKDIR}/git" + +inherit cmake + +FILES:${PN} += "${datadir}/vulkan" +RDEPENDS:${PN} += "python3-core" + +# These recipes need to be updated in lockstep with each other: +# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools +# The tags versions should always be sdk-x.y.z, as this is what +# upstream considers a release. +UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" diff --git a/meta/recipes-graphics/vulkan/vulkan-loader_1.3.243.0.bb b/meta/recipes-graphics/vulkan/vulkan-loader_1.3.243.0.bb deleted file mode 100644 index 20128667f1..0000000000 --- a/meta/recipes-graphics/vulkan/vulkan-loader_1.3.243.0.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "3D graphics and compute API common loader" -DESCRIPTION = "Vulkan is a new generation graphics and compute API \ -that provides efficient access to modern GPUs. These packages \ -provide only the common vendor-agnostic library loader, headers and \ -the vulkaninfo utility." -HOMEPAGE = "https://www.khronos.org/vulkan/" -BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Loader" -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.243;protocol=https" -SRCREV = "22407d7804f111fbc0e31fa0db592d658e19ae8b" - -S = "${WORKDIR}/git" - -REQUIRED_DISTRO_FEATURES = "vulkan" - -inherit cmake features_check pkgconfig - -DEPENDS += "vulkan-headers" - -EXTRA_OECMAKE = "\ - -DBUILD_TESTS=OFF \ - -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \ - -DASSEMBLER_WORKS=FALSE \ - -DVulkanHeaders_INCLUDE_DIR=${STAGING_INCDIR} \ - -DVulkanRegistry_DIR=${RECIPE_SYSROOT}/${datadir} \ - " - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" - -PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr" -PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland" - -RRECOMMENDS:${PN} = "mesa-vulkan-drivers" - -# These recipes need to be updated in lockstep with each other: -# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools -# The tags versions should always be sdk-x.y.z, as this is what -# upstream considers a release. -UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" diff --git a/meta/recipes-graphics/vulkan/vulkan-loader_1.3.250.0.bb b/meta/recipes-graphics/vulkan/vulkan-loader_1.3.250.0.bb new file mode 100644 index 0000000000..456c973406 --- /dev/null +++ b/meta/recipes-graphics/vulkan/vulkan-loader_1.3.250.0.bb @@ -0,0 +1,42 @@ +SUMMARY = "3D graphics and compute API common loader" +DESCRIPTION = "Vulkan is a new generation graphics and compute API \ +that provides efficient access to modern GPUs. These packages \ +provide only the common vendor-agnostic library loader, headers and \ +the vulkaninfo utility." +HOMEPAGE = "https://www.khronos.org/vulkan/" +BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Loader" +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" + +S = "${WORKDIR}/git" + +REQUIRED_DISTRO_FEATURES = "vulkan" + +inherit cmake features_check pkgconfig + +DEPENDS += "vulkan-headers" + +EXTRA_OECMAKE = "\ + -DBUILD_TESTS=OFF \ + -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \ + -DASSEMBLER_WORKS=FALSE \ + -DVulkanHeaders_INCLUDE_DIR=${STAGING_INCDIR} \ + -DVulkanRegistry_DIR=${RECIPE_SYSROOT}/${datadir} \ + " + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" + +PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr" +PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland" + +RRECOMMENDS:${PN} = "mesa-vulkan-drivers" + +# These recipes need to be updated in lockstep with each other: +# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools +# The tags versions should always be sdk-x.y.z, as this is what +# upstream considers a release. +UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" diff --git a/meta/recipes-graphics/vulkan/vulkan-tools/0001-scripts-CMakeLists.txt-do-not-make-special-arrangeme.patch b/meta/recipes-graphics/vulkan/vulkan-tools/0001-scripts-CMakeLists.txt-do-not-make-special-arrangeme.patch new file mode 100644 index 0000000000..6b70a1e62d --- /dev/null +++ b/meta/recipes-graphics/vulkan/vulkan-tools/0001-scripts-CMakeLists.txt-do-not-make-special-arrangeme.patch @@ -0,0 +1,29 @@ +From 9060e916ca05d34b56c62f2be0b4a77dd104e2aa Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +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 + +--- + 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/meta/recipes-graphics/vulkan/vulkan-tools_1.3.243.0.bb b/meta/recipes-graphics/vulkan/vulkan-tools_1.3.243.0.bb deleted file mode 100644 index dfdd716abd..0000000000 --- a/meta/recipes-graphics/vulkan/vulkan-tools_1.3.243.0.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Vulkan Utilities and Tools" -DESCRIPTION = "Assist development by enabling developers to verify their applications correct use of the Vulkan API." -HOMEPAGE = "https://www.khronos.org/vulkan/" -BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Tools" -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-1.3.243;protocol=https" -SRCREV = "18bdf5565f5d02831869785cbf758fa7b295b7d5" - -S = "${WORKDIR}/git" - -inherit cmake features_check pkgconfig -ANY_OF_DISTRO_FEATURES = "x11 wayland" -REQUIRED_DISTRO_FEATURES = "vulkan" - -DEPENDS += "vulkan-headers vulkan-loader" - -EXTRA_OECMAKE = "\ - -DBUILD_TESTS=OFF \ - -DBUILD_CUBE=OFF \ - -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \ - " - -# must choose x11 or wayland or both -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" - -PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr" -PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland" - -# These recipes need to be updated in lockstep with each other: -# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools -# The tags versions should always be sdk-x.y.z, as this is what -# upstream considers a release. -UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" diff --git a/meta/recipes-graphics/vulkan/vulkan-tools_1.3.250.0.bb b/meta/recipes-graphics/vulkan/vulkan-tools_1.3.250.0.bb new file mode 100644 index 0000000000..0346b380ee --- /dev/null +++ b/meta/recipes-graphics/vulkan/vulkan-tools_1.3.250.0.bb @@ -0,0 +1,38 @@ +SUMMARY = "Vulkan Utilities and Tools" +DESCRIPTION = "Assist development by enabling developers to verify their applications correct use of the Vulkan API." +HOMEPAGE = "https://www.khronos.org/vulkan/" +BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Tools" +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" + +S = "${WORKDIR}/git" + +inherit cmake features_check pkgconfig +ANY_OF_DISTRO_FEATURES = "x11 wayland" +REQUIRED_DISTRO_FEATURES = "vulkan" + +DEPENDS += "vulkan-headers vulkan-loader" + +EXTRA_OECMAKE = "\ + -DBUILD_TESTS=OFF \ + -DBUILD_CUBE=OFF \ + -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \ + " + +# must choose x11 or wayland or both +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" + +PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr" +PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland" + +# These recipes need to be updated in lockstep with each other: +# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools +# The tags versions should always be sdk-x.y.z, as this is what +# upstream considers a release. +UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" -- cgit v1.2.3-54-g00ecf