summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/machine/include/imx-base.inc12
-rw-r--r--recipes-downgrade/spir/spirv-headers_1.3.261.1.imx.bb (renamed from recipes-downgrade/spir/spirv-headers_1.3.239.0.imx.bb)9
-rw-r--r--recipes-downgrade/spir/spirv-tools_1.3.261.1.imx.bb (renamed from recipes-downgrade/spir/spirv-tools_1.3.239.0.imx.bb)10
-rw-r--r--recipes-downgrade/vulkan/vulkan-headers_1.3.261.1.imx.bb (renamed from recipes-downgrade/vulkan/vulkan-headers_1.3.239.0.imx.bb)10
-rw-r--r--recipes-downgrade/vulkan/vulkan-loader_1.3.261.1.imx.bb (renamed from recipes-downgrade/vulkan/vulkan-loader_1.3.239.0.imx.bb)8
-rw-r--r--recipes-downgrade/vulkan/vulkan-tools_1.3.261.1.imx.bb (renamed from recipes-downgrade/vulkan/vulkan-tools_1.3.239.0.imx.bb)8
-rw-r--r--recipes-downgrade/vulkan/vulkan-validation-layers_1.3.261.1.imx.bb (renamed from recipes-downgrade/vulkan/vulkan-validation-layers_1.3.239.0.imx.bb)16
-rw-r--r--recipes-graphics/vulkan/vulkan-loader_1.3.261.1.imx.bbappend (renamed from recipes-graphics/vulkan/vulkan-loader_1.3.239.0.imx.bbappend)2
8 files changed, 45 insertions, 30 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 9b8c1dc3..4b246842 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -587,12 +587,12 @@ PREFERRED_VERSION_libdrm:mx7-nxp-bsp ??= "2.4.116.imx"
587PREFERRED_VERSION_libdrm:mx8-nxp-bsp ??= "2.4.116.imx" 587PREFERRED_VERSION_libdrm:mx8-nxp-bsp ??= "2.4.116.imx"
588PREFERRED_VERSION_libdrm:mx9-nxp-bsp ??= "2.4.116.imx" 588PREFERRED_VERSION_libdrm:mx9-nxp-bsp ??= "2.4.116.imx"
589 589
590PREFERRED_VERSION_spirv-headers:imxvulkan ??= "1.3.239.0.imx" 590PREFERRED_VERSION_spirv-headers:imxvulkan ??= "1.3.261.1.imx"
591PREFERRED_VERSION_spirv-tools:imxvulkan ??= "1.3.239.0.imx" 591PREFERRED_VERSION_spirv-tools:imxvulkan ??= "1.3.261.1.imx"
592PREFERRED_VERSION_vulkan-headers:imxvulkan ??= "1.3.239.0.imx" 592PREFERRED_VERSION_vulkan-headers:imxvulkan ??= "1.3.261.1.imx"
593PREFERRED_VERSION_vulkan-loader:imxvulkan ??= "1.3.239.0.imx" 593PREFERRED_VERSION_vulkan-loader:imxvulkan ??= "1.3.261.1.imx"
594PREFERRED_VERSION_vulkan-tools:imxvulkan ??= "1.3.239.0.imx" 594PREFERRED_VERSION_vulkan-tools:imxvulkan ??= "1.3.261.1.imx"
595PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.239.0.imx" 595PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.261.1.imx"
596 596
597# Use i.MX optee Version 597# Use i.MX optee Version
598PREFERRED_VERSION_optee-os:mx8-nxp-bsp ??= "4.0.0.imx" 598PREFERRED_VERSION_optee-os:mx8-nxp-bsp ??= "4.0.0.imx"
diff --git a/recipes-downgrade/spir/spirv-headers_1.3.239.0.imx.bb b/recipes-downgrade/spir/spirv-headers_1.3.261.1.imx.bb
index afd59cbc..945f0879 100644
--- a/recipes-downgrade/spir/spirv-headers_1.3.239.0.imx.bb
+++ b/recipes-downgrade/spir/spirv-headers_1.3.261.1.imx.bb
@@ -1,15 +1,16 @@
1SUMMARY = "Machine-readable files for the SPIR-V Registry" 1SUMMARY = "Machine-readable files for the SPIR-V Registry"
2DESCRIPTION = "Headers are provided in the include directory, with up-to-date \
3headers in the unified1 subdirectory. Older headers are provided according to \
4their version."
5SECTION = "graphics" 2SECTION = "graphics"
6HOMEPAGE = "https://www.khronos.org/registry/spir-v" 3HOMEPAGE = "https://www.khronos.org/registry/spir-v"
7LICENSE = "MIT" 4LICENSE = "MIT"
8LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d" 5LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d"
9 6
10SRCREV = "d13b52222c39a7e9a401b44646f0ca3a640fbd47" 7SRCREV = "124a9665e464ef98b8b718d572d5f329311061eb"
11SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main" 8SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main"
12PE = "1" 9PE = "1"
10# These recipes need to be updated in lockstep with each other:
11# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
12# The tags versions should always be sdk-x.y.z, as this is what
13# upstream considers a release.
13UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" 14UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
14S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
15 16
diff --git a/recipes-downgrade/spir/spirv-tools_1.3.239.0.imx.bb b/recipes-downgrade/spir/spirv-tools_1.3.261.1.imx.bb
index 5109bb53..69042882 100644
--- a/recipes-downgrade/spir/spirv-tools_1.3.239.0.imx.bb
+++ b/recipes-downgrade/spir/spirv-tools_1.3.261.1.imx.bb
@@ -7,13 +7,17 @@ SECTION = "graphics"
7LICENSE = "Apache-2.0" 7LICENSE = "Apache-2.0"
8LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" 8LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
9 9
10SRCREV = "63de608daeb7e91fbea6d7477a50debe7cac57ce" 10SRCREV = "e553b884c7c9febaa4e52334f683641fb5f196a0"
11SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https" 11SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https"
12PE = "1" 12PE = "1"
13# These recipes need to be updated in lockstep with each other:
14# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
15# The tags versions should always be sdk-x.y.z, as this is what
16# upstream considers a release.
13UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" 17UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
14S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
15 19
16inherit cmake python3native 20inherit cmake
17 21
18DEPENDS = "spirv-headers" 22DEPENDS = "spirv-headers"
19 23
@@ -28,7 +32,7 @@ do_install:append:class-target() {
28 # Properly set _IMPORT_PREFIX in INTERFACE_LINK_LIBRARIES so that dependent 32 # Properly set _IMPORT_PREFIX in INTERFACE_LINK_LIBRARIES so that dependent
29 # tools can find the right library 33 # tools can find the right library
30 sed -i ${D}${libdir}/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake \ 34 sed -i ${D}${libdir}/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake \
31 -e 's:INTERFACE_LINK_LIBRARIES.*$:INTERFACE_LINK_LIBRARIES "\$\{_IMPORT_PREFIX\}/lib":' 35 -e 's:INTERFACE_LINK_LIBRARIES.*$:INTERFACE_LINK_LIBRARIES "\$\{_IMPORT_PREFIX\}/${baselib}":'
32} 36}
33 37
34# all the libraries are unversioned, so don't pack it on PN-dev 38# all the libraries are unversioned, so don't pack it on PN-dev
diff --git a/recipes-downgrade/vulkan/vulkan-headers_1.3.239.0.imx.bb b/recipes-downgrade/vulkan/vulkan-headers_1.3.261.1.imx.bb
index a6b30fa8..01eb14b9 100644
--- a/recipes-downgrade/vulkan/vulkan-headers_1.3.239.0.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-headers_1.3.261.1.imx.bb
@@ -7,11 +7,11 @@ HOMEPAGE = "https://www.khronos.org/vulkan/"
7BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Headers" 7BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Headers"
8SECTION = "libs" 8SECTION = "libs"
9 9
10LICENSE = "Apache-2.0" 10LICENSE = "Apache-2.0 & MIT"
11LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" 11LIC_FILES_CHKSUM = "file://LICENSE.md;md5=1bc355d8c4196f774c8b87ed1a8dd625"
12SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol=https" 12SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol=https"
13 13
14SRCREV = "2bb0a23104ceffd9a28d5b7401f2cee7dae35bb8" 14SRCREV = "85c2334e92e215cce34e8e0ed8b2dce4700f4a50"
15 15
16S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"
17 17
@@ -20,4 +20,8 @@ inherit cmake
20FILES:${PN} += "${datadir}/vulkan" 20FILES:${PN} += "${datadir}/vulkan"
21RDEPENDS:${PN} += "python3-core" 21RDEPENDS:${PN} += "python3-core"
22 22
23# These recipes need to be updated in lockstep with each other:
24# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
25# The tags versions should always be sdk-x.y.z, as this is what
26# upstream considers a release.
23UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" 27UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-downgrade/vulkan/vulkan-loader_1.3.239.0.imx.bb b/recipes-downgrade/vulkan/vulkan-loader_1.3.261.1.imx.bb
index e11f936a..01cbeafa 100644
--- a/recipes-downgrade/vulkan/vulkan-loader_1.3.239.0.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-loader_1.3.261.1.imx.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-1.3.239;protocol=https" 12SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=main;protocol=https"
13SRCREV = "fa421a02686e7f01c8e4af24650fa04374df8338" 13SRCREV = "afdd025ead2b63b2c73d900ab128a2d3b512cdf0"
14 14
15S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
16 16
@@ -35,4 +35,8 @@ PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SU
35 35
36RRECOMMENDS:${PN} = "mesa-vulkan-drivers" 36RRECOMMENDS:${PN} = "mesa-vulkan-drivers"
37 37
38# These recipes need to be updated in lockstep with each other:
39# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
40# The tags versions should always be sdk-x.y.z, as this is what
41# upstream considers a release.
38UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" 42UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-downgrade/vulkan/vulkan-tools_1.3.239.0.imx.bb b/recipes-downgrade/vulkan/vulkan-tools_1.3.261.1.imx.bb
index 934bd53e..7a7edc9e 100644
--- a/recipes-downgrade/vulkan/vulkan-tools_1.3.239.0.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-tools_1.3.261.1.imx.bb
@@ -6,8 +6,8 @@ SECTION = "libs"
6 6
7LICENSE = "Apache-2.0" 7LICENSE = "Apache-2.0"
8LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" 8LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
9SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=sdk-1.3.239;protocol=https" 9SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=main;protocol=https"
10SRCREV = "84c61c463aecdda385de33b0149c7368119c23f6" 10SRCREV = "a7da7027ca9fd0901639f02619c226da9c6036f1"
11 11
12S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
13 13
@@ -29,4 +29,8 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}"
29PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr" 29PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr"
30PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland" 30PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland"
31 31
32# These recipes need to be updated in lockstep with each other:
33# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
34# The tags versions should always be sdk-x.y.z, as this is what
35# upstream considers a release.
32UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" 36UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.239.0.imx.bb b/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.261.1.imx.bb
index 5f699c2b..1e2a0ace 100644
--- a/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.239.0.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.261.1.imx.bb
@@ -5,11 +5,11 @@ HOMEPAGE = "https://www.khronos.org/vulkan/"
5BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-ValidationLayers" 5BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-ValidationLayers"
6SECTION = "libs" 6SECTION = "libs"
7 7
8LICENSE = "Apache-2.0" 8LICENSE = "Apache-2.0 & MIT"
9LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8df9e8826734226d08cb412babfa599c" 9LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd3c0bc366cd9b6a906e22f0bcb5910f"
10 10
11SRC_URI = "git://git@github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=main;protocol=https" 11SRC_URI = "git://git@github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=sdk-1.3.261;protocol=https"
12SRCREV = "60e58bc683807fa396b1287deace8b45cfd957a3" 12SRCREV = "628cd310bef6d54b4e6b25b5ac2ed013473409d6"
13 13
14S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
15 15
@@ -18,16 +18,12 @@ REQUIRED_DISTRO_FEATURES = "vulkan"
18DEPENDS = "vulkan-headers vulkan-loader spirv-headers spirv-tools glslang" 18DEPENDS = "vulkan-headers vulkan-loader spirv-headers spirv-tools glslang"
19 19
20# BUILD_TESTS - Not required for OE builds 20# BUILD_TESTS - Not required for OE builds
21# BUILD_WERROR - There are too many compiler warnings/errors due to upgrades in version
22# of clang. Requiring a number of patches from upstream. Disable compiler
23# -Werror to bypass build issues.
24# USE_ROBIN_HOOD_HASHING - Provides substantial performance improvements on all platforms. 21# USE_ROBIN_HOOD_HASHING - Provides substantial performance improvements on all platforms.
25# Yocto project doesn't contain a recipe for package so disabled it. 22# Yocto project doesn't contain a recipe for package so disabled it.
26EXTRA_OECMAKE = "\ 23EXTRA_OECMAKE = "\
27 -DBUILD_TESTS=OFF \ 24 -DBUILD_TESTS=OFF \
28 -DBUILD_WERROR=OFF \
29 -DUSE_ROBIN_HOOD_HASHING=OFF \ 25 -DUSE_ROBIN_HOOD_HASHING=OFF \
30 -DGLSLANG_INSTALL_DIR=${STAGING_DATADIR} \ 26 -DGLSLANG_INSTALL_DIR=${STAGING_LIBDIR} \
31 -DVULKAN_HEADERS_INSTALL_DIR=${STAGING_EXECPREFIXDIR} \ 27 -DVULKAN_HEADERS_INSTALL_DIR=${STAGING_EXECPREFIXDIR} \
32 -DSPIRV_HEADERS_INSTALL_DIR=${STAGING_EXECPREFIXDIR} \ 28 -DSPIRV_HEADERS_INSTALL_DIR=${STAGING_EXECPREFIXDIR} \
33 " 29 "
@@ -35,7 +31,7 @@ EXTRA_OECMAKE = "\
35PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr" 31PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr"
36PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland" 32PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland"
37 33
38PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)}" 34PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)}"
39 35
40inherit cmake features_check pkgconfig 36inherit cmake features_check pkgconfig
41 37
diff --git a/recipes-graphics/vulkan/vulkan-loader_1.3.239.0.imx.bbappend b/recipes-graphics/vulkan/vulkan-loader_1.3.261.1.imx.bbappend
index 05f566a8..c1a9902b 100644
--- a/recipes-graphics/vulkan/vulkan-loader_1.3.239.0.imx.bbappend
+++ b/recipes-graphics/vulkan/vulkan-loader_1.3.261.1.imx.bbappend
@@ -5,3 +5,5 @@ INSANE_SKIP:${PN} += "dev-so"
5 5
6# Override default mesa drivers with i.MX GPU drivers 6# Override default mesa drivers with i.MX GPU drivers
7RRECOMMENDS:${PN}:imxvulkan = "libvulkan-imx" 7RRECOMMENDS:${PN}:imxvulkan = "libvulkan-imx"
8# Override default mesa drivers with i.MX GPU drivers
9RRECOMMENDS:${PN}:mx95-nxp-bsp = "mali-imx-libvulkan"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-13 12:01:00 +0000