From c497caca66b746b50711c70dfbd8a4d9b81987bf Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Thu, 23 Nov 2023 13:28:58 +0100 Subject: [PATCH] lvgl: configure app dimensions in main recipe file instead of lv-drivers.inc This change isn't functional, but necessary if we want to be able to separate the logic in the include file and the demo recipe. This way the include file is agnostic and can be included into other recipes if needed. Signed-off-by: Gabriel Valcazar --- meta-digi-dey/recipes-graphics/lvgl/lv-drivers.inc | 4 ---- meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb | 9 +++++++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/meta-digi-dey/recipes-graphics/lvgl/lv-drivers.inc b/meta-digi-dey/recipes-graphics/lvgl/lv-drivers.inc index c10856d0a..aca56b15c 100644 --- a/meta-digi-dey/recipes-graphics/lvgl/lv-drivers.inc +++ b/meta-digi-dey/recipes-graphics/lvgl/lv-drivers.inc @@ -14,8 +14,6 @@ LVGL_CONFIG_USE_FBDEV = "${@bb.utils.contains('PACKAGECONFIG', 'fbdev', '1', '0' LVGL_CONFIG_USE_SDL = "${@bb.utils.contains('PACKAGECONFIG', 'sdl', '1', '0', d)}" LVGL_CONFIG_USE_WAYLAND = "${@bb.utils.contains('PACKAGECONFIG', 'wayland', '1', '0', d)}" -LVGL_CONFIG_HOR_RES ?= "800" -LVGL_CONFIG_VER_RES ?= "480" ALLOW_EMPTY:${PN} = "1" @@ -39,8 +37,6 @@ do_configure:append() { -e "s|\(^# define USE_SDL \).*|# define USE_SDL ${LVGL_CONFIG_USE_SDL}|g" \ \ -e "s|\(^# define USE_WAYLAND \).*|# define USE_WAYLAND ${LVGL_CONFIG_USE_WAYLAND}|g" \ - -e "s|\(^#define *LV_DRV_DISP_HOR_RES *\).*|\1${LVGL_CONFIG_HOR_RES}|g" \ - -e "s|\(^#define *LV_DRV_DISP_VER_RES *\).*|\1${LVGL_CONFIG_VER_RES}|g" \ \ -i "${S}/lv_drv_conf.h" } diff --git a/meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb b/meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb index 73224d4dd..eea723884 100644 --- a/meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb +++ b/meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb @@ -32,6 +32,9 @@ TARGET_CFLAGS += "-I${STAGING_INCDIR}/libdrm" # Change DRM card used for i.MX8-based platforms LVGL_CONFIG_DRM_CARD:mx8-generic-bsp = "/dev/dri/card1" +LVGL_CONFIG_HOR_RES ?= "800" +LVGL_CONFIG_VER_RES ?= "480" + do_configure:prepend() { if [ "${LVGL_CONFIG_USE_DRM}" -eq 1 ] ; then # Add libdrm build dependency @@ -47,6 +50,12 @@ do_configure:prepend() { # Add wayland build dependencies sed -i '/^target_link_libraries/ s@lvgl::drivers@& wayland-client wayland-cursor xkbcommon@' "${S}/CMakeLists.txt" fi + + # Configure the app's dimensions + sed -e "s|\(^#define *LV_DRV_DISP_HOR_RES *\).*|\1${LVGL_CONFIG_HOR_RES}|g" \ + -e "s|\(^#define *LV_DRV_DISP_VER_RES *\).*|\1${LVGL_CONFIG_VER_RES}|g" \ + \ + -i "${S}/lv_drv_conf.h" } do_install:append() {