2 files changed, 31 insertions, 27 deletions

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:mx8-nxp-bsp   = " \
+DEPENDS_MX8 = ""
+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:append:imxgpu    = ",HW_GPU_VIVANTE"
-FEATURES:append:imxgpu2d  = ",G2D"
-FEATURES:append:imxgpu3d  = ",OpenGLES2"
-FEATURES:append           = "${FEATURES_SOC}"
+FEATURES = "ConsoleHost,EarlyAccess,EGL,GoogleUnitTest,Lib_NlohmannJson,OpenVG,Test_RequireUserInputToExit,WindowHost"
+FEATURES:append:imxgpu = ",HW_GPU_VIVANTE"
+FEATURES:append:imxgpu2d = ",G2D"
+FEATURES:append:imxgpu3d = ",OpenGLES2"
+FEATURES:append = "${FEATURES_SOC}"
 
-FEATURES_SOC              = ""
-FEATURES_SOC:mx6q-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:mx8mm-nxp-bsp        = ",OpenCV4"
+FEATURES_SOC = ""
+FEATURES_SOC:mx6q-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:mx8mm-nxp-bsp = ",OpenCV4"
 
-EXTENSIONS               = "*"
-EXTENSIONS:mx6q-nxp-bsp  = "OpenGLES:GL_VIV_direct_texture,OpenGLES3:GL_EXT_geometry_shader,OpenGLES3:GL_EXT_tessellation_shader"
+EXTENSIONS = "*"
+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:mx8-nxp-bsp   = " \
+RDEPENDS_EMPTY_MAIN_PACKAGE_MX8 = ""
+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:mx8-nxp-bsp   = "vulkan-validation-layers vulkan-loader"
+RDEPENDS_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 \
 "