sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

graphics/littlevgl: Change tarball version from 5.3 to 6.1.2

Browse Source 
Signed-off-by: Qi Huang <huangqi3@xiaomi.com>
This commit is contained in:
Qi Huang 2020-04-15 09:50:35 +00:00 committed by Alan Carvalho de Assis
parent 972a31c16a
commit 4555e73b3e
2 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
graphics/littlevgl/Makefile
View File

@ -41,13 +41,13 @@ LVGL_DIR = .
# LVGL Libraries # LVGL Libraries
-include ./lvgl/lv_core/lv_core.mk -include ./lvgl/src/lv_core/lv_core.mk
-include ./lvgl/lv_hal/lv_hal.mk -include ./lvgl/src/lv_hal/lv_hal.mk
-include ./lvgl/lv_objx/lv_objx.mk -include ./lvgl/src/lv_objx/lv_objx.mk
-include ./lvgl/lv_fonts/lv_fonts.mk -include ./lvgl/src/lv_font/lv_font.mk
-include ./lvgl/lv_misc/lv_misc.mk -include ./lvgl/src/lv_misc/lv_misc.mk
-include ./lvgl/lv_themes/lv_themes.mk -include ./lvgl/src/lv_themes/lv_themes.mk
-include ./lvgl/lv_draw/lv_draw.mk -include ./lvgl/src/lv_draw/lv_draw.mk
# Set up build configuration and environment # 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" 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 LVGL_TARBALL = v$(LVGL_VERSION).zip
WGET ?= wget WGET ?= wget
LVGL_UNPACKNAME = lvgl LVGL_UNPACKNAME = lvgl
UNPACK ?= unzip -o UNPACK ?= unzip -o
PATCH_FILES = lv_symbol_def.patch
PATCH ?= patch -p0
LVGL_UNPACKDIR = $(WD)/$(LVGL_UNPACKNAME) LVGL_UNPACKDIR = $(WD)/$(LVGL_UNPACKNAME)
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/graphics/littlevgl} CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/graphics/littlevgl}
@ -79,13 +76,10 @@ $(LVGL_UNPACKNAME): $(LVGL_TARBALL)
$(Q) mv lvgl-$(LVGL_VERSION) $(LVGL_UNPACKNAME) $(Q) mv lvgl-$(LVGL_VERSION) $(LVGL_UNPACKNAME)
$(Q) touch $(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) 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" @echo "CP: lvgl/lvgl.h"
$(Q) cp lvgl/lvgl.h $(APPDIR)/include/graphics/lvgl.h $(Q) cp lvgl/lvgl.h $(APPDIR)/include/graphics/lvgl.h

12
graphics/littlevgl/lv_symbol_def.patch
View File

@ -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