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

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


The following commit(s) were added to refs/heads/master by this push:
     new 5782d9a78 graphics/lvgl: include unistd.h in lv_nuttx_image_cache.c
5782d9a78 is described below

commit 5782d9a78f4446065cd86c11a53f38be4ac6c429
Author: yangsong8 <[email protected]>
AuthorDate: Tue Nov 10 22:07:08 2026 +0800

    graphics/lvgl: include unistd.h in lv_nuttx_image_cache.c
    
    lv_nuttx_image_cache.c calls gettid() but only includes nuttx/mm/mm.h,
    so it builds only because NuttX headers pull in unistd.h indirectly
    (nuttx/mm/mm.h -> nuttx/userspace.h -> pthread.h -> unistd.h). Add a
    patch that includes unistd.h explicitly, and apply it after the
    existing 0001 patch in the Make and CMake builds.
    
    Signed-off-by: yangsong8 <[email protected]>
---
 .../0002-nuttx-image_cache-include-unistd.h.patch  | 22 ++++++++++++++++++++++
 graphics/lvgl/CMakeLists.txt                       | 12 +++++++++---
 graphics/lvgl/Makefile                             |  3 ++-
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/graphics/lvgl/0002-nuttx-image_cache-include-unistd.h.patch 
b/graphics/lvgl/0002-nuttx-image_cache-include-unistd.h.patch
new file mode 100644
index 000000000..057d76c56
--- /dev/null
+++ b/graphics/lvgl/0002-nuttx-image_cache-include-unistd.h.patch
@@ -0,0 +1,22 @@
+From: yangsong8 <[email protected]>
+Date: Tue, 10 Nov 2026 20:00:00 +0800
+Subject: [PATCH] nuttx: image_cache: include unistd.h for gettid
+
+lv_nuttx_image_cache.c calls gettid() but only includes nuttx/mm/mm.h,
+so it relies on NuttX headers pulling in unistd.h indirectly. Include
+unistd.h explicitly so the file keeps building when that indirect
+include goes away.
+
+Signed-off-by: yangsong8 <[email protected]>
+---
+diff --git a/src/drivers/nuttx/lv_nuttx_image_cache.c 
b/src/drivers/nuttx/lv_nuttx_image_cache.c
+--- a/src/drivers/nuttx/lv_nuttx_image_cache.c
++++ b/src/drivers/nuttx/lv_nuttx_image_cache.c
+@@ -15,6 +15,7 @@
+ 
+ #include "../../draw/lv_draw_buf_private.h"
+ #include <nuttx/mm/mm.h>
++#include <unistd.h>
+ 
+ /*********************
+  *      DEFINES
diff --git a/graphics/lvgl/CMakeLists.txt b/graphics/lvgl/CMakeLists.txt
index 018b3992a..c821b11a8 100644
--- a/graphics/lvgl/CMakeLists.txt
+++ b/graphics/lvgl/CMakeLists.txt
@@ -35,17 +35,22 @@ if(CONFIG_GRAPHICS_LVGL)
   set(LVGL_FBDEV_PATCH
       
${CMAKE_CURRENT_LIST_DIR}/0001-nuttx-fbdev-use-virtual-framebuffer-offset.patch
   )
+  set(LVGL_IMAGE_CACHE_PATCH
+      ${CMAKE_CURRENT_LIST_DIR}/0002-nuttx-image_cache-include-unistd.h.patch)
 
   if(NOT EXISTS ${LVGL_DIR}/.git)
     if("${LVGL_VERSION}" STREQUAL "9.2.2")
       set_property(
         DIRECTORY
         APPEND
-        PROPERTY CMAKE_CONFIGURE_DEPENDS ${LVGL_FBDEV_PATCH})
+        PROPERTY CMAKE_CONFIGURE_DEPENDS ${LVGL_FBDEV_PATCH}
+                 ${LVGL_IMAGE_CACHE_PATCH})
     endif()
 
     if(NOT EXISTS ${LVGL_STAMP}
        OR ("${LVGL_VERSION}" STREQUAL "9.2.2" AND ${LVGL_FBDEV_PATCH}
+                                                  IS_NEWER_THAN ${LVGL_STAMP})
+       OR ("${LVGL_VERSION}" STREQUAL "9.2.2" AND ${LVGL_IMAGE_CACHE_PATCH}
                                                   IS_NEWER_THAN ${LVGL_STAMP}))
       # Reset download stamps so a failed patch retries from a fresh archive.
       set(LVGL_SUBBUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/lvgl-subbuild)
@@ -59,8 +64,9 @@ if(CONFIG_GRAPHICS_LVGL)
             URL_HASH
             
SHA256=b3d33f7aad1360f588762208d0f563574392debbc28d9187bda86012909f2203
         )
-        set(LVGL_PATCH_COMMAND patch -s -N -p1 -d ${LVGL_DIR} -i
-                               ${LVGL_FBDEV_PATCH})
+        set(LVGL_PATCH_COMMAND
+            patch -s -N -p1 -d ${LVGL_DIR} -i ${LVGL_FBDEV_PATCH} COMMAND patch
+            -s -N -p1 -d ${LVGL_DIR} -i ${LVGL_IMAGE_CACHE_PATCH})
       endif()
       FetchContent_Declare(
         lvgl_fetch
diff --git a/graphics/lvgl/Makefile b/graphics/lvgl/Makefile
index 610e8e439..da98fbd75 100644
--- a/graphics/lvgl/Makefile
+++ b/graphics/lvgl/Makefile
@@ -83,7 +83,8 @@ endif
 # This minimal backport targets the default LVGL 9.2.2 archive.
 
 ifeq ($(LVGL_VERSION),9.2.2)
-LVGL_PATCHES = $(WD)/0001-nuttx-fbdev-use-virtual-framebuffer-offset.patch
+LVGL_PATCHES  = $(WD)/0001-nuttx-fbdev-use-virtual-framebuffer-offset.patch
+LVGL_PATCHES += $(WD)/0002-nuttx-image_cache-include-unistd.h.patch
 endif
 
 LVGL_STAMP = $(LVGL_UNPACKNAME)/.nuttx_patched-$(LVGL_VERSION)

Reply via email to