diff mbox series

[meta-oe,2/2] lvgl: Update to 9.1.0

Message ID 20240320095612.176662-2-marex@denx.de
State Accepted
Headers show
Series [meta-oe,1/2] lvgl: Reinstate demo configuration settings | expand

Commit Message

Marek Vasut March 20, 2024, 9:55 a.m. UTC
Update LVGL to final 9.1.0 . Drop the XRGB8888 fix which
is part of the release.

Signed-off-by: Marek Vasut <marex@denx.de>
---
Cc: Christophe Chapuis <chris.chapuis@gmail.com>
Cc: Fabio Estevam <festevam@denx.de>
Cc: Khem Raj <raj.khem@gmail.com>
Cc: Martin Jansa <martin.jansa@gmail.com>
---
 ...-drm-Default-to-XRGB8888-framebuffer.patch | 36 -------------------
 ...demo-fb_9.0.0.bb => lvgl-demo-fb_9.1.0.bb} |  3 +-
 .../lvgl/{lvgl_9.0.0.bb => lvgl_9.1.0.bb}     |  3 +-
 3 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100644 meta-oe/recipes-graphics/lvgl/files/0001-fix-drm-Default-to-XRGB8888-framebuffer.patch
 rename meta-oe/recipes-graphics/lvgl/{lvgl-demo-fb_9.0.0.bb => lvgl-demo-fb_9.1.0.bb} (92%)
 rename meta-oe/recipes-graphics/lvgl/{lvgl_9.0.0.bb => lvgl_9.1.0.bb} (89%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-graphics/lvgl/files/0001-fix-drm-Default-to-XRGB8888-framebuffer.patch b/meta-oe/recipes-graphics/lvgl/files/0001-fix-drm-Default-to-XRGB8888-framebuffer.patch
deleted file mode 100644
index 9d758cb08..000000000
--- a/meta-oe/recipes-graphics/lvgl/files/0001-fix-drm-Default-to-XRGB8888-framebuffer.patch
+++ /dev/null
@@ -1,36 +0,0 @@ 
-From 7b89e18c2f21e4b91b461007368df724198ac904 Mon Sep 17 00:00:00 2001
-From: Marek Vasut <marex@denx.de>
-Date: Tue, 12 Mar 2024 03:13:33 +0100
-Subject: [PATCH 1/2] fix(drm): Default to XRGB8888 framebuffer
-
-The ARGB8888 framebuffer format for base canvas makes little sense
-as the base canvas is unlikely to be transparent and require alpha.
-Use XRGB8888 framebuffer format which is more widely supported by
-DRM drivers as base plane pixel format.
-
-This makes e.g. i.MX8M Nano work by default.
-
-Upstream-Status: Submitted [https://github.com/lvgl/lvgl/pull/5851]
-Signed-off-by: Marek Vasut <marex@denx.de>
----
-This is identical fix to lv_drivers https://github.com/lvgl/lv_drivers/pull/282
----
- src/drivers/display/drm/lv_linux_drm.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/drivers/display/drm/lv_linux_drm.c b/src/drivers/display/drm/lv_linux_drm.c
-index c706f9cb2..faa2212bf 100644
---- a/src/drivers/display/drm/lv_linux_drm.c
-+++ b/src/drivers/display/drm/lv_linux_drm.c
-@@ -24,7 +24,7 @@
-  *      DEFINES
-  *********************/
- #if LV_COLOR_DEPTH == 32
--    #define DRM_FOURCC DRM_FORMAT_ARGB8888
-+    #define DRM_FOURCC DRM_FORMAT_XRGB8888
- #elif LV_COLOR_DEPTH == 16
-     #define DRM_FOURCC DRM_FORMAT_RGB565
- #else
--- 
-2.43.0
-
diff --git a/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.0.0.bb b/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.1.0.bb
similarity index 92%
rename from meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.0.0.bb
rename to meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.1.0.bb
index 308e74897..542b70ea2 100644
--- a/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.0.0.bb
+++ b/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.1.0.bb
@@ -7,7 +7,6 @@  LIC_FILES_CHKSUM = "file://LICENSE;md5=802d3d83ae80ef5f343050bf96cce3a4 \
 SRC_URI = "\
 	git://github.com/lvgl/lv_port_linux_frame_buffer.git;protocol=https;branch=master;name=demo \
 	git://github.com/lvgl/lvgl;protocol=https;branch=master;name=lvgl;subdir=git/lvgl \
-	file://0001-fix-drm-Default-to-XRGB8888-framebuffer.patch;patchdir=lvgl \
 	file://0002-fix-sdl-handle-both-LV_IMAGE_SRC_FILE-and-LV_IMAGE_S.patch;patchdir=lvgl \
 	file://0003-Make-fbdev-device-node-runtime-configurable-via-envi.patch \
 	file://0004-Factor-out-fbdev-initialization-code.patch \
@@ -16,7 +15,7 @@  SRC_URI = "\
 	file://0007-fix-cmake-generate-versioned-shared-libraries.patch;patchdir=lvgl \
 	"
 SRCREV_demo = "dccc6a1ca48372aa993dbea7a8e17dec6f42df6a"
-SRCREV_lvgl = "e29d35b43c509b6d7189f5dac87139441669ae66"
+SRCREV_lvgl = "e1c0b21b2723d391b885de4b2ee5cc997eccca91"
 SRCREV_FORMAT = "demo_lvgl"
 PV .= "+git${SRCPV}"
 
diff --git a/meta-oe/recipes-graphics/lvgl/lvgl_9.0.0.bb b/meta-oe/recipes-graphics/lvgl/lvgl_9.1.0.bb
similarity index 89%
rename from meta-oe/recipes-graphics/lvgl/lvgl_9.0.0.bb
rename to meta-oe/recipes-graphics/lvgl/lvgl_9.1.0.bb
index 0fb3ddecf..fc967e6d1 100644
--- a/meta-oe/recipes-graphics/lvgl/lvgl_9.0.0.bb
+++ b/meta-oe/recipes-graphics/lvgl/lvgl_9.1.0.bb
@@ -10,11 +10,10 @@  LIC_FILES_CHKSUM = "file://LICENCE.txt;md5=bf1198c89ae87f043108cea62460b03a"
 
 SRC_URI = "\
 	git://github.com/lvgl/lvgl;protocol=https;branch=master \
-	file://0001-fix-drm-Default-to-XRGB8888-framebuffer.patch \
 	file://0002-fix-sdl-handle-both-LV_IMAGE_SRC_FILE-and-LV_IMAGE_S.patch \
 	file://0007-fix-cmake-generate-versioned-shared-libraries.patch \
 	"
-SRCREV = "e29d35b43c509b6d7189f5dac87139441669ae66"
+SRCREV = "e1c0b21b2723d391b885de4b2ee5cc997eccca91"
 PV .= "+git${SRCPV}"
 
 inherit cmake