diff mbox series

[meta-oe,2/2] lvgl: fix build with gcc-15 when thorvg is enabled

Message ID 20250321112043.2425580-2-martin.jansa@gmail.com
State Accepted
Headers show
Series [meta-oe,1/2] lvgl: add PACKAGECONFIG for thorvg | expand

Commit Message

Martin Jansa March 21, 2025, 11:20 a.m. UTC 
From: Martin Jansa <martin.jansa@gmail.com>

* fixes:
  http://errors.yoctoproject.org/Errors/Details/848488/
  which is triggered only when thorvg PACKAGECONFIG is enabled

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
---
 .../0001-thorvg-fix-build-with-gcc-15.patch   | 34 +++++++++++++++++++
 meta-oe/recipes-graphics/lvgl/lvgl_9.1.0.bb   |  1 +
 2 files changed, 35 insertions(+)
 create mode 100644 meta-oe/recipes-graphics/lvgl/files/0001-thorvg-fix-build-with-gcc-15.patch
diff mbox series

Patch

diff --git a/meta-oe/recipes-graphics/lvgl/files/0001-thorvg-fix-build-with-gcc-15.patch b/meta-oe/recipes-graphics/lvgl/files/0001-thorvg-fix-build-with-gcc-15.patch
new file mode 100644
index 0000000000..eefcbe5b9c
--- /dev/null
+++ b/meta-oe/recipes-graphics/lvgl/files/0001-thorvg-fix-build-with-gcc-15.patch
@@ -0,0 +1,34 @@ 
+From a9e41f7e9590c757e74877cace6442dd676223ff Mon Sep 17 00:00:00 2001
+From: Martin Jansa <martin.jansa@gmail.com>
+Date: Fri, 21 Mar 2025 10:25:43 +0000
+Subject: [PATCH] thorvg: fix build with gcc-15
+
+* add missing include to fix:
+  src/libs/thorvg/thorvg.h:357:20: error: 'uint8_t' has not been declared
+  357 |     Result opacity(uint8_t o) noexcept;
+      |                    ^~~~~~~
+
+* not needed with latest master where it was resolved differently in
+  fc5c15638 feat(thorvg): use LVGL's malloc/realloc/zalloc/free (#7772)
+  which includes stdlib/lv_string.h which includes misc/lv_types.h which
+  includes stdint
+
+Upstream-Status: Pending [not needed with latest master where it was resolved differently in fc5c15638 feat(thorvg): use LVGL's malloc/realloc/zalloc/free (#7772)]
+
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ src/libs/thorvg/thorvg.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/libs/thorvg/thorvg.h b/src/libs/thorvg/thorvg.h
+index 7f5a84b94..0c84ec66e 100644
+--- a/src/libs/thorvg/thorvg.h
++++ b/src/libs/thorvg/thorvg.h
+@@ -18,6 +18,7 @@
+ #ifndef _THORVG_H_
+ #define _THORVG_H_
+ 
++#include <cstdint>
+ #include <functional>
+ #include <memory>
+ #include <string>
diff --git a/meta-oe/recipes-graphics/lvgl/lvgl_9.1.0.bb b/meta-oe/recipes-graphics/lvgl/lvgl_9.1.0.bb
index 63c810d74d..b07cdfc8f6 100644
--- a/meta-oe/recipes-graphics/lvgl/lvgl_9.1.0.bb
+++ b/meta-oe/recipes-graphics/lvgl/lvgl_9.1.0.bb
@@ -13,6 +13,7 @@  SRC_URI = "\
 	file://0002-fix-sdl-handle-both-LV_IMAGE_SRC_FILE-and-LV_IMAGE_S.patch \
 	file://0007-fix-cmake-generate-versioned-shared-libraries.patch \
 	file://0008-fix-fbdev-set-resolution-prior-to-buffer.patch \
+        file://0001-thorvg-fix-build-with-gcc-15.patch \
 	"
 SRCREV = "e1c0b21b2723d391b885de4b2ee5cc997eccca91"