From 782b20958aafb4778f71f99d851cec40fd5167bc Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Mon, 13 May 2024 12:21:12 +0200
Subject: [PATCH] freescale-layer: imx-gpu-viv: sync with meta-imx
 scarthgap-6.6.23-2.0.0

Even though these recipes are technically available in meta-freescale, the
imx-gpu-viv-6-overrides.inc file from meta-imx isn't. Port it and include it in
our recipes to make sure we have all of the iMX BSP customizations.

https://onedigi.atlassian.net/browse/DEL-9011
https://onedigi.atlassian.net/browse/DEL-9081

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 .../imx-gpu-viv/imx-gpu-viv-6-overrides.inc   | 23 +++++++++++++++++++
 .../imx-gpu-viv_6.4.11.p2.6-aarch32.bb        | 10 ++++++++
 ... imx-gpu-viv_6.4.11.p2.6-aarch32.bbappend} |  2 +-
 .../imx-gpu-viv_6.4.11.p2.6-aarch64.bb        | 10 ++++++++
 4 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6-overrides.inc
 create mode 100644 meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch32.bb
 rename meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/{imx-gpu-viv_6.4.3.p4.6-aarch32.bbappend => imx-gpu-viv_6.4.11.p2.6-aarch32.bbappend} (75%)
 create mode 100644 meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch64.bb

diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6-overrides.inc b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6-overrides.inc
new file mode 100644
index 000000000..22b62cbef
--- /dev/null
+++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6-overrides.inc
@@ -0,0 +1,23 @@
+require recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+
+### Section 1: Changes to be upstreamed ###
+
+DEPENDS:remove = "mesa"
+PACKAGES:remove = "libgl-imx libgl-imx-dev"
+PROVIDES:remove = "virtual/libgl"
+
+### Section 2: Changes to be kept in meta-imx ###
+
+PACKAGECONFIG ?= "valgrind"
+
+RDEPENDS:libopenvg-imx += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-gpuconfig', '', d)}"
+
+# FIXME: Don't add .so to main package
+FILES:libvulkan-imx += "${libdir}/libvulkan_VSI${SOLIBS}"
+INSANE_SKIP:libvulkan-imx += "dev-so"
+FILES:libopenvx-imx += "${libdir}/libOpenVX${SOLIBS}"
+INSANE_SKIP:libopenvx-imx += "dev-so dev-deps"
+FILES:libopencl-imx += "${libdir}/libOpenCL${SOLIBS}"
+INSANE_SKIP:libopencl-imx += "dev-so dev-deps"
+FILES:libvdk-imx += "${libdir}/libVDK*${SOLIBS}"
+INSANE_SKIP:libvdk-imx += "dev-so"
diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch32.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch32.bb
new file mode 100644
index 000000000..1e204a9e0
--- /dev/null
+++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch32.bb
@@ -0,0 +1,10 @@
+require imx-gpu-viv-6-overrides.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
+
+IMX_SRCREV_ABBREV = "bc7b6a2"
+
+SRC_URI[md5sum] = "d921b6daf89eba252b0b5b59abe0d690"
+SRC_URI[sha256sum] = "cf6e42c9c9a903cd933b767d411131390d237a4b92ecad579db57d54538707f3"
+
+COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp|mx6sx-nxp-bsp|mx6sl-nxp-bsp|mx7ulp-nxp-bsp)"
diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.6-aarch32.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch32.bbappend
similarity index 75%
rename from meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.6-aarch32.bbappend
rename to meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch32.bbappend
index 3bacb5d21..adbce3419 100644
--- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.6-aarch32.bbappend
+++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch32.bbappend
@@ -1,4 +1,4 @@
-# Copyright (C) 2023, Digi International Inc.
+# Copyright (C) 2023,2024, Digi International Inc.
 
 # We configure imx-gpu-viv driver as built-in, so there's no need to install
 # the module.
diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch64.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch64.bb
new file mode 100644
index 000000000..74cf324d1
--- /dev/null
+++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch64.bb
@@ -0,0 +1,10 @@
+require imx-gpu-viv-6-overrides.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
+
+IMX_SRCREV_ABBREV = "bc7b6a2"
+
+SRC_URI[md5sum] = "e6ac75617944d9a9dbba90f863f07e0f"
+SRC_URI[sha256sum] = "5fe828113b9b2801b3fd60cd15eadfd0ac747e5897ef7db7fa22f80e7dd8a8e1"
+
+COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"