29 files changed, 252 insertions, 213 deletions
diff --git a/recipes-graphics/devil/devil_1.8.0.bb b/recipes-graphics/devil/devil_1.8.0.bb
index dcbdf3ac1..4c37b6298 100644
--- a/recipes-graphics/devil/devil_1.8.0.bb
+++ b/recipes-graphics/devil/devil_1.8.0.bb
@@ -1,10 +1,12 @@
+SUMMARY = "Cross-platform image library"
 DESCRIPTION = "A full featured cross-platform image library"
+HOMEPAGE = "https://openil.sourceforge.net/"
 SECTION = "libs"
 LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1-only;md5=1a6d268fd218675ffea8be556788b780"
 PR = "r0"
-DEPENDS = "libpng jpeg tiff xz"
+DEPENDS = "jpeg libpng tiff xz"
 SRC_URI = "http://sourceforge.net/projects/openil/files/DevIL/${PV}/DevIL-${PV}.zip"
 SRC_URI[sha256sum] = "451337f392c65bfb83698a781370534dc63d7bafca21e9b37178df0518f7e895"
diff --git a/recipes-graphics/drm/libdrm_2.4.127.imx.bb b/recipes-graphics/drm/libdrm_2.4.127.imx.bb
index 198db014e..685e3f04a 100644
--- a/recipes-graphics/drm/libdrm_2.4.127.imx.bb
+++ b/recipes-graphics/drm/libdrm_2.4.127.imx.bb
@@ -7,9 +7,9 @@ HOMEPAGE = "http://dri.freedesktop.org"
 SECTION = "x11/base"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=9eb1f4831351ab42d762c40b3ebb7add \
-                    file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71"
+            file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71"
-PROVIDES = "drm"
 DEPENDS = "libpthread-stubs"
+PROVIDES = "drm"
 SRC_URI = "${IMX_LIBDRM_SRC};branch=${SRCBRANCH}"
 IMX_LIBDRM_SRC ?= "git://github.com/nxp-imx/libdrm-imx.git;protocol=https"
@@ -46,10 +46,6 @@ PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \
             ${PN}-intel ${PN}-exynos ${PN}-freedreno ${PN}-amdgpu \
             ${PN}-etnaviv"
-RRECOMMENDS:${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \
-                             ${PN}-exynos ${PN}-freedreno ${PN}-amdgpu \
-                             ${PN}-etnaviv"
 FILES:${PN}-tests = "${bindir}/*"
 FILES:${PN}-radeon = "${libdir}/libdrm_radeon.so.*"
 FILES:${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*"
@@ -60,6 +56,10 @@ FILES:${PN}-freedreno = "${libdir}/libdrm_freedreno.so.*"
 FILES:${PN}-amdgpu = "${libdir}/libdrm_amdgpu.so.* ${datadir}/${PN}/amdgpu.ids"
 FILES:${PN}-etnaviv = "${libdir}/libdrm_etnaviv.so.*"
+RRECOMMENDS:${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \
+                             ${PN}-exynos ${PN}-freedreno ${PN}-amdgpu \
+                             ${PN}-etnaviv"
 BBCLASSEXTEND = "native nativesdk"
 PACKAGES:prepend:imxgpu = "${PN}-vivante "
diff --git a/recipes-graphics/gli/gli_0.8.4.0.bb b/recipes-graphics/gli/gli_0.8.4.0.bb
index 14d6a75ed..f1ab37606 100644
--- a/recipes-graphics/gli/gli_0.8.4.0.bb
+++ b/recipes-graphics/gli/gli_0.8.4.0.bb
@@ -9,7 +9,7 @@ SECTION = "libs"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://readme.md;beginline=19;endline=20;md5=ab03b667ee630c1abb1add70365a50fb"
-SRC_URI = " \
+SRC_URI = "\
    git://github.com/g-truc/gli;protocol=https;branch=master \
 "
 SRCREV = "0c171ee87fcfe35a7e0e0445adef06f92e0b6a91"
diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.5.0.2.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.5.0.2.bb
index 94a876a94..320ba3017 100644
--- a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.5.0.2.bb
+++ b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.5.0.2.bb
@@ -2,12 +2,15 @@
 # Copyright 2017-2025 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
+SUMMARY = "i.MX DPU G2D library"
 DESCRIPTION = "G2D library using i.MX DPU"
+HOMEPAGE = "https://www.nxp.com/"
+SECTION = "graphics"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac" 
+LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
 DEPENDS = "libdrm ${LIBGAL_IMX}"
-LIBGAL_IMX        = ""
+LIBGAL_IMX = ""
 LIBGAL_IMX:imxviv = "libgal-imx"
 PROVIDES += "virtual/libg2d"
@@ -33,6 +36,8 @@ do_install () {
    cp -Pr ${S}/g2d/usr/include/* ${D}${includedir}
 }
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 INSANE_SKIP:append:libc-musl = " file-rdeps"
 RDEPENDS:${PN}:append:libc-musl = " gcompat"
@@ -42,5 +47,4 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_SYSROOT_STRIP = "1"
-PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 COMPATIBLE_MACHINE = "(imxdpu)"
diff --git a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
index af92476e1..147b0620c 100644
--- a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
+++ b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
@@ -1,5 +1,7 @@
 SUMMARY = "i.MX G2D Samples"
 DESCRIPTION = "Set of sample applications for i.MX G2D"
+HOMEPAGE = "https://github.com/nxp-imx/g2d-samples"
+SECTION = "graphics"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=0858ec9c7a80c4a2cf16e4f825a2cc91"
@@ -15,13 +17,13 @@ SRCREV = "22ca65feb57702832fbaca7f7c9c8d691466e649"
 inherit pkgconfig
 PACKAGECONFIG ??= "${PACKAGECONFIG_IMPLEMENTATION}"
-PACKAGECONFIG_IMPLEMENTATION                   = ""
+PACKAGECONFIG_IMPLEMENTATION = ""
-PACKAGECONFIG_IMPLEMENTATION:imxgpu2d:imxdpu   = "dpu"
+PACKAGECONFIG_IMPLEMENTATION:imxgpu2d:imxdpu = "dpu"
-PACKAGECONFIG_IMPLEMENTATION:mx95-nxp-bsp      = "dpu95"
+PACKAGECONFIG_IMPLEMENTATION:mx95-nxp-bsp = "dpu95"
-PACKAGECONFIG_IMPLEMENTATION:imxgpu2d          = "gpu-drm"
+PACKAGECONFIG_IMPLEMENTATION:imxgpu2d = "gpu-drm"
 PACKAGECONFIG_IMPLEMENTATION:imxgpu2d:imxfbdev = "gpu-fbdev"
-PACKAGECONFIG_IMPLEMENTATION:mx93-nxp-bsp      = "pxp"
+PACKAGECONFIG_IMPLEMENTATION:mx93-nxp-bsp = "pxp"
-PACKAGECONFIG_IMPLEMENTATION:mx943-nxp-bsp     = "pxp"
+PACKAGECONFIG_IMPLEMENTATION:mx943-nxp-bsp = "pxp"
 PACKAGECONFIG[dpu] = " \
    BUILD_IMPLEMENTATION=dpu, \
@@ -59,7 +61,7 @@ PACKAGECONFIG[pxp] = " \
    , \
    dpu dpu95 gpu-drm gpu-fbdev"
-EXTRA_OEMAKE += " \
+EXTRA_OEMAKE += "\
    SDKTARGETSYSROOT=${STAGING_DIR_HOST} \
    ${PACKAGECONFIG_CONFARGS} \
 "
@@ -68,8 +70,8 @@ do_install() {
    oe_runmake install DESTDIR=${D}
 }
-FILES:${PN} += "/opt"
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
+FILES:${PN} += "/opt"
 COMPATIBLE_MACHINE = "(imxgpu2d|mx93-nxp-bsp|mx943-nxp-bsp|mx95-nxp-bsp)"
diff --git a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p4.4.bb b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p4.4.bb
index 1a359676f..fbb937b18 100644
--- a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p4.4.bb
+++ b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p4.4.bb
@@ -3,7 +3,10 @@
 # Copyright 2018 (C) O.S. Systems Software LTDA.
 # Released under the MIT license (see COPYING.MIT for the terms)
+SUMMARY = "i.MX GPU G2D library"
 DESCRIPTION = "G2D library using i.MX GPU"
+HOMEPAGE = "https://www.nxp.com/"
+SECTION = "graphics"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
 DEPENDS = "libgal-imx"
@@ -19,7 +22,7 @@ S = "${UNPACKDIR}/${IMX_BIN_NAME}"
 inherit fsl-eula-unpack
-SOC_INSTALL_DIR               = "SOC_INSTALL_DIR_NOT_SET"
+SOC_INSTALL_DIR = "SOC_INSTALL_DIR_NOT_SET"
 SOC_INSTALL_DIR:mx8mm-nxp-bsp = "mx8mm"
 do_install () {
diff --git a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
index 2b848e89c..e99e8165a 100644
--- a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
+++ b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
@@ -2,7 +2,10 @@
 # Copyright 2017-2026 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
+SUMMARY = "i.MX PXP G2D library"
 DESCRIPTION = "G2D library using i.MX PXP"
+HOMEPAGE = "https://github.com/nxp-imx/imx-g2d-pxp"
+SECTION = "graphics"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a93b654673e1bc8398ed1f30e0813359"
@@ -18,7 +21,7 @@ SRCREV = "7dd4ca631b894a29389dadda5bd112cfa576b2d9"
 inherit use-imx-headers
 EXTRA_OEMAKE = "PLATFORM=${IMX_PLATFORM} INCLUDE='-I${STAGING_INCDIR_IMX}' DEST_DIR=${D}"
-IMX_PLATFORM:mx93-nxp-bsp  = "IMX93"
+IMX_PLATFORM:mx93-nxp-bsp = "IMX93"
 IMX_PLATFORM:mx943-nxp-bsp = "IMX943"
 do_install() {
diff --git a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb
index 5dea367a9..e846126b0 100644
--- a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb
+++ b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb
@@ -1,8 +1,11 @@
 # Copyright 2018 (C) O.S. Systems Software LTDA.
 SUMMARY = "Samples for OpenGL ES"
+DESCRIPTION = "OpenGL ES / EGL API tracing, replay and inspection tools for i.MX GPUs."
+HOMEPAGE = "https://github.com/nxp-imx/apitrace-imx"
+SECTION = "graphics"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50"
-DEPENDS = "zlib libpng procps"
+DEPENDS = "libpng procps zlib"
 SRC_URI = "git://github.com/nxp-imx/apitrace-imx.git;protocol=https;branch=imx_10.0 \
           file://0001-dlsym-workaround-glibc-2.34-build-failure.patch \
@@ -11,17 +14,17 @@ SRCREV = "522cb2981289b7ba20d6dd4b4bf75097e079815b"
 inherit cmake pkgconfig perlnative python3native
-PACKAGECONFIG ??= " \
+PACKAGECONFIG ??= "\
    egl \
    ${PACKAGECONFIG_BACKEND} \
    ${PACKAGECONFIG_GPU2D} \
 "
-PACKAGECONFIG_BACKEND = " \
+PACKAGECONFIG_BACKEND = "\
    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'waffle', \
       bb.utils.contains('DISTRO_FEATURES',     'x11',    'x11', \
                                                             '', d), d)} \
 "
-PACKAGECONFIG_GPU2D                 = ""
+PACKAGECONFIG_GPU2D = ""
 PACKAGECONFIG_GPU2D:imxviv:imxgpu2d = "vivante"
 PACKAGECONFIG[egl] = "-DENABLE_EGL=ON,-DENABLE_EGL=OFF,virtual/egl"
@@ -31,9 +34,11 @@ PACKAGECONFIG[waffle] = "-DENABLE_WAFFLE=ON,-DENABLE_WAFFLE=OFF,waffle"
 PACKAGECONFIG[x11] = "-DENABLE_X11=ON,-DENABLE_X11=OFF"
 PACKAGECONFIG[vivante] = "-DENABLE_VIVANTE=ON,-DENABLE_VIVANTE=OFF,virtual/libg2d"
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 SOLIBS = ".so"
 FILES_SOLIBSDEV = ""
-FILES:${PN} += " \
+FILES:${PN} += "\
    ${libdir}/apitrace/scripts/* \
    ${libdir}/apitrace/wrappers/* \
 "
@@ -43,7 +48,6 @@ EXTRA_OECMAKE += "\
    -DENABLE_STATIC_LIBSTDCXX=OFF \
    -DPython3_ROOT_DIR=/usr/bin/python3-native \
 "
-PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 COMPATIBLE_MACHINE = "(imxgpu)"
 SECURITY_CFLAGS:toolchain-clang = ""
diff --git a/recipes-graphics/imx-gpu-sdk/imx-gpu-sdk_6.1.1.bb b/recipes-graphics/imx-gpu-sdk/imx-gpu-sdk_6.1.1.bb
index e1510baf3..c51d112c2 100644
--- a/recipes-graphics/imx-gpu-sdk/imx-gpu-sdk_6.1.1.bb
+++ b/recipes-graphics/imx-gpu-sdk/imx-gpu-sdk_6.1.1.bb
@@ -1,5 +1,7 @@
 SUMMARY = "i.MX GPU SDK Samples"
 DESCRIPTION = "Set of sample applications for i.MX GPU"
+HOMEPAGE = "https://github.com/nxp-imx/gtec-demo-framework"
+SECTION = "graphics"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://License.md;md5=9d58a2573275ce8c35d79576835dbeb8"
@@ -7,8 +9,8 @@ DEPENDS_BACKEND = \
    "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', ' libxdg-shell wayland', \
        bb.utils.contains('DISTRO_FEATURES',     'x11',               ' xrandr', \
                                                                             '', d), d)}"
-DEPENDS_MX8       = ""
+DEPENDS_MX8 = ""
-DEPENDS_MX8:mx8-nxp-bsp   = " \
+DEPENDS_MX8:mx8-nxp-bsp = "\
    glslang-native \
    opencv \
    rapidopencl \
@@ -17,10 +19,10 @@ DEPENDS_MX8:mx8-nxp-bsp   = " \
    vulkan-headers \
    vulkan-loader \
 "
-DEPENDS_MX8:mx8mm-nxp-bsp = " \
+DEPENDS_MX8:mx8mm-nxp-bsp = "\
    opencv \
 "
-DEPENDS = " \
+DEPENDS = "\
    assimp \
    cmake-native \
    devil \
@@ -44,28 +46,27 @@ DEPENDS:append:imxgpu3d = " virtual/libgles2"
 require imx-gpu-sdk-src.inc
 WINDOW_SYSTEM = \
    "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'Wayland_XDG', \
        bb.utils.contains('DISTRO_FEATURES',     'x11',         'X11', \
                                                                 'FB', d), d)}"
-FEATURES                  = "ConsoleHost,EarlyAccess,EGL,GoogleUnitTest,Lib_NlohmannJson,OpenVG,Test_RequireUserInputToExit,WindowHost"
+FEATURES = "ConsoleHost,EarlyAccess,EGL,GoogleUnitTest,Lib_NlohmannJson,OpenVG,Test_RequireUserInputToExit,WindowHost"
-FEATURES:append:imxgpu    = ",HW_GPU_VIVANTE"
+FEATURES:append:imxgpu = ",HW_GPU_VIVANTE"
-FEATURES:append:imxgpu2d  = ",G2D"
+FEATURES:append:imxgpu2d = ",G2D"
-FEATURES:append:imxgpu3d  = ",OpenGLES2"
+FEATURES:append:imxgpu3d = ",OpenGLES2"
-FEATURES:append           = "${FEATURES_SOC}"
+FEATURES:append = "${FEATURES_SOC}"
-FEATURES_SOC              = ""
+FEATURES_SOC = ""
-FEATURES_SOC:mx6q-nxp-bsp         = ",OpenGLES3"
+FEATURES_SOC:mx6q-nxp-bsp = ",OpenGLES3"
-FEATURES_SOC:mx6dl-nxp-bsp        = ",OpenGLES3"
+FEATURES_SOC:mx6dl-nxp-bsp = ",OpenGLES3"
-FEATURES_SOC:mx8-nxp-bsp          = ",OpenCV4,Vulkan1.2,OpenGLES3.2,OpenCL1.2,OpenVX1.2"
+FEATURES_SOC:mx8-nxp-bsp = ",OpenCV4,Vulkan1.2,OpenGLES3.2,OpenCL1.2,OpenVX1.2"
-FEATURES_SOC:mx8mm-nxp-bsp        = ",OpenCV4"
+FEATURES_SOC:mx8mm-nxp-bsp = ",OpenCV4"
-EXTENSIONS               = "*"
+EXTENSIONS = "*"
-EXTENSIONS:mx6q-nxp-bsp  = "OpenGLES:GL_VIV_direct_texture,OpenGLES3:GL_EXT_geometry_shader,OpenGLES3:GL_EXT_tessellation_shader"
+EXTENSIONS:mx6q-nxp-bsp = "OpenGLES:GL_VIV_direct_texture,OpenGLES3:GL_EXT_geometry_shader,OpenGLES3:GL_EXT_tessellation_shader"
 EXTENSIONS:mx6dl-nxp-bsp = "OpenGLES:GL_VIV_direct_texture,OpenGLES3:GL_EXT_geometry_shader,OpenGLES3:GL_EXT_tessellation_shader"
-EXTENSIONS:mx8m-nxp-bsp  = "OpenGLES:GL_VIV_direct_texture,OpenGLES3:GL_EXT_color_buffer_float"
+EXTENSIONS:mx8m-nxp-bsp = "OpenGLES:GL_VIV_direct_texture,OpenGLES3:GL_EXT_color_buffer_float"
 EXTENSIONS:mx8mm-nxp-bsp = "*"
 do_compile () {
@@ -75,7 +76,7 @@ do_compile () {
    FslBuild.py -vvvvv -t sdk --UseFeatures [${FEATURES}] --UseExtensions [${EXTENSIONS}] --Variants [WindowSystem=${WINDOW_SYSTEM}] --BuildThreads ${@oe.utils.parallel_make(d)} -c install --CMakeInstallPrefix ${S}
 }
-REMOVALS = " \
+REMOVALS = "\
    GLES2/DeBayer \
    GLES2/DirectMultiSamplingVideoYUV \
    GLES3/DirectMultiSamplingVideoYUV \
@@ -108,7 +109,7 @@ INSANE_SKIP:${PN} += "already-stripped rpaths"
 # Unfortunately recipes with an empty main package, like header-only libraries,
 # are not included in the SDK. Use RDEPENDS as a workaround.
-RDEPENDS_EMPTY_MAIN_PACKAGE = " \
+RDEPENDS_EMPTY_MAIN_PACKAGE = "\
    fmt \
    gli \
    glm \
@@ -118,8 +119,8 @@ RDEPENDS_EMPTY_MAIN_PACKAGE = " \
    rapidjson \
    stb \
 "
-RDEPENDS_EMPTY_MAIN_PACKAGE_MX8       = ""
+RDEPENDS_EMPTY_MAIN_PACKAGE_MX8 = ""
-RDEPENDS_EMPTY_MAIN_PACKAGE_MX8:mx8-nxp-bsp   = " \
+RDEPENDS_EMPTY_MAIN_PACKAGE_MX8:mx8-nxp-bsp = "\
    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'libxdg-shell', '', d)} \
    rapidopencl \
    rapidopenvx \
@@ -128,10 +129,10 @@ RDEPENDS_EMPTY_MAIN_PACKAGE_MX8:mx8-nxp-bsp   = " \
 RDEPENDS_EMPTY_MAIN_PACKAGE_MX8:mx8mm-nxp-bsp = ""
 # vulkan-loader is dynamically loaded, so need to add an explicit
 # dependency
-RDEPENDS_VULKAN_LOADER       = ""
+RDEPENDS_VULKAN_LOADER = ""
-RDEPENDS_VULKAN_LOADER:mx8-nxp-bsp   = "vulkan-validation-layers vulkan-loader"
+RDEPENDS_VULKAN_LOADER:mx8-nxp-bsp = "vulkan-loader vulkan-validation-layers"
 RDEPENDS_VULKAN_LOADER:mx8mm-nxp-bsp = ""
-RDEPENDS:${PN} += " \
+RDEPENDS:${PN} += "\
    ${RDEPENDS_EMPTY_MAIN_PACKAGE} \
    ${RDEPENDS_EMPTY_MAIN_PACKAGE_MX8} \
    ${RDEPENDS_VULKAN_LOADER} \
diff --git a/recipes-graphics/imx-gpu-sdk/libxdg-shell.bb b/recipes-graphics/imx-gpu-sdk/libxdg-shell.bb
index a5637869a..56b89c159 100644
--- a/recipes-graphics/imx-gpu-sdk/libxdg-shell.bb
+++ b/recipes-graphics/imx-gpu-sdk/libxdg-shell.bb
@@ -1,8 +1,11 @@
 SUMMARY = "Provides XDG shell header and glue code library"
+DESCRIPTION = "XDG shell protocol header and glue-code library used by the i.MX GPU SDK samples."
+HOMEPAGE = "https://github.com/nxp-imx/gtec-demo-framework"
+SECTION = "graphics"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://${UNPACKDIR}/${BP}/License.md;md5=9d58a2573275ce8c35d79576835dbeb8"
-DEPENDS = "wayland-native wayland wayland-protocols"
+DEPENDS = "wayland wayland-native wayland-protocols"
 require imx-gpu-sdk-src.inc
@@ -12,7 +15,7 @@ S = "${UNPACKDIR}/${BP}/ThirdParty/Recipe/xdg-shell"
 inherit cmake pkgconfig
-EXTRA_OECMAKE = " \
+EXTRA_OECMAKE = "\
    -DWAYLAND_SCANNER=${STAGING_BINDIR_NATIVE}/wayland-scanner \
    -DWAYLAND_PROTOCOLS_DIR=${STAGING_DATADIR}/wayland-protocols \
 "
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
index 38f976c71..ea76e2af8 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -3,18 +3,19 @@
 # Copyright 2017-2024 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
+SUMMARY = "i.MX Vivante GPU driver"
 DESCRIPTION = "GPU driver and apps for i.MX"
 HOMEPAGE = "https://www.nxp.com/"
 SECTION = "libs"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ea25d099982d035af85d193c88a1b479"
-DEPENDS += " \
+DEPENDS += "\
    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \
       bb.utils.contains('DISTRO_FEATURES',     'x11', 'virtual/libx11 libxdamage libxext libxfixes', \
                                                       '', d), d)} \
 "
-DEPENDS += " \
+DEPENDS += "\
    ${@bb.utils.contains('DISTRO_FEATURES',     'x11', 'libxcb libxshmfence libxxf86vm', \
                                                       '', d)} \
 "
@@ -23,14 +24,14 @@ DEPENDS:append:mx8-nxp-bsp = " patchelf-native"
 DEPENDS:append:libc-musl = " gcompat"
-PROVIDES += " \
+PROVIDES += "\
    imx-gpu-viv \
    libgal-imx \
    virtual/egl \
    virtual/libopenvg \
    ${EXTRA_PROVIDES} \
 "
-EXTRA_PROVIDES = " \
+EXTRA_PROVIDES = "\
    ${PROVIDES_OPENCL} \
    ${PROVIDES_OPENVX} \
 "
@@ -43,21 +44,21 @@ EXTRA_PROVIDES:append:mx8-nxp-bsp = " \
    virtual/libgbm \
 "
-PROVIDES_OPENCL = " \
+PROVIDES_OPENCL = "\
    opencl-headers \
    opencl-clhpp \
    opencl-icd-loader \
    virtual/libopencl1 \
 "
-PROVIDES_OPENCL:mx7-nxp-bsp   = ""
+PROVIDES_OPENCL:mx7-nxp-bsp = ""
 PROVIDES_OPENCL:mx8mm-nxp-bsp = ""
 # Note: OpenVX is fully supported on i.MX 8 QuadMax and 8 QuadPlus.
 # However, only limited support is provided on other i.MX 8 machines
 # as needed for i.MX machine learning packages.
-PROVIDES_OPENVX                  = ""
+PROVIDES_OPENVX = ""
-PROVIDES_OPENVX:mx8-nxp-bsp      = "virtual/libopenvx"
+PROVIDES_OPENVX:mx8-nxp-bsp = "virtual/libopenvx"
-PROVIDES_OPENVX:mx8mm-nxp-bsp    = ""
+PROVIDES_OPENVX:mx8mm-nxp-bsp = ""
 RPROVIDES:${PN}:imxgpu3d += "imx-gpu-viv"
@@ -76,39 +77,39 @@ PACKAGECONFIG ?= ""
 PACKAGECONFIG[valgrind] = ""
 # Note : If you add a package here, to prevent a naming conflict see the python_anonymous() futher below
-PACKAGES =+ " \
+PACKAGES =+ "\
-        libgles1-imx libgles1-imx-dev \
+    libgles1-imx libgles1-imx-dev \
-        libgles2-imx libgles2-imx-dev \
+    libgles2-imx libgles2-imx-dev \
-        libgles3-imx-dev \
+    libgles3-imx-dev \
-        libglslc-imx libglslc-imx-dev \
+    libglslc-imx libglslc-imx-dev \
-        ${PACKAGES_OPENCL} \
+    ${PACKAGES_OPENCL} \
-        libopenvg-imx libopenvg-imx-dev \
+    libopenvg-imx libopenvg-imx-dev \
-        libvdk-imx libvdk-imx-dev \
+    libvdk-imx libvdk-imx-dev \
-        libegl-imx libegl-imx-dev \
+    libegl-imx libegl-imx-dev \
-        libgal-imx libgal-imx-dev \
+    libgal-imx libgal-imx-dev \
-        libvsc-imx \
+    libvsc-imx \
-        ${PACKAGES_GBM} \
+    ${PACKAGES_GBM} \
-        imx-gpu-viv-tools \
+    imx-gpu-viv-tools \
-        imx-gpu-viv-demos \
+    imx-gpu-viv-demos \
-        ${PACKAGES_VULKAN} \
+    ${PACKAGES_VULKAN} \
-        ${PACKAGES_OPENVX} \
+    ${PACKAGES_OPENVX} \
-        libnn-imx \
+    libnn-imx \
-        libspirv-imx \
+    libspirv-imx \
 "
-PACKAGES_GBM                  = ""
+PACKAGES_GBM = ""
-PACKAGES_GBM:mx8-nxp-bsp      = "libgbm-imx libgbm-imx-dev"
+PACKAGES_GBM:mx8-nxp-bsp = "libgbm-imx libgbm-imx-dev"
-PACKAGES_OPENCL               = "libclc-imx libopencl-imx libopencl-imx-dev"
+PACKAGES_OPENCL = "libclc-imx libopencl-imx libopencl-imx-dev"
-PACKAGES_OPENCL:mx7-nxp-bsp   = ""
+PACKAGES_OPENCL:mx7-nxp-bsp = ""
 PACKAGES_OPENCL:mx8mm-nxp-bsp = ""
 PACKAGES_OPENVX = \
    "${@bb.utils.contains("PROVIDES_OPENVX", "virtual/libopenvx", \
        "libopenvx-imx libopenvx-imx-dev", "", d)}"
-PACKAGES_VULKAN               = ""
+PACKAGES_VULKAN = ""
-PACKAGES_VULKAN:imxvulkan     = "libvulkan-imx libvulkan-imx-dev"
+PACKAGES_VULKAN:imxvulkan = "libvulkan-imx libvulkan-imx-dev"
 PACKAGES_VULKAN:mx8mm-nxp-bsp = "libvulkan-imx libvulkan-imx-dev"
 python __anonymous () {
@@ -166,16 +167,16 @@ IS_MX8:mx8-nxp-bsp = "1"
 PACKAGE_FP_TYPE = "hardfp"
-HAS_GBM     = "false"
+HAS_GBM = "false"
 HAS_GBM:mx8-nxp-bsp = "true"
-IMX_SOC        = "IMX_SOC_NOT_SET"
+IMX_SOC = "IMX_SOC_NOT_SET"
-IMX_SOC:mx8qm-nxp-bsp  = "mx8qm"
+IMX_SOC:mx8qm-nxp-bsp = "mx8qm"
 IMX_SOC:mx8qxp-nxp-bsp = "mx8qxp"
-IMX_SOC:mx8dx-nxp-bsp  = "mx8qxp"
+IMX_SOC:mx8dx-nxp-bsp = "mx8qxp"
-IMX_SOC:mx8mp-nxp-bsp  = "mx8mp"
+IMX_SOC:mx8mp-nxp-bsp = "mx8mp"
-IMX_SOC:mx8mq-nxp-bsp  = "mx8mq"
+IMX_SOC:mx8mq-nxp-bsp = "mx8mq"
-IMX_SOC:mx8mn-nxp-bsp  = "mx8mn"
+IMX_SOC:mx8mn-nxp-bsp = "mx8mn"
 IMX_SOC:mx8ulp-nxp-bsp = "mx8ulp"
 do_install () {
@@ -332,8 +333,8 @@ INSANE_SKIP:libgal-imx += "build-deps"
 FILES:libvsc-imx = "${libdir}/libVSC${SOLIBS}"
-FILES:libgbm-imx           = "${libdir}/libgbm*${REALSOLIBS} ${libdir}/libgbm${SOLIBS} ${libdir}/libgbm_viv${SOLIBS}"
+FILES:libgbm-imx = "${libdir}/libgbm*${REALSOLIBS} ${libdir}/libgbm${SOLIBS} ${libdir}/libgbm_viv${SOLIBS}"
-FILES:libgbm-imx-dev       = "${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h"
+FILES:libgbm-imx-dev = "${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h"
 RDEPENDS:libgbm-imx:append = " libdrm"
 INSANE_SKIP:libgbm-imx += "dev-so"
@@ -343,11 +344,11 @@ FILES:libvulkan-imx = "\
 FILES:libvulkan-imx-dev = "${includedir}/vulkan ${libdir}/libvulkan_VSI${SOLIBSDEV}"
 RPROVIDES:libvulkan-imx = "virtual-vulkan-icd"
-FILES:libspirv-imx = " \
+FILES:libspirv-imx = "\
    ${libdir}/libSPIRV_viv${SOLIBS} \
 "
-FILES:libopenvx-imx = " \
+FILES:libopenvx-imx = "\
    ${libdir}/libOpenVX${REALSOLIBS} \
    ${libdir}/libOpenVXC${SOLIBS} \
    ${libdir}/libOpenVXU${SOLIBS} \
@@ -356,7 +357,7 @@ FILES:libopenvx-imx = " \
 "
 FILES:libopenvx-imx-dev = "${includedir}/VX ${libdir}/libOpenVX${SOLIBSDEV}"
 RDEPENDS:libopenvx-imx = "${OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES}"
-OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES               = ""
+OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES = ""
 OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES:mx8qm-nxp-bsp = "libclc-imx libopencl-imx-dev"
 OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES:mx8mp-nxp-bsp = "libclc-imx libopencl-imx-dev"
 INSANE_SKIP:libopenvx-imx += "dev-deps"
@@ -387,8 +388,8 @@ FILES:libopencl-imx = "${libdir}/libOpenCL${REALSOLIBS} \
                       ${sysconfdir}/OpenCL/vendors/Vivante.icd"
 FILES:libopencl-imx-dev = "${includedir}/CL ${libdir}/libOpenCL${SOLIBSDEV}"
 RDEPENDS:libopencl-imx = "libclc-imx"
-RPROVIDES:libopencl-imx               = "virtual-opencl-icd"
+RPROVIDES:libopencl-imx = "virtual-opencl-icd"
-RPROVIDES:libopencl-imx:mx7-nxp-bsp   = ""
+RPROVIDES:libopencl-imx:mx7-nxp-bsp = ""
 RPROVIDES:libopencl-imx:mx8mm-nxp-bsp = ""
 FILES:libopenvg-imx = "${libdir}/libOpenVG*${REALSOLIBS} ${libdir}/libOpenVG*${SOLIBS}"
diff --git a/recipes-graphics/mali/mali-imx.inc b/recipes-graphics/mali/mali-imx.inc
index 97a1175e7..f3ef8f474 100644
--- a/recipes-graphics/mali/mali-imx.inc
+++ b/recipes-graphics/mali/mali-imx.inc
@@ -1,11 +1,13 @@
 SUMMARY = "Graphics libraries and driver for i.MX Mali GPU"
+DESCRIPTION = "Arm Mali GPU user-space graphics libraries and driver for i.MX SoCs."
+HOMEPAGE = "https://www.nxp.com/"
 SECTION = "libs"
-DEPENDS = " \
+DEPENDS = "\
    libdrm \
    vulkan-loader \
    wayland \
    wayland-protocols"
-PROVIDES = " \
+PROVIDES = "\
    virtual/egl \
    virtual/libgbm \
    virtual/libgles1 \
@@ -18,7 +20,7 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_SYSROOT_STRIP = "1"
-PACKAGES =+ " \
+PACKAGES =+ "\
    ${PN}-libegl     ${PN}-libegl-dev \
    ${PN}-libgbm     ${PN}-libgbm-dev \
    ${PN}-libgles1   ${PN}-libgles1-dev \
@@ -28,42 +30,42 @@ PACKAGES =+ " \
    ${PN}-opencl-icd ${PN}-opencl-icd-dev"
 # Since libmali.so is loaded by dlopen, include it in the main package
-FILES:${PN} += " \
+FILES:${PN} += "\
    ${libdir}/libmali.so \
    ${nonarch_base_libdir}/firmware"
 FILES_SOLIBSDEV = ""
 INSANE_SKIP:${PN} = "dev-so"
-FILES:${PN}-libegl = " \
+FILES:${PN}-libegl = "\
    ${libdir}/libEGL${SOLIBS}"
-FILES:${PN}-libgbm = " \
+FILES:${PN}-libgbm = "\
    ${libdir}/libgbm${SOLIBS}"
-FILES:${PN}-libgles1 = " \
+FILES:${PN}-libgles1 = "\
    ${libdir}/libGLESv1_CM${SOLIBS}"
-FILES:${PN}-libgles2 = " \
+FILES:${PN}-libgles2 = "\
    ${libdir}/libGLESv2${SOLIBS}"
-FILES:${PN}-opencl-icd = " \
+FILES:${PN}-opencl-icd = "\
    ${sysconfdir}/OpenCL"
 RPROVIDES:${PN}-opencl-icd = "virtual-opencl-icd"
-FILES:${PN}-libvulkan = " \
+FILES:${PN}-libvulkan = "\
    ${sysconfdir}/vulkan"
 RDEPENDS:${PN}-libvulkan = "vulkan-wsi-layer"
 RPROVIDES:${PN}-libvulkan = "virtual-vulkan-icd"
-FILES:${PN}-dev = " \
+FILES:${PN}-dev = "\
    ${bindir}/malisc"
-FILES:${PN}-libegl-dev = " \
+FILES:${PN}-libegl-dev = "\
    ${includedir}/EGL \
    ${includedir}/KHR \
    ${libdir}/libEGL${SOLIBSDEV} \
    ${libdir}/pkgconfig/egl.pc"
-FILES:${PN}-libgbm-dev = " \
+FILES:${PN}-libgbm-dev = "\
    ${includedir}/gbm.h \
    ${libdir}/libgbm${SOLIBSDEV} \
    ${libdir}/pkgconfig/gbm.pc"
 # Consolidate GLES dev packages
 PACKAGES =+ "${PN}-libgles-dev"
-FILES:${PN}-libgles-dev = " \
+FILES:${PN}-libgles-dev = "\
    ${includedir}/GLES* \
    ${libdir}/libGLES*${SOLIBSDEV} \
    ${libdir}/pkgconfig/gles*.pc"
@@ -78,7 +80,7 @@ RDEPENDS:${PN}-libgles1-dev = "${PN}-libgles-dev"
 RDEPENDS:${PN}-libgles2-dev = "${PN}-libgles-dev"
 RDEPENDS:${PN}-libgles3-dev = "${PN}-libgles-dev"
-FILES:${PN}-opencl-icd-dev = " \
+FILES:${PN}-opencl-icd-dev = "\
    ${bindir}/mali_clcc"
 python __anonymous() {
diff --git a/recipes-graphics/mesa/mesa-demos_%.bbappend b/recipes-graphics/mesa/mesa-demos_%.bbappend
index 7d3e7ca1c..fe2f5dd7f 100644
--- a/recipes-graphics/mesa/mesa-demos_%.bbappend
+++ b/recipes-graphics/mesa/mesa-demos_%.bbappend
@@ -9,18 +9,18 @@ SRC_URI:append:imxgpu = " \
 REQUIRED_DISTRO_FEATURES:remove:imxgpu = "x11"
-PACKAGECONFIG:remove = " \
+PACKAGECONFIG:remove = "\
    ${PACKAGECONFIG_REMOVE_IF_2D_ONLY} \
    ${PACKAGECONFIG_REMOVE_IF_GPU}"
-PACKAGECONFIG_REMOVE_IF_2D_ONLY          = ""
+PACKAGECONFIG_REMOVE_IF_2D_ONLY = ""
 PACKAGECONFIG_REMOVE_IF_2D_ONLY:imxgpu2d = "gles1 gles2"
 PACKAGECONFIG_REMOVE_IF_2D_ONLY:imxgpu3d = ""
-PACKAGECONFIG_REMOVE_IF_GPU              = ""
+PACKAGECONFIG_REMOVE_IF_GPU = ""
-PACKAGECONFIG_REMOVE_IF_GPU:imxgpu       = "x11"
+PACKAGECONFIG_REMOVE_IF_GPU:imxgpu = "x11"
 PACKAGECONFIG:append = " \
    ${PACKAGECONFIG_APPEND_IF_GPU}"
-PACKAGECONFIG_APPEND_IF_GPU        = ""
+PACKAGECONFIG_APPEND_IF_GPU = ""
 PACKAGECONFIG_APPEND_IF_GPU:imxgpu = "glu"
 PACKAGECONFIG[glu] = ",,libglu"
diff --git a/recipes-graphics/mesa/mesa-etnaviv-env_0.1.bb b/recipes-graphics/mesa/mesa-etnaviv-env_0.1.bb
index 2a5bc1568..9df4d4f40 100644
--- a/recipes-graphics/mesa/mesa-etnaviv-env_0.1.bb
+++ b/recipes-graphics/mesa/mesa-etnaviv-env_0.1.bb
@@ -1,15 +1,17 @@
 SUMMARY = "Mesa environment variables for etnaviv on xserver"
+DESCRIPTION = "Environment variable configuration to enable the etnaviv Mesa driver on the X server."
 HOMEPAGE = "https://github.com/Freescale/meta-freescale/"
+SECTION = "graphics"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
 SRC_URI = "\
    file://mesa-etnaviv.conf \
    file://mesa-etnaviv.sh \
 "
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 S = "${UNPACKDIR}"
 do_configure[noexec] = "1"
diff --git a/recipes-graphics/piglit/piglit_%.bbappend b/recipes-graphics/piglit/piglit_%.bbappend
index 0a4a3a4a4..57120b65d 100644
--- a/recipes-graphics/piglit/piglit_%.bbappend
+++ b/recipes-graphics/piglit/piglit_%.bbappend
@@ -4,19 +4,19 @@ SRC_URI += "file://0001-tests-Fix-cl-test-Include-Directories-error-Error-0-.pat
            file://0002-cl-Add-mutually-exclusive-memory-flags-for-CL_MEM_KE.patch"
 PACKAGECONFIG:append = " ${PACKAGECONFIG_APPEND}"
-PACKAGECONFIG:remove = " ${PACKAGECONFIG_REMOVE}"
+PACKAGECONFIG:remove = "${PACKAGECONFIG_REMOVE}"
-PACKAGECONFIG_APPEND ?= " \
+PACKAGECONFIG_APPEND ?= "\
    gbm \
    ${@bb.utils.filter('DISTRO_FEATURES', 'vulkan', d)}"
 PACKAGECONFIG_APPEND:append:imxviv:mx8-nxp-bsp = " opencl"
-PACKAGECONFIG_APPEND:imxgpu:mx6-nxp-bsp  = ""
+PACKAGECONFIG_APPEND:imxgpu:mx6-nxp-bsp = ""
-PACKAGECONFIG_APPEND:imxgpu:mx7-nxp-bsp  = ""
+PACKAGECONFIG_APPEND:imxgpu:mx7-nxp-bsp = ""
 PACKAGECONFIG_REMOVE ?= ""
-PACKAGECONFIG_REMOVE:imxgpu              = "glx"
+PACKAGECONFIG_REMOVE:imxgpu = "glx"
-PACKAGECONFIG_REMOVE:imxgpu:mx6-nxp-bsp  = "glx x11"
+PACKAGECONFIG_REMOVE:imxgpu:mx6-nxp-bsp = "glx x11"
-PACKAGECONFIG_REMOVE:imxgpu:mx7-nxp-bsp  = "glx x11"
+PACKAGECONFIG_REMOVE:imxgpu:mx7-nxp-bsp = "glx x11"
 PACKAGECONFIG[gbm] = "-DPIGLIT_USE_GBM=1,-DPIGLIT_USE_GBM=0,virtual/libgbm"
diff --git a/recipes-graphics/rapidopencl/rapidopencl_1.1.0.1.bb b/recipes-graphics/rapidopencl/rapidopencl_1.1.0.1.bb
index d4200d394..d770faeb9 100644
--- a/recipes-graphics/rapidopencl/rapidopencl_1.1.0.1.bb
+++ b/recipes-graphics/rapidopencl/rapidopencl_1.1.0.1.bb
@@ -1,4 +1,7 @@
 SUMMARY = "Experimental low level header only C++11 RAII wrapper classes for the OpenCL API"
+DESCRIPTION = "Experimental header-only C++11 RAII wrapper classes that manage OpenCL API object lifetimes automatically."
+HOMEPAGE = "https://github.com/Unarmed1000/RapidOpenCL"
+SECTION = "graphics"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b98f636daed34d12d11e25f3185c0204"
diff --git a/recipes-graphics/rapidopenvx/rapidopenvx_1.1.0.bb b/recipes-graphics/rapidopenvx/rapidopenvx_1.1.0.bb
index 049fca0fd..7db3a0cc4 100644
--- a/recipes-graphics/rapidopenvx/rapidopenvx_1.1.0.bb
+++ b/recipes-graphics/rapidopenvx/rapidopenvx_1.1.0.bb
@@ -1,4 +1,7 @@
 SUMMARY = "Low level header only C++11 RAII wrapper classes for the OpenVX API"
+DESCRIPTION = "Header-only C++11 RAII wrapper classes that manage OpenVX API object lifetimes automatically."
+HOMEPAGE = "https://github.com/Unarmed1000/RapidOpenVX"
+SECTION = "graphics"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b98f636daed34d12d11e25f3185c0204"
diff --git a/recipes-graphics/rapidvulkan/rapidvulkan_1.2.162.0.bb b/recipes-graphics/rapidvulkan/rapidvulkan_1.2.162.0.bb
index c37cf7411..5616b264b 100644
--- a/recipes-graphics/rapidvulkan/rapidvulkan_1.2.162.0.bb
+++ b/recipes-graphics/rapidvulkan/rapidvulkan_1.2.162.0.bb
@@ -1,4 +1,7 @@
 SUMMARY = "Low level header only C++11 RAII wrapper classes for the Vulkan API"
+DESCRIPTION = "Header-only C++11 RAII wrapper classes that manage Vulkan API object lifetimes automatically."
+HOMEPAGE = "https://github.com/Unarmed1000/RapidVulkan"
+SECTION = "graphics"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b98f636daed34d12d11e25f3185c0204"
@@ -7,7 +10,6 @@ DEPENDS = "vulkan-loader"
 SRC_URI = "git://github.com/Unarmed1000/RapidVulkan;protocol=https;branch=master"
 SRCREV = "e39a407c5ae880792d8843ada65a19dd26b3dca7"
 REQUIRED_DISTRO_FEATURES = "vulkan"
 inherit cmake features_check
diff --git a/recipes-graphics/vulkan/assimp_5.4.3.bb b/recipes-graphics/vulkan/assimp_5.4.3.bb
index ff4fb7719..c7d19c3f6 100644
--- a/recipes-graphics/vulkan/assimp_5.4.3.bb
+++ b/recipes-graphics/vulkan/assimp_5.4.3.bb
@@ -1,3 +1,4 @@
+SUMMARY = "Portable library to import 3D model formats"
 DESCRIPTION = "Open Asset Import Library is a portable Open Source library to import \
               various well-known 3D model formats in a uniform manner."
 HOMEPAGE = "http://www.assimp.org/"
diff --git a/recipes-graphics/vulkan/vulkan-loader_%.bbappend b/recipes-graphics/vulkan/vulkan-loader_%.bbappend
index ce120937a..1e506c01b 100644
--- a/recipes-graphics/vulkan/vulkan-loader_%.bbappend
+++ b/recipes-graphics/vulkan/vulkan-loader_%.bbappend
@@ -9,6 +9,6 @@ SRC_URI:append:imx-nxp-bsp = " \
 PACKAGE_ARCH:imx-nxp-bsp = "${MACHINE_SOCARCH}"
 # libvulkan.so is loaded dynamically, so put it in the main package
-SOLIBS:imx-nxp-bsp          = ".so*"
+SOLIBS:imx-nxp-bsp = ".so*"
 FILES_SOLIBSDEV:imx-nxp-bsp = ""
 INSANE_SKIP:${PN}:imx-nxp-bsp += "dev-so"
diff --git a/recipes-graphics/vulkan/vulkan-wsi-layer_git.bb b/recipes-graphics/vulkan/vulkan-wsi-layer_git.bb
index 0118975a5..0bbebf5c2 100644
--- a/recipes-graphics/vulkan/vulkan-wsi-layer_git.bb
+++ b/recipes-graphics/vulkan/vulkan-wsi-layer_git.bb
@@ -1,4 +1,7 @@
+SUMMARY = "Vulkan WSI layer"
 DESCRIPTION = "Vulkan Window System Integration Layer"
+HOMEPAGE = "https://gitlab.freedesktop.org/mesa/vulkan-wsi-layer"
+SECTION = "graphics"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c2e771b72d60a13d2de384cb49055d00"
 DEPENDS = "libdrm vulkan-loader"
@@ -29,7 +32,7 @@ PACKAGECONFIG[wayland] = " \
    wayland wayland-native wayland-protocols,,, \
    headless"
-EXTRA_OECMAKE = " \
+EXTRA_OECMAKE = "\
    -DBUILD_WSI_DISPLAY=0 \
    -DBUILD_WSI_IMAGE_COMPRESSION_CONTROL_SWAPCHAIN=1 \
    -DCMAKE_BUILD_TYPE=Release \
diff --git a/recipes-graphics/waffle/waffle_%.bbappend b/recipes-graphics/waffle/waffle_%.bbappend
index fd375271f..1456655ee 100644
--- a/recipes-graphics/waffle/waffle_%.bbappend
+++ b/recipes-graphics/waffle/waffle_%.bbappend
@@ -5,12 +5,12 @@ SRC_URI:append:imxgpu = " \
    file://0002-meson-Separate-surfaceless-option-from-x11.patch \
 "
-PACKAGECONFIG_IMXGPU_X11          = ""
+PACKAGECONFIG_IMXGPU_X11 = ""
 PACKAGECONFIG_IMXGPU_X11:imxgpu3d = "x11-egl glx"
-PACKAGECONFIG_IMXGPU_GBM          = "gbm"
+PACKAGECONFIG_IMXGPU_GBM = "gbm"
-PACKAGECONFIG_IMXGPU_GBM:mx6-nxp-bsp      = ""
+PACKAGECONFIG_IMXGPU_GBM:mx6-nxp-bsp = ""
-PACKAGECONFIG_IMXGPU_GBM:mx7-nxp-bsp      = ""
+PACKAGECONFIG_IMXGPU_GBM:mx7-nxp-bsp = ""
-PACKAGECONFIG:imxgpu = " \
+PACKAGECONFIG:imxgpu = "\
    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland',                     'wayland', \
       bb.utils.contains('DISTRO_FEATURES',     'x11', '${PACKAGECONFIG_IMXGPU_X11}', \
                                                                                  '', d), d)} \
diff --git a/recipes-graphics/wayland/wayland-protocols_%.bbappend b/recipes-graphics/wayland/wayland-protocols_%.bbappend
index 762b47a31..041cb491a 100644
--- a/recipes-graphics/wayland/wayland-protocols_%.bbappend
+++ b/recipes-graphics/wayland/wayland-protocols_%.bbappend
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
-NXP_PATCHES = " \
+NXP_PATCHES = "\
    file://0001-unstable-Add-alpha-compositing-protocol.patch \
    file://0002-unstable-Add-hdr10-metadata-protocol.patch \
    file://0003-linux-dmabuf-support-passing-buffer-DTRC-meta-to-com.patch \
diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend
index 1b08b1955..c8c0470fe 100644
--- a/recipes-graphics/wayland/weston-init.bbappend
+++ b/recipes-graphics/wayland/weston-init.bbappend
@@ -1,14 +1,14 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 # OpenGL is not required for parts with GPU support for 2D but not 3D
-IMX_REQUIRED_DISTRO_FEATURES_REMOVE          = ""
+IMX_REQUIRED_DISTRO_FEATURES_REMOVE = ""
 IMX_REQUIRED_DISTRO_FEATURES_REMOVE:imxgpu2d = "opengl"
 IMX_REQUIRED_DISTRO_FEATURES_REMOVE:imxgpu3d = ""
 REQUIRED_DISTRO_FEATURES:remove = "${IMX_REQUIRED_DISTRO_FEATURES_REMOVE}"
 SRC_URI:append:mx6sl-nxp-bsp = " file://weston.config"
-PACKAGECONFIG ??= " \
+PACKAGECONFIG ??= "\
    no-idle-timeout \
    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xwayland', '', d)} \
    ${PACKAGECONFIG_GBM_FORMAT} \
@@ -20,34 +20,34 @@ PACKAGECONFIG ??= " \
 # Mainline BSPs dont support xwayland
 PACKAGECONFIG:remove:use-mainline-bsp = "xwayland"
-PACKAGECONFIG_GBM_FORMAT               ?= ""
+PACKAGECONFIG_GBM_FORMAT ?= ""
 PACKAGECONFIG_GBM_FORMAT:mx8mq-nxp-bsp ?= "gbm-format"
-PACKAGECONFIG_GBM_FORMAT:mx93-nxp-bsp  ?= "gbm-format"
+PACKAGECONFIG_GBM_FORMAT:mx93-nxp-bsp ?= "gbm-format"
 GBM_FORMAT_VALUE:mx8mq-nxp-bsp = "argb8888"
-GBM_FORMAT_VALUE:mx93-nxp-bsp  = "argb8888"
+GBM_FORMAT_VALUE:mx93-nxp-bsp = "argb8888"
-PACKAGECONFIG_REPAINT_WINDOW             ?= ""
+PACKAGECONFIG_REPAINT_WINDOW ?= ""
 PACKAGECONFIG_REPAINT_WINDOW:mx8-nxp-bsp ?= "repaint-window"
 PACKAGECONFIG_REPAINT_WINDOW:mx9-nxp-bsp ?= "repaint-window"
-PACKAGECONFIG_SIZE                     ?= ""
+PACKAGECONFIG_SIZE ?= ""
-PACKAGECONFIG_SIZE:mx8mq-nxp-bsp       ?= "size"
+PACKAGECONFIG_SIZE:mx8mq-nxp-bsp ?= "size"
 SIZE_VALUE:mx8mq-nxp-bsp = "1920x1080"
-HAS_G2D          = "false"
+HAS_G2D = "false"
 HAS_G2D:imxgpu2d = "true"
-PACKAGECONFIG_USE_G2D                ?= ""
+PACKAGECONFIG_USE_G2D ?= ""
-PACKAGECONFIG_USE_G2D:imxgpu2d       ?= "use-g2d"
+PACKAGECONFIG_USE_G2D:imxgpu2d ?= "use-g2d"
-PACKAGECONFIG_USE_G2D:mx8qm-nxp-bsp  ?= ""
+PACKAGECONFIG_USE_G2D:mx8qm-nxp-bsp ?= ""
 PACKAGECONFIG_USE_G2D:mx8qxp-nxp-bsp ?= ""
-PACKAGECONFIG_USE_G2D:mx8dx-nxp-bsp  ?= ""
+PACKAGECONFIG_USE_G2D:mx8dx-nxp-bsp ?= ""
-PACKAGECONFIG_USE_G2D:mx93-nxp-bsp   ?= "use-g2d"
+PACKAGECONFIG_USE_G2D:mx93-nxp-bsp ?= "use-g2d"
-PACKAGECONFIG_USE_G2D:mx943-nxp-bsp   ?= "use-g2d"
+PACKAGECONFIG_USE_G2D:mx943-nxp-bsp ?= "use-g2d"
-USE_G2D_VALUE             = "true"
+USE_G2D_VALUE = "true"
 USE_G2D_VALUE:mx6-nxp-bsp = "1"
 USE_G2D_VALUE:mx7-nxp-bsp = "1"
diff --git a/recipes-graphics/wayland/weston_10.0.5.imx.bb b/recipes-graphics/wayland/weston_10.0.5.imx.bb
index 991650fb9..2e1c136ff 100644
--- a/recipes-graphics/wayland/weston_10.0.5.imx.bb
+++ b/recipes-graphics/wayland/weston_10.0.5.imx.bb
@@ -31,8 +31,8 @@ inherit meson pkgconfig useradd
 #
 require ${THISDIR}/required-distro-features.inc
-DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0"
+DEPENDS = "cairo gdk-pixbuf glib-2.0 libinput libxkbcommon pango pixman \
-DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native"
+           virtual/egl wayland wayland-native wayland-protocols"
 LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'lto', '-Wl,-z,undefs', '', d)}"
@@ -103,29 +103,29 @@ PACKAGECONFIG[image-jpeg] = "-Dimage-jpeg=true,-Dimage-jpeg=false, jpeg"
 PACKAGECONFIG[launcher-libseat] = "-Dlauncher-libseat=true,-Dlauncher-libseat=false,seatd"
 do_install:append() {
-        # Weston doesn't need the .la files to load modules, so wipe them
+    # Weston doesn't need the .la files to load modules, so wipe them
-        rm -f ${D}/${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.la
+    rm -f ${D}/${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.la
-        # If X11, ship a desktop file to launch it
+    # If X11, ship a desktop file to launch it
-        if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then
+    if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then
-                install -d ${D}${datadir}/applications
+        install -d ${D}${datadir}/applications
-                install ${UNPACKDIR}/weston.desktop ${D}${datadir}/applications
+        install ${UNPACKDIR}/weston.desktop ${D}${datadir}/applications
-                install -d ${D}${datadir}/icons/hicolor/48x48/apps
+        install -d ${D}${datadir}/icons/hicolor/48x48/apps
-                install ${UNPACKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
+        install ${UNPACKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
-        fi
+    fi
-        if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then
+    if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then
-                install -Dm 644 ${UNPACKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland
+        install -Dm 644 ${UNPACKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland
-        fi
+    fi
-        if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then
+    if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then
-                install -Dm 644 ${UNPACKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify
+        install -Dm 644 ${UNPACKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify
-        fi
+    fi
-        if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then
+    if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then
-                chmod u+s ${D}${bindir}/weston-launch
+        chmod u+s ${D}${bindir}/weston-launch
-        fi
+    fi
 }
 PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)} \
@@ -156,7 +156,7 @@ GROUPADD_PARAM:${PN} = "--system weston-launch"
 SUMMARY = "Weston, a Wayland compositor, i.MX fork"
 LIC_FILES_CHKSUM:remove = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70"
-LIC_FILES_CHKSUM:append = "file://LICENSE;md5=d79ee9e66bb0f95d3386a7acae780b70"
+LIC_FILES_CHKSUM:append = " file://LICENSE;md5=d79ee9e66bb0f95d3386a7acae780b70"
 DEFAULT_PREFERENCE = "-1"
@@ -169,12 +169,12 @@ SRCBRANCH = "weston-imx-10.0.5"
 SRCREV = "5223a3c86177709d25f86a96622c0829da955a0e"
 # Disable OpenGL for parts with GPU support for 2D but not 3D
-REQUIRED_DISTRO_FEATURES          = "opengl"
+REQUIRED_DISTRO_FEATURES = "opengl"
 REQUIRED_DISTRO_FEATURES:imxgpu2d = ""
 REQUIRED_DISTRO_FEATURES:imxgpu3d = "opengl"
-PACKAGECONFIG_OPENGL              = "opengl"
+PACKAGECONFIG_OPENGL = "opengl"
-PACKAGECONFIG_OPENGL:imxgpu2d     = ""
+PACKAGECONFIG_OPENGL:imxgpu2d = ""
-PACKAGECONFIG_OPENGL:imxgpu3d     = "opengl"
+PACKAGECONFIG_OPENGL:imxgpu3d = "opengl"
 PACKAGECONFIG_IMX_REMOVALS ?= "wayland x11"
 PACKAGECONFIG:remove = "${PACKAGECONFIG_IMX_REMOVALS}"
@@ -182,7 +182,7 @@ PACKAGECONFIG:append = " ${@bb.utils.filter('DISTRO_FEATURES', '${PACKAGECONFIG_
 PACKAGECONFIG:remove:imxfbdev = "kms"
 PACKAGECONFIG:append:imxfbdev = " fbdev clients"
-PACKAGECONFIG:append:imxgpu   = " imxgpu"
+PACKAGECONFIG:append:imxgpu = " imxgpu"
 PACKAGECONFIG:append:imxgpu2d = " imxg2d"
 SIMPLECLIENTS:imxfbdev = "damage,im,egl,shm,touch,dmabuf-v4l"
diff --git a/recipes-graphics/wayland/weston_14.0.2.imx.bb b/recipes-graphics/wayland/weston_14.0.2.imx.bb
index 2c0b13d41..025c65d7a 100644
--- a/recipes-graphics/wayland/weston_14.0.2.imx.bb
+++ b/recipes-graphics/wayland/weston_14.0.2.imx.bb
@@ -32,8 +32,8 @@ inherit meson pkgconfig useradd
 #
 require ${THISDIR}/required-distro-features.inc
-DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0"
+DEPENDS = "cairo gdk-pixbuf glib-2.0 libdisplay-info libinput libxkbcommon \
-DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native libdisplay-info"
+           pango pixman virtual/egl wayland wayland-native wayland-protocols"
 LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'lto', '-Wl,-z,undefs', '', d)}"
@@ -103,29 +103,29 @@ PACKAGECONFIG[pipewire] = "-Dbackend-pipewire=true,-Dbackend-pipewire=false,pipe
 PACKAGECONFIG[vnc] = "-Dbackend-vnc=true,-Dbackend-vnc=false,neatvnc libpam"
 do_install:append() {
-        # Weston doesn't need the .la files to load modules, so wipe them
+    # Weston doesn't need the .la files to load modules, so wipe them
-        rm -f ${D}/${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.la
+    rm -f ${D}/${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.la
-        # If X11, ship a desktop file to launch it
+    # If X11, ship a desktop file to launch it
-        if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then
+    if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then
-                install -d ${D}${datadir}/applications
+        install -d ${D}${datadir}/applications
-                install ${UNPACKDIR}/weston.desktop ${D}${datadir}/applications
+        install ${UNPACKDIR}/weston.desktop ${D}${datadir}/applications
-                install -d ${D}${datadir}/icons/hicolor/48x48/apps
+        install -d ${D}${datadir}/icons/hicolor/48x48/apps
-                install ${UNPACKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
+        install ${UNPACKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
-        fi
+    fi
-        if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then
+    if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then
-                install -Dm 644 ${UNPACKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland
+        install -Dm 644 ${UNPACKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland
-        fi
+    fi
-        if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then
+    if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then
-                install -Dm 644 ${UNPACKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify
+        install -Dm 644 ${UNPACKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify
-        fi
+    fi
-        if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then
+    if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then
-                chmod u+s ${D}${bindir}/weston-launch
+        chmod u+s ${D}${bindir}/weston-launch
-        fi
+    fi
 }
 PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)} \
@@ -155,7 +155,7 @@ GROUPADD_PARAM:${PN} = "--system weston-launch"
 SUMMARY = "Weston, a Wayland compositor, i.MX fork"
 LIC_FILES_CHKSUM:remove = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70"
-LIC_FILES_CHKSUM +=       "file://LICENSE;md5=d79ee9e66bb0f95d3386a7acae780b70"
+LIC_FILES_CHKSUM += "file://LICENSE;md5=d79ee9e66bb0f95d3386a7acae780b70"
 DEFAULT_PREFERENCE = "-1"
@@ -169,12 +169,12 @@ PACKAGECONFIG:remove = "${PACKAGECONFIG_IMX_REMOVALS}"
 PACKAGECONFIG_IMX_REMOVALS ?= "wayland x11"
 PACKAGECONFIG:append = " ${PACKAGECONFIG_G2D} ${PACKAGECONFIG_PIPEWIRE}"
-PACKAGECONFIG_G2D               ??= ""
+PACKAGECONFIG_G2D ??= ""
-PACKAGECONFIG_G2D:imxgpu2d      ??= "imxg2d"
+PACKAGECONFIG_G2D:imxgpu2d ??= "imxg2d"
-PACKAGECONFIG_G2D:mx93-nxp-bsp  ??= "imxg2d"
+PACKAGECONFIG_G2D:mx93-nxp-bsp ??= "imxg2d"
 PACKAGECONFIG_G2D:mx943-nxp-bsp ??= "imxg2d"
-PACKAGECONFIG_PIPEWIRE             ??= ""
+PACKAGECONFIG_PIPEWIRE ??= ""
 PACKAGECONFIG_PIPEWIRE:mx8-nxp-bsp ??= "pipewire"
 PACKAGECONFIG_PIPEWIRE:mx9-nxp-bsp ??= "pipewire"
diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend b/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend
index 3fe677b34..4029ee84b 100644
--- a/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend
+++ b/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend
@@ -1,2 +1,2 @@
-# Append path for freescale layer to include bsp xorg.conf 
+# Append path for freescale layer to include bsp xorg.conf
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
index 161df0498..7b14cc454 100644
--- a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
+++ b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
@@ -2,8 +2,8 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 SRC_URI:append:use-mainline-bsp = " file://0001-Allow-to-enable-atomic-in-modesetting-DDX.patch"
-IMX_OPENGL_PKGCONFIGS_REMOVE        = ""
+IMX_OPENGL_PKGCONFIGS_REMOVE = ""
 IMX_OPENGL_PKGCONFIGS_REMOVE:imxgpu = "glamor"
-OPENGL_PKGCONFIGS:remove:mx6-nxp-bsp        = "${IMX_OPENGL_PKGCONFIGS_REMOVE}"
+OPENGL_PKGCONFIGS:remove:mx6-nxp-bsp = "${IMX_OPENGL_PKGCONFIGS_REMOVE}"
-OPENGL_PKGCONFIGS:remove:mx7-nxp-bsp        = "${IMX_OPENGL_PKGCONFIGS_REMOVE}"
+OPENGL_PKGCONFIGS:remove:mx7-nxp-bsp = "${IMX_OPENGL_PKGCONFIGS_REMOVE}"
-OPENGL_PKGCONFIGS:remove:imxdrm     = "dri glx"
+OPENGL_PKGCONFIGS:remove:imxdrm = "dri glx"
diff --git a/recipes-graphics/xwayland/xwayland_%.bbappend b/recipes-graphics/xwayland/xwayland_%.bbappend
index d8f5bdde5..fc0d10e74 100644
--- a/recipes-graphics/xwayland/xwayland_%.bbappend
+++ b/recipes-graphics/xwayland/xwayland_%.bbappend
@@ -5,7 +5,7 @@ SRC_URI:append:imxgpu = " \
 "
 OPENGL_PKGCONFIGS:remove:imxgpu = "${OPENGL_PKGCONFIGS_REMOVE_IMXGPU}"
-OPENGL_PKGCONFIGS_REMOVE_IMXGPU             = ""
+OPENGL_PKGCONFIGS_REMOVE_IMXGPU = ""
 OPENGL_PKGCONFIGS_REMOVE_IMXGPU:imx-nxp-bsp = "glamor glx"
 OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx8-nxp-bsp = "glx"