You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ag...@apache.org on 2020/08/14 15:02:34 UTC

[incubator-nuttx-apps] 02/03: graphics/lvgl: Specific LVGL version by kconfig

This is an automated email from the ASF dual-hosted git repository.

aguettouche pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git

commit 08c5998472af05c0dab97388b599513bdfb77c50
Author: Huang Qi <hu...@xiaomi.com>
AuthorDate: Fri Aug 14 20:31:51 2020 +0800

    graphics/lvgl: Specific LVGL version by kconfig
    
    Signed-off-by: Huang Qi <hu...@xiaomi.com>
---
 examples/lvgldemo/Makefile | 2 +-
 graphics/lvgl/Kconfig      | 4 ++++
 graphics/lvgl/Makefile     | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/examples/lvgldemo/Makefile b/examples/lvgldemo/Makefile
index 1e48d47..2b30f47 100644
--- a/examples/lvgldemo/Makefile
+++ b/examples/lvgldemo/Makefile
@@ -39,7 +39,7 @@ include $(APPDIR)/Make.defs
 
 CONFIG_LV_EXAMPLES_URL ?= https://github.com/lvgl/lv_examples/archive
 
-LVGL_EXAMPLES_VERSION ?= 7.0.2
+LVGL_EXAMPLES_VERSION = $(patsubst "%",%,$(strip $(CONFIG_LVGL_VERSION)))
 LVGL_EXAMPLES_TARBALL = v$(LVGL_EXAMPLES_VERSION).zip
 
 WGET ?= wget
diff --git a/graphics/lvgl/Kconfig b/graphics/lvgl/Kconfig
index c0fa713..993a40e 100644
--- a/graphics/lvgl/Kconfig
+++ b/graphics/lvgl/Kconfig
@@ -11,6 +11,10 @@ menuconfig GRAPHICS_LVGL
 
 if GRAPHICS_LVGL
 
+config LVGL_VERSION
+	string "LVGL Version"
+	default "7.3.0"
+
 config LV_MEM_SIZE
 	int "Heap size of the graphics library"
 	default 32768
diff --git a/graphics/lvgl/Makefile b/graphics/lvgl/Makefile
index 16e278a..adf0c3a 100644
--- a/graphics/lvgl/Makefile
+++ b/graphics/lvgl/Makefile
@@ -57,7 +57,7 @@ WD := ${shell echo $(CURDIR) | sed -e 's/ /\\ /g'}
 
 CONFIG_GRAPH_LVGL_URL ?= "https://github.com/lvgl/lvgl/archive"
 
-LVGL_VERSION ?= 7.0.2
+LVGL_VERSION = $(patsubst "%",%,$(strip $(CONFIG_LVGL_VERSION)))
 LVGL_TARBALL = v$(LVGL_VERSION).zip
 WGET ?= wget