This is an automated email from the ASF dual-hosted git repository.
cederom pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git
The following commit(s) were added to refs/heads/master by this push:
new ded0a1751 graphics/lvgl: bump version to 9.2.2
ded0a1751 is described below
commit ded0a17514954cf8230b2e0a0f1fce63a5c69080
Author: Serg Podtynnyi <[email protected]>
AuthorDate: Wed Apr 22 22:13:59 2026 +0700
graphics/lvgl: bump version to 9.2.2
Update lvlg version to 9.2.2, includes fix for nuttx lcd release
Get version from config in Makefile
Get version from config in cmake file
Signed-off-by: Serg Podtynnyi <[email protected]>
---
graphics/lvgl/CMakeLists.txt | 15 ++++++++++++---
graphics/lvgl/Kconfig | 4 ++--
graphics/lvgl/Makefile | 7 +++++--
3 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/graphics/lvgl/CMakeLists.txt b/graphics/lvgl/CMakeLists.txt
index 352b5da59..ba5af28e2 100644
--- a/graphics/lvgl/CMakeLists.txt
+++ b/graphics/lvgl/CMakeLists.txt
@@ -27,12 +27,21 @@ if(CONFIG_GRAPHICS_LVGL)
#
############################################################################
set(LVGL_DIR ${CMAKE_CURRENT_LIST_DIR}/lvgl)
+ set(LVGL_VERSION
+
"${CONFIG_LVGL_VERSION_MAJOR}.${CONFIG_LVGL_VERSION_MINOR}.${CONFIG_LVGL_VERSION_PATCH}"
+ )
+
if(NOT EXISTS ${LVGL_DIR})
+ set(LVGL_URL
+ "https://github.com/lvgl/lvgl/archive/refs/tags/v${LVGL_VERSION}.zip";)
FetchContent_Declare(
lvgl_fetch
- DOWNLOAD_DIR ${CMAKE_CURRENT_LIST_DIR}
- URL "https://github.com/lvgl/lvgl/archive/refs/tags/v9.2.1.zip";
SOURCE_DIR
- ${CMAKE_CURRENT_LIST_DIR}/lvgl BINARY_DIR
+ URL ${LVGL_URL}
+ DOWNLOAD_DIR
+ ${CMAKE_CURRENT_LIST_DIR}
+ SOURCE_DIR
+ ${CMAKE_CURRENT_LIST_DIR}/lvgl
+ BINARY_DIR
${CMAKE_BINARY_DIR}/apps/graphics/lvgl/lvgl
DOWNLOAD_NO_PROGRESS true
TIMEOUT 120)
diff --git a/graphics/lvgl/Kconfig b/graphics/lvgl/Kconfig
index 4daf467f3..2d9ad2f8e 100644
--- a/graphics/lvgl/Kconfig
+++ b/graphics/lvgl/Kconfig
@@ -11,7 +11,7 @@ menuconfig GRAPHICS_LVGL
if GRAPHICS_LVGL
-# Kconfig file for LVGL v9.2.1
+# Kconfig file for LVGL v9.2.2
menu "LVGL configuration"
@@ -1495,7 +1495,7 @@ menu "LVGL configuration"
default 2 # LVGL_VERSION_MINOR
config LVGL_VERSION_PATCH
int
- default 1 # LVGL_VERSION_PATCH
+ default 2 # LVGL_VERSION_PATCH
endmenu
menu "Devices"
diff --git a/graphics/lvgl/Makefile b/graphics/lvgl/Makefile
index a81fac1eb..ce9ad6b7f 100644
--- a/graphics/lvgl/Makefile
+++ b/graphics/lvgl/Makefile
@@ -58,8 +58,11 @@ WD := ${shell echo $(CURDIR) | sed -e 's/ /\\ /g'}
CONFIG_GRAPH_LVGL_URL ?= "https://github.com/lvgl/lvgl/archive/refs/tags";
-LVGL_VERSION = 9.2.1
-LVGL_TARBALL = v$(LVGL_VERSION).zip
+_MAJ := $(CONFIG_LVGL_VERSION_MAJOR)
+_MIN := $(CONFIG_LVGL_VERSION_MINOR)
+_PAT := $(CONFIG_LVGL_VERSION_PATCH)
+LVGL_VERSION := $(_MAJ).$(_MIN).$(_PAT)
+LVGL_TARBALL := v$(LVGL_VERSION).zip
LVGL_UNPACKNAME = lvgl
UNPACK ?= unzip -o $(if $(V),,-q)
