lvgl: Upgrade dialog-lvgl to next/main version

The dialog-lvgl has been unmaintained and stuck at LVGL v8.1.0 in
its now archived repository branch main. There is subsequent effort
in next/main branch which updates the code base to LVGL v8.2.0 that
is almost compatible enough to still build against LVGL v8.3.7.

Upgrade to this next/main branch which contains three additional
commits on top of the main branch, which implement the update to
newer LVGL. Add two more fixes to build against system timer provided
tick and another fix for WL callback data type. Since there is no
upstream, track the patches here for now.

Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

3 files changed, 107 insertions, 2 deletions

diff --git a/meta-oe/recipes-graphics/lvgl/dialog-lvgl/0001-wayland-Switch-to-custom-timer-tick.patch b/meta-oe/recipes-graphics/lvgl/dialog-lvgl/0001-wayland-Switch-to-custom-timer-tick.patch
new file mode 100644
index 0000000000..5149002ff5
--- /dev/null
+++ b/meta-oe/recipes-graphics/lvgl/dialog-lvgl/0001-wayland-Switch-to-custom-timer-tick.patch
@@ -0,0 +1,72 @@
+From 1d92e1854c19c06c553243d29170bb4d1a9e3863 Mon Sep 17 00:00:00 2001
+From: Marek Vasut <marex@denx.de>
+Date: Tue, 9 May 2023 02:57:30 +0200
+Subject: [PATCH 1/2] wayland: Switch to custom timer tick
+
+The OE LVGL is configured to obtain timer tick from system timer
+instead of using ad-hoc mechanisms to emulate timer tick using
+threads or such. Use system timer to provide the tick.
+
+The tick handling implementation comes from:
+https://github.com/lvgl/lv_port_linux_frame_buffer.git
+as of commit adf2c4490e17a1b9ec1902cc412a24b3b8235c8e
+
+Upstream-Status: Inappropriate [Upstream repo is archived]
+Signed-off-by: Marek Vasut <marex@denx.de>
+---
+ src/drivers/wayland.c | 24 ++++++++++++++++--------
+ 1 file changed, 16 insertions(+), 8 deletions(-)
+
+diff --git a/src/drivers/wayland.c b/src/drivers/wayland.c
+index 633dc18..bcebf4d 100644
+--- a/src/drivers/wayland.c
++++ b/src/drivers/wayland.c
+@@ -6,6 +6,7 @@
+ #if defined(USE_WAYLAND) && USE_WAYLAND
+ 
+ #include <pthread.h>
++#include <sys/time.h>
+ #include <unistd.h>
+ 
+ #include <lv_drivers/wayland/wayland.h>
+@@ -18,13 +19,22 @@
+ #define WAYLAND_VER_RES      320
+ #endif
+ 
+-static void * tick_thread(void * data)
++uint32_t custom_tick_get(void)
+ {
+-    (void) data;
+-    while(true) {
+-        usleep(5 * 1000);
+-        lv_tick_inc(5);
+-    }
++       static uint64_t start_ms = 0;
++       if(start_ms == 0) {
++               struct timeval tv_start;
++               gettimeofday(&tv_start, NULL);
++               start_ms = (tv_start.tv_sec * 1000000 + tv_start.tv_usec) / 1000;
++       }
++
++       struct timeval tv_now;
++       gettimeofday(&tv_now, NULL);
++       uint64_t now_ms;
++       now_ms = (tv_now.tv_sec * 1000000 + tv_now.tv_usec) / 1000;
++
++       uint32_t time_ms = now_ms - start_ms;
++       return time_ms;
+ }
+ 
+ 
+@@ -47,8 +57,6 @@ void hal_init(void)
+ 
+     lv_group_t * g = lv_group_create();
+     lv_group_set_default(g);
+-    static pthread_t hal_thread;
+-    pthread_create(&hal_thread, NULL, tick_thread, NULL);
+ }
+ 
+ #endif
+-- 
+2.39.2
+
diff --git a/meta-oe/recipes-graphics/lvgl/dialog-lvgl/0002-wayland-Fix-callback-data-type.patch b/meta-oe/recipes-graphics/lvgl/dialog-lvgl/0002-wayland-Fix-callback-data-type.patch
new file mode 100644
index 0000000000..8919a1a2ad
--- /dev/null
+++ b/meta-oe/recipes-graphics/lvgl/dialog-lvgl/0002-wayland-Fix-callback-data-type.patch
@@ -0,0 +1,30 @@
+From b7af695d79820adf53e7d612120bda12ed2886e2 Mon Sep 17 00:00:00 2001
+From: Marek Vasut <marex@denx.de>
+Date: Tue, 9 May 2023 02:57:38 +0200
+Subject: [PATCH 2/2] wayland: Fix callback data type
+
+The LVGL 8.3.y changed the callback data type, update it accordingly.
+
+Upstream-Status: Inappropriate [Upstream repo is archived]
+Signed-off-by: Marek Vasut <marex@denx.de>
+---
+ src/drivers/wayland.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/drivers/wayland.c b/src/drivers/wayland.c
+index bcebf4d..cfefa88 100644
+--- a/src/drivers/wayland.c
++++ b/src/drivers/wayland.c
+@@ -37,8 +37,7 @@ uint32_t custom_tick_get(void)
+        return time_ms;
+ }
+ 
+-
+-static lv_wayland_display_close_f_t close_cb()
++static bool close_cb(lv_disp_t * disp)
+ {
+ }
+ 
+-- 
+2.39.2
+
diff --git a/meta-oe/recipes-graphics/lvgl/dialog-lvgl_git.bb b/meta-oe/recipes-graphics/lvgl/dialog-lvgl_git.bb
index 7e24c51f28..9e820d0dbf 100644
--- a/meta-oe/recipes-graphics/lvgl/dialog-lvgl_git.bb
+++ b/meta-oe/recipes-graphics/lvgl/dialog-lvgl_git.bb
@@ -1,8 +1,11 @@
 # SPDX-FileCopyrightText: Huawei Inc.
 # SPDX-License-Identifier: MIT
 
-SRC_URI = "gitsm://git.ostc-eu.org/rzr/dialog-lvgl;destsuffix=${S};protocol=https;nobranch=1"
-SRCREV = "5d2121457a6988c97cacb0790594440693fc3d29"
+SRC_URI = "git://git.ostc-eu.org/rzr/dialog-lvgl;destsuffix=${S};protocol=https;nobranch=1 \
+           file://0001-wayland-Switch-to-custom-timer-tick.patch \
+           file://0002-wayland-Fix-callback-data-type.patch \
+           "
+SRCREV = "cdf8d38acca87e871c3a488fd07f1e4779590f8e"
 
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=8ce0a84e5276f01364119c873b712c4f"