diff --git a/graphics/lvgl/CMakeLists.txt b/graphics/lvgl/CMakeLists.txt index 352b5da59fb..ba5af28e2a3 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 4daf467f383..2d9ad2f8e8f 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 a81fac1ebe6..ce9ad6b7f8b 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)