vulkan-loader: Make the bbappend independent of the recipe version

Make Vulkan-loader bbappend version-agnostic.
Previously, recipe parsing failed whenever Vulkan-loader was updated in
openembedded-core because the bbappend targeted a fixed version.
The Vulkan-loader code referenced in the patch was modified in
commit: ecd88b5c6b1e4c07 ("Define _FILE_OFFSET_BITS=64 for 32 bit linux builds")
(introduced in version 1.3.296). Since then, two different patches are now required.
Add a conditional in vulkan-loader_%.bbappend to apply the correct patch based
on the Vulkan-loader version.

Signed-off-by: Benjamin Missey <benjamin.missey@non.se.com>

5 files changed, 4 insertions, 2 deletions

diff --git a/recipes-graphics/vulkan/vulkan-loader-1.3.275.0.imx/0001-LF-11869-change-mali-wsi-layer-activating-order.patch b/recipes-graphics/vulkan/vulkan-loader-older-1-3-296/0001-LF-11869-change-mali-wsi-layer-activating-order.patch
index da738aabe..da738aabe 100644
--- a/recipes-graphics/vulkan/vulkan-loader-1.3.275.0.imx/0001-LF-11869-change-mali-wsi-layer-activating-order.patch
+++ b/recipes-graphics/vulkan/vulkan-loader-older-1-3-296/0001-LF-11869-change-mali-wsi-layer-activating-order.patch
diff --git a/recipes-graphics/vulkan/vulkan-loader-1.4.335.0/0001-LF-11869-change-mali-wsi-layer-activating-order.patch b/recipes-graphics/vulkan/vulkan-loader/0001-LF-11869-change-mali-wsi-layer-activating-order.patch
index f54919cd9..f54919cd9 100644
--- a/recipes-graphics/vulkan/vulkan-loader-1.4.335.0/0001-LF-11869-change-mali-wsi-layer-activating-order.patch
+++ b/recipes-graphics/vulkan/vulkan-loader/0001-LF-11869-change-mali-wsi-layer-activating-order.patch
diff --git a/recipes-graphics/vulkan/vulkan-loader_%.bbappend b/recipes-graphics/vulkan/vulkan-loader_%.bbappend
index 8f28ab1be..ce120937a 100644
--- a/recipes-graphics/vulkan/vulkan-loader_%.bbappend
+++ b/recipes-graphics/vulkan/vulkan-loader_%.bbappend
@@ -1,3 +1,7 @@
+FILESEXTRAPATHS:prepend:imx-nxp-bsp := "${THISDIR}/${DIRPATCHVULKAN}:"
+
+DIRPATCHVULKAN = "vulkan-loader${@oe.utils.ifelse(bb.utils.vercmp_string_op('${PV}', '1.3.296', "<"), '-older-1-3-296', '')}"
+
 SRC_URI:append:imx-nxp-bsp = " \
     file://0001-LF-11869-change-mali-wsi-layer-activating-order.patch \
 "
diff --git a/recipes-graphics/vulkan/vulkan-loader_1.3.275.0.imx.bbappend b/recipes-graphics/vulkan/vulkan-loader_1.3.275.0.imx.bbappend
deleted file mode 100644
index 8cac41b53..000000000
--- a/recipes-graphics/vulkan/vulkan-loader_1.3.275.0.imx.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS:prepend:imx-nxp-bsp := "${THISDIR}/vulkan-loader-1.3.275.0.imx:"
diff --git a/recipes-graphics/vulkan/vulkan-loader_1.4.335.0.bbappend b/recipes-graphics/vulkan/vulkan-loader_1.4.335.0.bbappend
deleted file mode 100644
index 9f435742c..000000000
--- a/recipes-graphics/vulkan/vulkan-loader_1.4.335.0.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS:prepend:imx-nxp-bsp := "${THISDIR}/vulkan-loader-1.4.335.0:"