From b27527bf53d4f72384c48e90be981b7272640db0 Mon Sep 17 00:00:00 2001
From: Mike Engel <Mike.Engel@digi.com>
Date: Fri, 29 Jan 2021 13:42:39 +0100
Subject: [PATCH] recipes-graphics: vulkan: Update recipes to new BSP release
 imx_5.4.70_2.3.0

Signed-off-by: Mike Engel <Mike.Engel@digi.com>
---
 .../recipes-graphics/vulkan/vulkan-loader_1.1.121.bbappend    | 4 ++++
 meta-digi-dey/recipes-graphics/vulkan/vulkan-tools_%.bbappend | 2 --
 .../vulkan/vulkan-validationlayers_%.bbappend                 | 3 ---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/meta-digi-dey/recipes-graphics/vulkan/vulkan-loader_1.1.121.bbappend b/meta-digi-dey/recipes-graphics/vulkan/vulkan-loader_1.1.121.bbappend
index 4bcbda8c8..a49e8a46c 100644
--- a/meta-digi-dey/recipes-graphics/vulkan/vulkan-loader_1.1.121.bbappend
+++ b/meta-digi-dey/recipes-graphics/vulkan/vulkan-loader_1.1.121.bbappend
@@ -4,5 +4,9 @@ PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '
 
 SRC_URI_append = " file://0001-STDIO-844-No-need-to-change-the-App-s-apiVersion-to-.patch"
 
+# The i.MX implementation is dynamically loaded, so it requires an
+# explicit runtime dependency.
+RRECOMMENDS_${PN}_append_imxgpu = " libvulkan-imx"
+
 COMPATIBLE_MACHINE = "(mx8)"
 COMPATIBLE_MACHINE_mx8mm = "(^$)"
diff --git a/meta-digi-dey/recipes-graphics/vulkan/vulkan-tools_%.bbappend b/meta-digi-dey/recipes-graphics/vulkan/vulkan-tools_%.bbappend
index 9d121953e..c088df979 100644
--- a/meta-digi-dey/recipes-graphics/vulkan/vulkan-tools_%.bbappend
+++ b/meta-digi-dey/recipes-graphics/vulkan/vulkan-tools_%.bbappend
@@ -4,7 +4,5 @@ PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '
 
 EXTRA_OECMAKE = "-DBUILD_CUBE=OFF"
 
-RDEPENDS_${PN} += "libvulkan-imx"
-
 COMPATIBLE_MACHINE = "(mx8)"
 COMPATIBLE_MACHINE_mx8mm = "(^$)"
diff --git a/meta-digi-dey/recipes-graphics/vulkan/vulkan-validationlayers_%.bbappend b/meta-digi-dey/recipes-graphics/vulkan/vulkan-validationlayers_%.bbappend
index fb6d88f86..88002489e 100644
--- a/meta-digi-dey/recipes-graphics/vulkan/vulkan-validationlayers_%.bbappend
+++ b/meta-digi-dey/recipes-graphics/vulkan/vulkan-validationlayers_%.bbappend
@@ -24,9 +24,6 @@ do_install_append () {
 FILES_SOLIBSDEV = ""
 FILES_${PN} += "${libdir}/libVkLayer_*.so"
 
-# The package libvulkan-imx is required to configure the imx-gpu-viv vulkan drivers for the validation layers
-RDEPENDS_${PN} += "libvulkan-imx"
-
 INSANE_SKIP_${PN} = "dev-so"
 
 COMPATIBLE_MACHINE = "(mx8)"