You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2020/04/15 14:38:45 UTC
[incubator-nuttx-apps] 13/15: graphics/littlevgl: Change tarball
version from 5.3 to 6.1.2
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 4555e73b3e1b975fdc3f3afa1c64c0868713fb9c
Author: Qi Huang <hu...@xiaomi.com>
AuthorDate: Wed Apr 15 09:50:35 2020 +0000
graphics/littlevgl: Change tarball version from 5.3 to 6.1.2
Signed-off-by: Qi Huang <hu...@xiaomi.com>
---
graphics/littlevgl/Makefile | 24 +++++++++---------------
graphics/littlevgl/lv_symbol_def.patch | 12 ------------
2 files changed, 9 insertions(+), 27 deletions(-)
diff --git a/graphics/littlevgl/Makefile b/graphics/littlevgl/Makefile
index 0ec3abc..b382a04 100644
--- a/graphics/littlevgl/Makefile
+++ b/graphics/littlevgl/Makefile
@@ -41,13 +41,13 @@ LVGL_DIR = .
# LVGL Libraries
--include ./lvgl/lv_core/lv_core.mk
--include ./lvgl/lv_hal/lv_hal.mk
--include ./lvgl/lv_objx/lv_objx.mk
--include ./lvgl/lv_fonts/lv_fonts.mk
--include ./lvgl/lv_misc/lv_misc.mk
--include ./lvgl/lv_themes/lv_themes.mk
--include ./lvgl/lv_draw/lv_draw.mk
+-include ./lvgl/src/lv_core/lv_core.mk
+-include ./lvgl/src/lv_hal/lv_hal.mk
+-include ./lvgl/src/lv_objx/lv_objx.mk
+-include ./lvgl/src/lv_font/lv_font.mk
+-include ./lvgl/src/lv_misc/lv_misc.mk
+-include ./lvgl/src/lv_themes/lv_themes.mk
+-include ./lvgl/src/lv_draw/lv_draw.mk
# Set up build configuration and environment
@@ -55,16 +55,13 @@ WD := ${shell echo $(CURDIR) | sed -e 's/ /\\ /g'}
CONFIG_GRAPH_LVGL_URL ?= "https://github.com/littlevgl/lvgl/archive"
-LVGL_VERSION ?= 5.3
+LVGL_VERSION ?= 6.1.2
LVGL_TARBALL = v$(LVGL_VERSION).zip
WGET ?= wget
LVGL_UNPACKNAME = lvgl
UNPACK ?= unzip -o
-PATCH_FILES = lv_symbol_def.patch
-PATCH ?= patch -p0
-
LVGL_UNPACKDIR = $(WD)/$(LVGL_UNPACKNAME)
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/graphics/littlevgl}
@@ -79,13 +76,10 @@ $(LVGL_UNPACKNAME): $(LVGL_TARBALL)
$(Q) mv lvgl-$(LVGL_VERSION) $(LVGL_UNPACKNAME)
$(Q) touch $(LVGL_UNPACKNAME)
-$(LVGL_UNPACKNAME)/.patched: $(LVGL_UNPACKNAME) $(PATCH_FILES)
- $(Q) cat $(PATCH_FILES) | $(PATCH)
- $(Q) touch $(LVGL_UNPACKNAME)/.patched
lvgl/lvgl.h: $(LVGL_UNPACKNAME)
-$(APPDIR)/include/graphics/lvgl.h: $(LVGL_UNPACKNAME)/.patched lvgl/lvgl.h
+$(APPDIR)/include/graphics/lvgl.h: lvgl/lvgl.h
@echo "CP: lvgl/lvgl.h"
$(Q) cp lvgl/lvgl.h $(APPDIR)/include/graphics/lvgl.h
diff --git a/graphics/littlevgl/lv_symbol_def.patch b/graphics/littlevgl/lv_symbol_def.patch
deleted file mode 100644
index e828332..0000000
--- a/graphics/littlevgl/lv_symbol_def.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur lvgl/lv_misc/lv_symbol_def.h lvgl.fix/lv_misc/lv_symbol_def.h
---- lvgl/lv_misc/lv_symbol_def.h 2019-01-31 20:08:33.000000000 -0800
-+++ lvgl.fix/lv_misc/lv_symbol_def.h 2019-03-17 17:43:52.780724618 -0700
-@@ -73,7 +73,7 @@
- #define SYMBOL_BATTERY_EMPTY _SYMBOL_VALUE1(F0)
- #define SYMBOL_BLUETOOTH _SYMBOL_VALUE1(F1)
- #define LV_SYMBOL_GLYPH_LAST 0xF1
--#define SYMBOL_DUMMY _SYMBOL_VALUE1(xFF) /*Invalid symbol. If written before a string then `lv_img` will show it as a label*/
-+#define SYMBOL_DUMMY _SYMBOL_VALUE1(FF) /*Invalid symbol. If written before a string then `lv_img` will show it as a label*/
-
- #else
- #define LV_SYMBOL_GLYPH_FIRST 0xF800