vulkan: Update the downgrade 1.2.182.0.imx -> 1.3.239.0.imx

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>

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"
 PREFERRED_VERSION_libdrm:mx8-nxp-bsp ??= "2.4.115.imx"
 PREFERRED_VERSION_libdrm:mx9-nxp-bsp ??= "2.4.115.imx"
 
-PREFERRED_VERSION_vulkan-headers:imxvulkan           ??= "1.2.182.0.imx"
-PREFERRED_VERSION_vulkan-loader:imxvulkan            ??= "1.2.182.0.imx"
-PREFERRED_VERSION_vulkan-tools:imxvulkan             ??= "1.2.182.0.imx"
-PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.2.182.0.imx"
+PREFERRED_VERSION_vulkan-headers:imxvulkan           ??= "1.3.239.0.imx"
+PREFERRED_VERSION_vulkan-loader:imxvulkan            ??= "1.3.239.0.imx"
+PREFERRED_VERSION_vulkan-tools:imxvulkan             ??= "1.3.239.0.imx"
+PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.239.0.imx"
 
 # Use i.MX optee Version
 PREFERRED_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"
 
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=master;protocol=https"
+SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol=https"
 
-SRCREV = "37164a5726f7e6113810f9557903a117498421cf"
+SRCREV = "2bb0a23104ceffd9a28d5b7401f2cee7dae35bb8"
 
 S = "${WORKDIR}/git"
 
 inherit cmake
 
 FILES:${PN} += "${datadir}/vulkan"
+RDEPENDS:${PN} += "python3-core"
 
 UPSTREAM_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"
 
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac"
-SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;protocol=https;branch=master \
-           "
-SRCREV = "1896143df69d439b0933c1bb485f5a4587bdf2dc"
+SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-1.3.239;protocol=https"
+SRCREV = "fa421a02686e7f01c8e4af24650fa04374df8338"
 
 S = "${WORKDIR}/git"
 
@@ -29,7 +28,6 @@ EXTRA_OECMAKE = "\
                  -DVulkanRegistry_DIR=${RECIPE_SYSROOT}/${datadir} \
                  "
 
-# 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"
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"
 
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;protocol=https;branch=sdk-1.2.182"
-SRCREV = "9d3305731c3be8de05c9f223a79959d448506a37"
+SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=sdk-1.3.239;protocol=https"
+SRCREV = "84c61c463aecdda385de33b0149c7368119c23f6"
 
 S = "${WORKDIR}/git"
 
-inherit cmake features_check
+inherit cmake features_check pkgconfig
 ANY_OF_DISTRO_FEATURES = "x11 wayland"
 REQUIRED_DISTRO_FEATURES = "vulkan"
 
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"
 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.2.182;protocol=https"
-SRCREV = "91fcffa8eca1a9573c8d736a54a028035ed4e06c"
+SRC_URI = "git://git@github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=main;protocol=https"
+SRCREV = "60e58bc683807fa396b1287deace8b45cfd957a3"
 
 S = "${WORKDIR}/git"
 
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