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 deleted file mode 100644 index e61b5224aa..0000000000 --- a/meta-oe/recipes-graphics/lvgl/files/0001-thorvg-fix-build-with-gcc-15.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a9e41f7e9590c757e74877cace6442dd676223ff Mon Sep 17 00:00:00 2001 -From: Martin Jansa -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 ---- - src/libs/thorvg/thorvg.h | 1 + - 1 file changed, 1 insertion(+) - ---- a/src/libs/thorvg/thorvg.h -+++ b/src/libs/thorvg/thorvg.h -@@ -12,6 +12,7 @@ - #define TVG_BUILD 1 - - -+#include - #include - #include - #include diff --git a/meta-oe/recipes-graphics/lvgl/lv-conf.inc b/meta-oe/recipes-graphics/lvgl/lv-conf.inc index d341c8a6da..7c16eb3936 100644 --- a/meta-oe/recipes-graphics/lvgl/lv-conf.inc +++ b/meta-oe/recipes-graphics/lvgl/lv-conf.inc @@ -1,7 +1,7 @@ PACKAGECONFIG ??= "drm" -PACKAGECONFIG[drm] = ",,libdrm" -PACKAGECONFIG[fbdev] = ",," +PACKAGECONFIG[drm] = ",,libdrm libevdev" +PACKAGECONFIG[fbdev] = ",,libevdev" PACKAGECONFIG[gridnav] = ",," PACKAGECONFIG[thorvg] = ",," PACKAGECONFIG[sdl] = ",,virtual/libsdl2 libsdl2-image" diff --git a/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.2.2.bb b/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.2.2.bb deleted file mode 100644 index ede5c16f3f..0000000000 --- a/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.2.2.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "LVGL Demo Application for Framebuffer" -HOMEPAGE = "https://github.com/lvgl/lv_port_linux_frame_buffer" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=802d3d83ae80ef5f343050bf96cce3a4 \ - file://lvgl/LICENCE.txt;md5=bf1198c89ae87f043108cea62460b03a" - -SRC_URI = "\ - git://github.com/lvgl/lv_port_linux_frame_buffer.git;protocol=https;branch=release/v9.2;name=demo \ - git://github.com/lvgl/lvgl;protocol=https;branch=release/v9.2;name=lvgl;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/lvgl \ - file://0001-thorvg-fix-build-with-gcc-15.patch;patchdir=lvgl \ - " -SRCREV_demo = "c924e24c7aa55317521bcd9dd75ce9337508f5a5" -SRCREV_lvgl = "7f07a129e8d77f4984fff8e623fd5be18ff42e74" -SRCREV_FORMAT = "demo_lvgl" - -EXTRA_OEMAKE = "DESTDIR=${D}" - -LVGL_CONFIG_DRM_CARD ?= "/dev/dri/card0" -LVGL_CONFIG_LV_USE_LOG = "1" -LVGL_CONFIG_LV_LOG_PRINTF = "1" -LVGL_CONFIG_LV_MEM_SIZE = "(256 * 1024U)" -LVGL_CONFIG_LV_USE_FONT_COMPRESSED = "1" -require lv-conf.inc - -inherit cmake - - -do_configure:prepend() { - if [ "${LVGL_CONFIG_USE_SDL}" -eq 1 ] ; then - # Add libsdl build dependency, SDL2_image has no cmake file - sed -i '/^target_link_libraries/ s@pthread@& SDL2_image@' "${S}/CMakeLists.txt" - fi -} - -do_install:append() { - install -d ${D}${bindir} - install -m 0755 ${S}/bin/main ${D}${bindir}/lvgl -} diff --git a/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.4.0.bb b/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.4.0.bb new file mode 100644 index 0000000000..3185d37c5c --- /dev/null +++ b/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.4.0.bb @@ -0,0 +1,33 @@ +SUMMARY = "LVGL Demo Application for Framebuffer" +HOMEPAGE = "https://github.com/lvgl/lv_port_linux_frame_buffer" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=802d3d83ae80ef5f343050bf96cce3a4 \ + file://lvgl/LICENCE.txt;md5=4570b6241b4fced1d1d18eb691a0e083" + +DEPENDS = "python3-pcpp-native" + +PV .= "+git" + +SRC_URI = "\ + git://github.com/lvgl/lv_port_linux_frame_buffer.git;protocol=https;branch=release/v9.4;name=demo \ + git://github.com/lvgl/lvgl;protocol=https;branch=release/v9.4;tag=v9.4.0;name=lvgl;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/lvgl \ +" + +SRCREV_demo = "71050624acd8a52ab7d365d0d12acf9bf5fe41db" +SRCREV_lvgl = "c016f72d4c125098287be5e83c0f1abed4706ee5" +SRCREV_FORMAT = "demo_lvgl" + +inherit cmake pkgconfig + +LVGL_CONFIG_DRM_CARD ?= "/dev/dri/card0" +LVGL_CONFIG_LV_USE_LOG = "1" +LVGL_CONFIG_LV_LOG_PRINTF = "1" +LVGL_CONFIG_LV_MEM_SIZE = "(256 * 1024U)" +LVGL_CONFIG_LV_USE_FONT_COMPRESSED = "1" +require lv-conf.inc + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${B}/bin/lvglsim ${D}${bindir} +}