3 files changed, 26 insertions, 31 deletions

diff --git a/meta-oe/recipes-graphics/lvgl/lv-conf.inc b/meta-oe/recipes-graphics/lvgl/lv-conf.inc
index 69e42af922..d341c8a6da 100644
--- a/meta-oe/recipes-graphics/lvgl/lv-conf.inc
+++ b/meta-oe/recipes-graphics/lvgl/lv-conf.inc
@@ -7,7 +7,11 @@ PACKAGECONFIG[thorvg] = ",,"
 PACKAGECONFIG[sdl] = ",,virtual/libsdl2 libsdl2-image"
 
 # Add libdrm include if drm is selected in PACKAGECONFIG
-TARGET_CFLAGS += "${@bb.utils.contains('PACKAGECONFIG', 'drm', '-I${STAGING_INCDIR}/libdrm', '', d)}"
+LVGL_FLAGS += " \
+    ${@bb.utils.contains('PACKAGECONFIG', 'drm', '-I${STAGING_INCDIR}/libdrm', '', d)} \
+"
+CFLAGS += "${LVGL_FLAGS}"
+CXXFLAGS += "${LVGL_FLAGS}"
 
 LVGL_CONFIG_USE_DRM = "${@bb.utils.contains('PACKAGECONFIG', 'drm', '1', '0', d)}"
 
@@ -45,11 +49,7 @@ LVGL_CONFIG_USE_FLOAT = "${@bb.utils.contains('PACKAGECONFIG', 'thorvg', '1', '0
 
 DEBUG_BUILD ??= "0"
 
-ALLOW_EMPTY:${PN} = "1"
-
-EXTRA_OECMAKE += "-Dinstall:BOOL=ON -DLIB_INSTALL_DIR=${baselib}"
-
-do_configure:append() {
+do_configure:prepend() {
     # If there is a configuration template, start from that
     [ -r "${S}/lv_conf_template.h" ] && cp -Lv "${S}/lv_conf_template.h" "${S}/lv_conf.h"
 
diff --git a/meta-oe/recipes-graphics/lvgl/lvgl_9.2.2.bb b/meta-oe/recipes-graphics/lvgl/lvgl_9.2.2.bb
deleted file mode 100644
index 28306a1101..0000000000
--- a/meta-oe/recipes-graphics/lvgl/lvgl_9.2.2.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-# SPDX-FileCopyrightText: Huawei Inc.
-#
-# SPDX-License-Identifier: MIT
-
-HOMEPAGE = "https://lvgl.io/"
-DESCRIPTION = "LVGL is an OSS graphics library to create embedded GUI"
-SUMMARY = "Light and Versatile Graphics Library"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENCE.txt;md5=bf1198c89ae87f043108cea62460b03a"
-
-SRC_URI = "\
-        git://github.com/lvgl/lvgl;protocol=https;branch=release/v9.2 \
-    file://0001-thorvg-fix-build-with-gcc-15.patch \
-        "
-SRCREV = "7f07a129e8d77f4984fff8e623fd5be18ff42e74"
-
-inherit cmake
-
-EXTRA_OECMAKE = "-DLIB_INSTALL_DIR=${baselib} -DBUILD_SHARED_LIBS=ON"
-
-require lv-conf.inc
-
-do_install:append() {
-    install -m 0644 "${S}/lv_conf.h" "${D}${includedir}/${BPN}/lv_conf.h"
-}
diff --git a/meta-oe/recipes-graphics/lvgl/lvgl_9.4.0.bb b/meta-oe/recipes-graphics/lvgl/lvgl_9.4.0.bb
new file mode 100644
index 0000000000..04ee34a61f
--- /dev/null
+++ b/meta-oe/recipes-graphics/lvgl/lvgl_9.4.0.bb
@@ -0,0 +1,20 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+#
+# SPDX-License-Identifier: MIT
+
+SUMMARY = "Light and Versatile Graphics Library"
+DESCRIPTION = "LVGL is an OSS graphics library to create embedded GUIs."
+HOMEPAGE = "https://lvgl.io/"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENCE.txt;md5=4570b6241b4fced1d1d18eb691a0e083"
+
+SRC_URI = "git://github.com/lvgl/lvgl;protocol=https;branch=release/v9.4;tag=v9.4.0"
+
+SRCREV = "c016f72d4c125098287be5e83c0f1abed4706ee5"
+
+inherit cmake
+
+EXTRA_OECMAKE += "-DLIB_INSTALL_DIR=${baselib} -DBUILD_SHARED_LIBS=ON"
+
+require lv-conf.inc