summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/machine/include/imx-base.inc8
-rw-r--r--recipes-downgrade/vulkan/vulkan-headers_1.3.239.0.imx.bb (renamed from recipes-downgrade/vulkan/vulkan-headers_1.2.182.0.imx.bb)5
-rw-r--r--recipes-downgrade/vulkan/vulkan-loader_1.3.239.0.imx.bb (renamed from recipes-downgrade/vulkan/vulkan-loader_1.2.182.0.imx.bb)6
-rw-r--r--recipes-downgrade/vulkan/vulkan-tools_1.3.239.0.imx.bb (renamed from recipes-downgrade/vulkan/vulkan-tools_1.2.182.0.imx.bb)6
-rw-r--r--recipes-downgrade/vulkan/vulkan-validation-layers_1.3.239.0.imx.bb (renamed from recipes-downgrade/vulkan/vulkan-validation-layers_1.2.182.0.imx.bb)4
-rw-r--r--recipes-graphics/vulkan/vulkan-loader_1.3.239.0.imx.bbappend (renamed from recipes-graphics/vulkan/vulkan-loader_1.2.182.0.imx.bbappend)0
6 files changed, 14 insertions, 15 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index c1b688b1..8db97110 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -584,10 +584,10 @@ PREFERRED_VERSION_libdrm:mx7-nxp-bsp ??= "2.4.115.imx"
584PREFERRED_VERSION_libdrm:mx8-nxp-bsp ??= "2.4.115.imx" 584PREFERRED_VERSION_libdrm:mx8-nxp-bsp ??= "2.4.115.imx"
585PREFERRED_VERSION_libdrm:mx9-nxp-bsp ??= "2.4.115.imx" 585PREFERRED_VERSION_libdrm:mx9-nxp-bsp ??= "2.4.115.imx"
586 586
587PREFERRED_VERSION_vulkan-headers:imxvulkan ??= "1.2.182.0.imx" 587PREFERRED_VERSION_vulkan-headers:imxvulkan ??= "1.3.239.0.imx"
588PREFERRED_VERSION_vulkan-loader:imxvulkan ??= "1.2.182.0.imx" 588PREFERRED_VERSION_vulkan-loader:imxvulkan ??= "1.3.239.0.imx"
589PREFERRED_VERSION_vulkan-tools:imxvulkan ??= "1.2.182.0.imx" 589PREFERRED_VERSION_vulkan-tools:imxvulkan ??= "1.3.239.0.imx"
590PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.2.182.0.imx" 590PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.239.0.imx"
591 591
592# Use i.MX optee Version 592# Use i.MX optee Version
593PREFERRED_VERSION_optee-os:mx8-nxp-bsp ??= "3.21.0.imx" 593PREFERRED_VERSION_optee-os:mx8-nxp-bsp ??= "3.21.0.imx"
diff --git a/recipes-downgrade/vulkan/vulkan-headers_1.2.182.0.imx.bb b/recipes-downgrade/vulkan/vulkan-headers_1.3.239.0.imx.bb
index 7c7d3e39..a6b30fa8 100644
--- a/recipes-downgrade/vulkan/vulkan-headers_1.2.182.0.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-headers_1.3.239.0.imx.bb
@@ -9,14 +9,15 @@ SECTION = "libs"
9 9
10LICENSE = "Apache-2.0" 10LICENSE = "Apache-2.0"
11LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" 11LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
12SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=master;protocol=https" 12SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol=https"
13 13
14SRCREV = "37164a5726f7e6113810f9557903a117498421cf" 14SRCREV = "2bb0a23104ceffd9a28d5b7401f2cee7dae35bb8"
15 15
16S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"
17 17
18inherit cmake 18inherit cmake
19 19
20FILES:${PN} += "${datadir}/vulkan" 20FILES:${PN} += "${datadir}/vulkan"
21RDEPENDS:${PN} += "python3-core"
21 22
22UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" 23UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-downgrade/vulkan/vulkan-loader_1.2.182.0.imx.bb b/recipes-downgrade/vulkan/vulkan-loader_1.3.239.0.imx.bb
index 92bb241f..e11f936a 100644
--- a/recipes-downgrade/vulkan/vulkan-loader_1.2.182.0.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-loader_1.3.239.0.imx.bb
@@ -9,9 +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;protocol=https;branch=master \ 12SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-1.3.239;protocol=https"
13 " 13SRCREV = "fa421a02686e7f01c8e4af24650fa04374df8338"
14SRCREV = "1896143df69d439b0933c1bb485f5a4587bdf2dc"
15 14
16S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
17 16
@@ -29,7 +28,6 @@ EXTRA_OECMAKE = "\
29 -DVulkanRegistry_DIR=${RECIPE_SYSROOT}/${datadir} \ 28 -DVulkanRegistry_DIR=${RECIPE_SYSROOT}/${datadir} \
30 " 29 "
31 30
32# must choose x11 or wayland or both
33PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" 31PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}"
34 32
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" 33PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr"
diff --git a/recipes-downgrade/vulkan/vulkan-tools_1.2.182.0.imx.bb b/recipes-downgrade/vulkan/vulkan-tools_1.3.239.0.imx.bb
index 242b8973..934bd53e 100644
--- a/recipes-downgrade/vulkan/vulkan-tools_1.2.182.0.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-tools_1.3.239.0.imx.bb
@@ -6,12 +6,12 @@ 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;protocol=https;branch=sdk-1.2.182" 9SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=sdk-1.3.239;protocol=https"
10SRCREV = "9d3305731c3be8de05c9f223a79959d448506a37" 10SRCREV = "84c61c463aecdda385de33b0149c7368119c23f6"
11 11
12S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
13 13
14inherit cmake features_check 14inherit cmake features_check pkgconfig
15ANY_OF_DISTRO_FEATURES = "x11 wayland" 15ANY_OF_DISTRO_FEATURES = "x11 wayland"
16REQUIRED_DISTRO_FEATURES = "vulkan" 16REQUIRED_DISTRO_FEATURES = "vulkan"
17 17
diff --git a/recipes-downgrade/vulkan/vulkan-validation-layers_1.2.182.0.imx.bb b/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.239.0.imx.bb
index d72a22f5..5f699c2b 100644
--- a/recipes-downgrade/vulkan/vulkan-validation-layers_1.2.182.0.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.239.0.imx.bb
@@ -8,8 +8,8 @@ SECTION = "libs"
8LICENSE = "Apache-2.0" 8LICENSE = "Apache-2.0"
9LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8df9e8826734226d08cb412babfa599c" 9LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8df9e8826734226d08cb412babfa599c"
10 10
11SRC_URI = "git://git@github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=sdk-1.2.182;protocol=https" 11SRC_URI = "git://git@github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=main;protocol=https"
12SRCREV = "91fcffa8eca1a9573c8d736a54a028035ed4e06c" 12SRCREV = "60e58bc683807fa396b1287deace8b45cfd957a3"
13 13
14S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
15 15
diff --git a/recipes-graphics/vulkan/vulkan-loader_1.2.182.0.imx.bbappend b/recipes-graphics/vulkan/vulkan-loader_1.3.239.0.imx.bbappend
index 05f566a8..05f566a8 100644
--- a/recipes-graphics/vulkan/vulkan-loader_1.2.182.0.imx.bbappend
+++ b/recipes-graphics/vulkan/vulkan-loader_1.3.239.0.imx.bbappend