fix(build): enable LV_CONF_PATH option

This allows to set custom `lv_conf.h` file per board
in `mpconfigboard.(h,cmake)`

Author: Carglglz

micropython.cmake

@@ -12,6 +12,11 @@ idf_build_set_property(COMPILE_OPTIONS "-Wno-unused-function" APPEND)
 idf_build_set_property(SRCS "${LV_SRC}" APPEND)
 idf_build_set_property(INCLUDE_DIRS "${LV_INCLUDE}" APPEND)
 
+# idf_build_set_property(INCLUDE_DIRS "${LV_INCLUDE}" APPEND)
+
+# DEBUG LV_CONF_PATH
+message(STATUS "LV_CONF_PATH=${LV_CONF_PATH}")
+
 # Fix for idf 5.2.x
 idf_build_get_property(component_targets __COMPONENT_TARGETS)
 string(REPLACE "___idf_lvgl" "" component_targets "${component_targets}")
@@ -40,13 +45,19 @@ target_compile_options(lvgl_interface INTERFACE ${LV_CFLAGS})
 add_library(usermod_lvgl INTERFACE)
 target_sources(usermod_lvgl INTERFACE ${LV_SRC})
 target_include_directories(usermod_lvgl INTERFACE ${LV_INCLUDE})
-
+if (DEFINED LV_CONF_DIR)
+    target_include_directories(usermod_lvgl INTERFACE ${LV_CONF_DIR})
+endif()
 
 file(WRITE ${LV_MP} "")
 
 target_link_libraries(usermod_lvgl INTERFACE lvgl_interface)
 
 # # # make usermod (target declared by Micropython for all user compiled modules) link to bindings
 # # # this way the bindings (and transitively lvgl_interface) get proper compilation flags
+if (DEFINED LV_CONF_DIR)
+    target_include_directories(usermod INTERFACE ${LV_CONF_DIR})
+endif()
+target_compile_options(usermod INTERFACE -DLV_CONF_PATH=${LV_CONF_PATH})
 target_link_libraries(usermod INTERFACE usermod_lvgl)
 

micropython.mk

@@ -15,6 +15,11 @@ CFLAGS_EXTMOD += $(SDL_CFLAGS_EXTMOD) -DMICROPY_SDL=1
 LDFLAGS_EXTMOD += $(SDL_LDFLAGS_EXTMOD)
 endif
 
+# Avoid including unwanted local headers other than sdl2 
+ifeq ($(UNAME_S),Darwin)
+CFLAGS_EXTMOD:=$(filter-out -I/usr/local/include,$(CFLAGS_EXTMOD))
+endif
+
 RLOTTIE_CFLAGS_EXTMOD :=  $(shell pkg-config --silence-errors --cflags rlottie)
 RLOTTIE_LDFLAGS_EXTMOD := $(shell pkg-config --silence-errors --libs   rlottie)
 ifneq ($(RLOTTIE_LDFLAGS_EXTMOD),)
@@ -29,13 +34,15 @@ CFLAGS_EXTMOD += $(FREETYPE_CFLAGS_EXTMOD) -DMICROPY_FREETYPE=1
 LDFLAGS_EXTMOD += $(FREETYPE_LDFLAGS_EXTMOD)
 endif
 
-FFMPEG_LIBS := libavformat libavcodec libswscale libavutil
-FFMPEG_CFLAGS_EXTMOD :=  $(shell pkg-config --silence-errors --cflags $(FFMPEG_LIBS))
-FFMPEG_LDFLAGS_EXTMOD := $(shell pkg-config --silence-errors --libs   $(FFMPEG_LIBS))
-ifneq ($(FFMPEG_LDFLAGS_EXTMOD),)
-CFLAGS_EXTMOD += $(FFMPEG_CFLAGS_EXTMOD) -DMICROPY_FFMPEG=1
-LDFLAGS_EXTMOD += $(FFMPEG_LDFLAGS_EXTMOD)
-endif
+# Enable FFMPEG
+# FFMPEG_LIBS := libavformat libavcodec libswscale libavutil
+# FFMPEG_CFLAGS_EXTMOD :=  $(shell pkg-config --silence-errors --cflags $(FFMPEG_LIBS))
+# FFMPEG_LDFLAGS_EXTMOD := $(shell pkg-config --silence-errors --libs   $(FFMPEG_LIBS))
+# ifneq ($(FFMPEG_LDFLAGS_EXTMOD),)
+# CFLAGS_EXTMOD += $(FFMPEG_CFLAGS_EXTMOD) -DMICROPY_FFMPEG=1
+# LDFLAGS_EXTMOD += $(FFMPEG_LDFLAGS_EXTMOD)
+# endif
+
 endif
 
 ################################################################################
@@ -44,15 +51,27 @@ endif
 
 
 LVGL_BINDING_DIR := $(USERMOD_DIR)
+ifeq ($(LV_CONF_PATH),)
+LV_CONF_PATH = $(LVGL_BINDING_DIR)/lv_conf.h
+endif
+
+# LV_CONF_PATH DEBUG
+$(info    LV_CONF_PATH is $(LV_CONF_PATH))
+
 
 LVGL_DIR = $(LVGL_BINDING_DIR)/lvgl
 LVGL_GENERIC_DRV_DIR = $(LVGL_BINDING_DIR)/driver/generic
 INC += -I$(LVGL_BINDING_DIR)
-ALL_LVGL_SRC = $(shell find $(LVGL_DIR) -type f -name '*.h') $(LVGL_BINDING_DIR)/lv_conf.h
+ALL_LVGL_SRC = $(shell find $(LVGL_DIR) -type f -name '*.h') $(LV_CONF_PATH)
 LVGL_PP = $(BUILD)/lvgl/lvgl.pp.c
 LVGL_MPY = $(BUILD)/lvgl/lv_mpy.c
 LVGL_MPY_METADATA = $(BUILD)/lvgl/lv_mpy.json
 CFLAGS_EXTMOD += $(LV_CFLAGS) 
+CFLAGS_EXTMOD += -DLV_CONF_PATH=$(LV_CONF_PATH)
+
+
+# CFLAGS DEBUG
+$(info CFLAGS_EXTMOD is $(CFLAGS_EXTMOD))
 
 $(LVGL_MPY): $(ALL_LVGL_SRC) $(LVGL_BINDING_DIR)/gen/gen_mpy.py 
 	$(ECHO) "LVGL-GEN $@"

mkrules_usermod.cmake

@@ -5,6 +5,13 @@ find_program(AWK awk mawk gawk)
 
 set(LV_BINDINGS_DIR ${CMAKE_CURRENT_LIST_DIR})
 
+# first check
+if(NOT DEFINED LV_CONF_PATH)
+    set(LV_CONF_PATH ${LV_BINDINGS_DIR}/lv_conf.h)
+
+    message(STATUS "LV_CONF_PATH=${LV_CONF_PATH}")
+endif()
+
 # Common function for creating LV bindings
 
 function(lv_bindings)
@@ -21,17 +28,25 @@ function(lv_bindings)
     set(LV_PP ${LV_OUTPUT}.pp)
     set(LV_MPY_METADATA ${LV_OUTPUT}.json)
 
+    # message(STATUS "LV_CONF_PATH=${LV_CONF_PATH}")
+    # message(STATUS "LV_COMPILE_OPTIONS=${LV_COMPILE_OPTIONS}")
+
+    # message(STATUS "LV_PP_OPTIONS=${LV_PP_OPTIONS}")
+    # message(STATUS "LV_CFLAGS=${LV_CFLAGS}")
+
     add_custom_command(
         OUTPUT 
             ${LV_PP}
         COMMAND
-        ${CMAKE_C_COMPILER} -E -DPYCPARSER ${LV_COMPILE_OPTIONS} ${LV_PP_OPTIONS} "${LV_CFLAGS}" -I ${LV_BINDINGS_DIR}/pycparser/utils/fake_libc_include ${MICROPY_CPP_FLAGS} ${LV_INPUT} > ${LV_PP}
+        ${CMAKE_C_COMPILER} -E -DPYCPARSER -DLV_CONF_PATH=${LV_CONF_PATH} ${LV_COMPILE_OPTIONS} ${LV_PP_OPTIONS} "${LV_CFLAGS}" -I ${LV_BINDINGS_DIR}/pycparser/utils/fake_libc_include ${MICROPY_CPP_FLAGS} ${LV_INPUT} > ${LV_PP}
         DEPENDS
             ${LV_INPUT}
             ${LV_DEPENDS}
             ${LV_BINDINGS_DIR}/pycparser/utils/fake_libc_include
         IMPLICIT_DEPENDS
             C ${LV_INPUT}
+        COMMENT
+            "LV_BINDINGS CPP"
         VERBATIM
         COMMAND_EXPAND_LISTS
     )
@@ -60,6 +75,9 @@ function(lv_bindings)
                 ${AWK} ${LV_AWK_COMMAND} ${LV_PP} > ${LV_PP_FILTERED}
             DEPENDS
                 ${LV_PP}
+
+            COMMENT
+                "LV_BINDINGS: FILTER"
             VERBATIM
             COMMAND_EXPAND_LISTS
         )
@@ -71,10 +89,13 @@ function(lv_bindings)
         OUTPUT
             ${LV_OUTPUT}
         COMMAND
-            ${Python3_EXECUTABLE} ${LV_BINDINGS_DIR}/gen/gen_mpy.py ${LV_GEN_OPTIONS} -MD ${LV_MPY_METADATA} -E ${LV_PP_FILTERED} ${LV_INPUT} > ${LV_OUTPUT} || (rm -f ${LV_OUTPUT} && /bin/false)
+            ${Python3_EXECUTABLE} ${LV_BINDINGS_DIR}/gen/gen_mpy.py ${LV_GEN_OPTIONS} -DLV_CONF_PATH=${LV_CONF_PATH} -MD ${LV_MPY_METADATA} -E ${LV_PP_FILTERED} ${LV_INPUT} > ${LV_OUTPUT} || (rm -f ${LV_OUTPUT} && /bin/false)
         DEPENDS
             ${LV_BINDINGS_DIR}/gen/gen_mpy.py
             ${LV_PP_FILTERED}
+
+        COMMENT
+            "LV_BINDINGS GEN MPY"
         COMMAND_EXPAND_LISTS
     )
 
@@ -95,7 +116,7 @@ function(all_lv_bindings)
 
     # LVGL bindings
 
-    file(GLOB_RECURSE LVGL_HEADERS ${LVGL_DIR}/src/*.h ${LV_BINDINGS_DIR}/lv_conf.h)
+    file(GLOB_RECURSE LVGL_HEADERS ${LVGL_DIR}/src/*.h ${LV_CONF_PATH})
     lv_bindings(
         OUTPUT
             ${LV_MP}
@@ -155,3 +176,4 @@ set(LV_SRC
 #         ${LV_ESPIDF}
 #     )
 # endif(ESP_PLATFORM)
+