From 5e6003bf5add83d67cd8f704d1512ebf5ee18b6f Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 16 Nov 2022 18:15:35 +0100 Subject: imx-g2d-samples: update to 2.1, sha 5a38513 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update to the version used in lf5.15.52_2.1.0. imx-g2d-samples now is configured with the BUILD_IMPLEMENTATION environment variable which is expected to be set to one of dpu|gpu-drm|gpu-fbdev depending on the targeted SoC. Commit history: * 5a38513 wayland_dmabuf_test:Convert to xdg-shell * c8167c1 wayland_cf_test:Convert to xdg-shell * 2ccdebe wayland_shm_test:Convert to xdg-shell * 82169b8 LF-6057: g2d_wayland_dmabuf_test had no display * 63272d5 Add multiblit_test build for imx6/7 fbdev * 85ef72a rename extended_test to tiling_test * 2fbe894 YOCIMX-6294: Configure samples to build by implementation * 4f03293 README.md: Cleanup minor issues * 0b6981e MGS-6648 [#ccc] Add Test loop parameter in command line for power measurements Signed-off-by: Max Krummenacher --- recipes-graphics/imx-g2d/imx-g2d-samples_git.bb | 34 ++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb index 8368aefc..46bd3a55 100644 --- a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb +++ b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb @@ -10,15 +10,39 @@ PV = "2.1+git${SRCPV}" SRC_URI = "${GPU_G2D_SAMPLES_SRC};branch=${SRCBRANCH}" GPU_G2D_SAMPLES_SRC ?= "git://github.com/nxpmicro/g2d-samples.git;protocol=https" SRCBRANCH ?= "imx_2.1" -SRCREV = "3268f291a15b2d8d5f650f627764a52eb0a8fc15" +SRCREV = "5a38513b97ff83b46777cf73da3cbe37b4976498" S = "${WORKDIR}/git" inherit pkgconfig -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" - -PACKAGECONFIG[wayland] = "USE_WAYLAND=true,USE_WAYLAND=false,wayland-native wayland-protocols" +PACKAGECONFIG ??= "${PACKAGECONFIG_IMPLEMENTATION}" +PACKAGECONFIG_IMPLEMENTATION = "" +PACKAGECONFIG_IMPLEMENTATION:imxgpu2d:imxdpu = "dpu" +PACKAGECONFIG_IMPLEMENTATION:imxgpu2d = "gpu-drm" +PACKAGECONFIG_IMPLEMENTATION:imxgpu2d:imxfbdev = "gpu-fbdev" + +PACKAGECONFIG[dpu] = " \ + BUILD_IMPLEMENTATION=dpu, \ + , \ + imx-dpu-g2d wayland-native wayland-protocols, \ + , \ + , \ + gpu-drm gpu-fbdev" +PACKAGECONFIG[gpu-drm] = " \ + BUILD_IMPLEMENTATION=gpu-drm, \ + , \ + imx-gpu-g2d wayland-native wayland-protocols, \ + , \ + , \ + dpu gpu-fbdev" +PACKAGECONFIG[gpu-fbdev] = " \ + BUILD_IMPLEMENTATION=gpu-fbdev, \ + , \ + imx-gpu-g2d, \ + , \ + , \ + dpu gpu-drm" EXTRA_OEMAKE += " \ SDKTARGETSYSROOT=${STAGING_DIR_HOST} \ @@ -31,4 +55,6 @@ do_install() { FILES:${PN} += "/opt" +PACKAGE_ARCH = "${MACHINE_SOCARCH}" + COMPATIBLE_MACHINE = "(imxgpu2d)" -- cgit v1.2.3-54-g00ecf