From patchwork Sun May 7 13:23:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 23506 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 72831C7EE2D for ; Sun, 7 May 2023 13:24:22 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by mx.groups.io with SMTP id smtpd.web10.65318.1683465853315331417 for ; Sun, 07 May 2023 06:24:14 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@denx.de header.s=phobos-20191101 header.b=rHXbbB7V; spf=pass (domain: denx.de, ip: 85.214.62.61, mailfrom: marex@denx.de) Received: from tr.lan (ip-86-49-120-218.bb.vodafone.cz [86.49.120.218]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id E8EEC83744; Sun, 7 May 2023 15:24:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1683465850; bh=7eTJ+UDqzCa99H/JdkxGwzAJh4spvTRUKOaa8Me6aRU=; h=From:To:Cc:Subject:Date:From; b=rHXbbB7Vrq5dkMRELWOsmjAXDmBlMv9ku0ZiQA54/lRZGFtou92ajp0gAXlaiqVIZ Ctvuow1Gdnd4ATE0SuGxGV1lDIPB+eChKte1sy5eQkGo0dkHGq5hRrHwdz5jMcYZZ6 qWDYvce+fopefYEJFU4/XKWLw4aw54rmYll7coTEkG+Ghla9CC6jf8IwWIdZKxkPvI 4jSmpf+d4owekZyWZgmEIbL4Yp5odcZaPEqpyzaEDSEpd55dUGRDz4r5dRsUSVwvPI LipH9FW7J+WtTAnseLSX7mkNgsRSr87JRtKF4iZocTPE2Pp5fF+GuxBSR/IsMfs0hH ob8DfbSeuwmdg== From: Marek Vasut To: openembedded-devel@lists.openembedded.org Cc: Marek Vasut , Fabio Estevam , Khem Raj , Martin Jansa , Philippe Coval , Philippe Coval Subject: [meta-oe][PATCH 1/5] lvgl: Upgrade lvgl to 8.3.7 and lv-driver to 8.3.0 Date: Sun, 7 May 2023 15:23:45 +0200 Message-Id: <20230507132349.10674-1-marex@denx.de> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 07 May 2023 13:24:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/102327 Both the LVGL and lv-drivers are now available in 8.3.y release, upgrade both to latest 8.3.y release version in lock step. Also, lvgl contains no submodules, drop the gitsm fetcher use. Signed-off-by: Marek Vasut --- Cc: Fabio Estevam Cc: Khem Raj Cc: Martin Jansa Cc: Philippe Coval Cc: Philippe Coval --- .../lvgl/{lv-drivers_7.11.0.bb => lv-drivers_8.3.0.bb} | 5 ++--- .../recipes-graphics/lvgl/{lvgl_8.1.0.bb => lvgl_8.3.7.bb} | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) rename meta-oe/recipes-graphics/lvgl/{lv-drivers_7.11.0.bb => lv-drivers_8.3.0.bb} (89%) rename meta-oe/recipes-graphics/lvgl/{lvgl_8.1.0.bb => lvgl_8.3.7.bb} (89%) diff --git a/meta-oe/recipes-graphics/lvgl/lv-drivers_7.11.0.bb b/meta-oe/recipes-graphics/lvgl/lv-drivers_8.3.0.bb similarity index 89% rename from meta-oe/recipes-graphics/lvgl/lv-drivers_7.11.0.bb rename to meta-oe/recipes-graphics/lvgl/lv-drivers_8.3.0.bb index cf33c6904..d9cde497c 100644 --- a/meta-oe/recipes-graphics/lvgl/lv-drivers_7.11.0.bb +++ b/meta-oe/recipes-graphics/lvgl/lv-drivers_8.3.0.bb @@ -8,9 +8,8 @@ DESCRIPTION = "Collection of drivers: SDL, framebuffer, wayland and more..." LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=d6fc0df890c5270ef045981b516bb8f2" -# TODO: Pin upstream release (current v7.11.0-80-g419a757) -SRC_URI = "git://github.com/lvgl/lv_drivers;protocol=https;nobranch=1" -SRCREV = "419a757c23aaa67c676fe3a2196d64808fcf2254" +SRC_URI = "git://github.com/lvgl/lv_drivers;protocol=https;branch=release/v8.3" +SRCREV = "71830257710f430b6d8d1c324f89f2eab52488f1" DEPENDS = "libxkbcommon lvgl wayland" diff --git a/meta-oe/recipes-graphics/lvgl/lvgl_8.1.0.bb b/meta-oe/recipes-graphics/lvgl/lvgl_8.3.7.bb similarity index 89% rename from meta-oe/recipes-graphics/lvgl/lvgl_8.1.0.bb rename to meta-oe/recipes-graphics/lvgl/lvgl_8.3.7.bb index ea74c5918..a82ab3b74 100644 --- a/meta-oe/recipes-graphics/lvgl/lvgl_8.1.0.bb +++ b/meta-oe/recipes-graphics/lvgl/lvgl_8.3.7.bb @@ -8,8 +8,8 @@ SUMMARY = "Light and Versatile Graphics Library" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENCE.txt;md5=bf1198c89ae87f043108cea62460b03a" -SRC_URI = "gitsm://github.com/lvgl/lvgl;protocol=https;nobranch=1" -SRCREV = "d38eb1e689fa5a64c25e677275172d9c8a4ab2f0" +SRC_URI = "git://github.com/lvgl/lvgl;protocol=https;branch=release/v8.3" +SRCREV = "2b56e04205481daa6575bd5f7ab5df59d11676eb" REQUIRED_DISTRO_FEATURES = "wayland" From patchwork Sun May 7 13:23:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 23504 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5989CC7EE22 for ; Sun, 7 May 2023 13:24:22 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by mx.groups.io with SMTP id smtpd.web10.65319.1683465853387329980 for ; Sun, 07 May 2023 06:24:14 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@denx.de header.s=phobos-20191101 header.b=H8hAJMA2; spf=pass (domain: denx.de, ip: 85.214.62.61, mailfrom: marex@denx.de) Received: from tr.lan (ip-86-49-120-218.bb.vodafone.cz [86.49.120.218]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 5C70B842D0; Sun, 7 May 2023 15:24:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1683465850; bh=tfFJMdk6kX1q0pMTRBPinRdOFfPesvFI8c/gl7+T2Mg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H8hAJMA2CJrXOLoRknfexchlilUinVI2qV66qdYawx5xf1ZqWXzml2iazWXPY3KiW lPD+F9fMYpYs+xemCZURBRpAtw8nXxuOdA0tqHAhP+cBSJDXqnx1BtMMqV5J8A9ID7 AvjIC2+8Y8PEvukTtDZZYzVFZ6s0IAZn6Rkf3YZk9Wl5KaHyXCRuMhT1Yl6I5XziB1 XS2g8d5ShWFFio7hoqPAJtOCno1o+6GmCxUwb46NWypocIc5xzaTyG7/hPuP5PRJd1 5fD8IzDWC7xdx3XMRBk+pk5PLJOjhSKtjeqMeTc25BlIoxnpFOnkzE994Qv6UuM3B1 c9ZINZa4NEQUw== From: Marek Vasut To: openembedded-devel@lists.openembedded.org Cc: Marek Vasut , Fabio Estevam , Khem Raj , Martin Jansa , Philippe Coval , Philippe Coval Subject: [meta-oe][PATCH 2/5] lvgl: Activate custom tick implementation Date: Sun, 7 May 2023 15:23:46 +0200 Message-Id: <20230507132349.10674-2-marex@denx.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230507132349.10674-1-marex@denx.de> References: <20230507132349.10674-1-marex@denx.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 07 May 2023 13:24:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/102326 Use a custom tick source that tells the elapsed time in milliseconds. It removes the need to manually update the tick with `lv_tick_inc()`. This is the behavior which ought to be used for LVGL running on Linux compared to LVGL running on microcontroller. Signed-off-by: Marek Vasut --- Cc: Fabio Estevam Cc: Khem Raj Cc: Martin Jansa Cc: Philippe Coval Cc: Philippe Coval --- meta-oe/recipes-graphics/lvgl/lvgl_8.3.7.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta-oe/recipes-graphics/lvgl/lvgl_8.3.7.bb b/meta-oe/recipes-graphics/lvgl/lvgl_8.3.7.bb index a82ab3b74..5f3fc44cf 100644 --- a/meta-oe/recipes-graphics/lvgl/lvgl_8.3.7.bb +++ b/meta-oe/recipes-graphics/lvgl/lvgl_8.3.7.bb @@ -28,6 +28,11 @@ do_configure:prepend() { [ -r "${S}/lv_conf.h" ] \ || sed -e 's|#if 0 .*Set it to "1" to enable .*|#if 1 // Enabled|g' \ -e "s|\(#define LV_MEM_CUSTOM .*\)0|\1${LVGL_CONFIG_LV_MEM_CUSTOM}|g" \ + \ + -e "s|\(#define LV_TICK_CUSTOM \).*|\1 1|g" \ + -e "s|\(#define LV_TICK_CUSTOM_INCLUDE \).*|\1 |g" \ + -e "s|\(#define LV_TICK_CUSTOM_SYS_TIME_EXPR \).*|extern uint32_t custom_tick_get(void);\n\1 (custom_tick_get())|g" \ + \ < "${S}/lv_conf_template.h" > "${S}/lv_conf.h" } From patchwork Sun May 7 13:23:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 23505 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58325C77B75 for ; Sun, 7 May 2023 13:24:22 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by mx.groups.io with SMTP id smtpd.web10.65320.1683465853456698547 for ; Sun, 07 May 2023 06:24:14 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@denx.de header.s=phobos-20191101 header.b=gf4gT56+; spf=pass (domain: denx.de, ip: 85.214.62.61, mailfrom: marex@denx.de) Received: from tr.lan (ip-86-49-120-218.bb.vodafone.cz [86.49.120.218]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id BAA2084692; Sun, 7 May 2023 15:24:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1683465851; bh=K2dRu7L3amCHnHZbcn83FR1XE0MoP7cfLx51wNk3mV4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gf4gT56+ZHLMiH00UmVuknMuQyNgNGO4WS4OI7kKpycyEfHEBcqd5fnVIesr31u6+ a5SSrEQvzrDloeQxaGDDLZTRes74QNMas3F8y9Vi1Il3JNUyOOIi7hBp+Mfiq9Eax4 qF2hVQa2YPpY1qMHhHw9EzhuUCrRFjUZXEOFtktxjcUVtHU6tEk5QZcsaBElrNBSsR 7Ao9qZxmw4rGPQ3yL8C7BCOKBBcqK+ZVMzT8Oz9jKeWQH/xGWh0K7GfeV36I81A7i3 PAr8AR0USEJTugWtysV6PyU240GlAR3bH+80ziWIn5SefH9WRidCbh4dV2ILO+3tVn SCiUGhGa9BoAw== From: Marek Vasut To: openembedded-devel@lists.openembedded.org Cc: Marek Vasut , Fabio Estevam , Khem Raj , Martin Jansa , Philippe Coval , Philippe Coval Subject: [meta-oe][PATCH 3/5] lvgl: Add configurable color depth, default to 32bpp Date: Sun, 7 May 2023 15:23:47 +0200 Message-Id: <20230507132349.10674-3-marex@denx.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230507132349.10674-1-marex@denx.de> References: <20230507132349.10674-1-marex@denx.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 07 May 2023 13:24:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/102330 Make color depth configurable and default to 32bpp . Signed-off-by: Marek Vasut --- Cc: Fabio Estevam Cc: Khem Raj Cc: Martin Jansa Cc: Philippe Coval Cc: Philippe Coval --- meta-oe/recipes-graphics/lvgl/lvgl_8.3.7.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-oe/recipes-graphics/lvgl/lvgl_8.3.7.bb b/meta-oe/recipes-graphics/lvgl/lvgl_8.3.7.bb index 5f3fc44cf..a3fd7e04c 100644 --- a/meta-oe/recipes-graphics/lvgl/lvgl_8.3.7.bb +++ b/meta-oe/recipes-graphics/lvgl/lvgl_8.3.7.bb @@ -20,6 +20,7 @@ EXTRA_OECMAKE = "-DLIB_INSTALL_DIR=${baselib}" S = "${WORKDIR}/git" LVGL_CONFIG_LV_MEM_CUSTOM ?= "0" +LVGL_CONFIG_LV_COLOR_DEPTH ?= "32" # Upstream does not support a default configuration # but propose a default "disabled" template, which is used as reference @@ -27,6 +28,8 @@ LVGL_CONFIG_LV_MEM_CUSTOM ?= "0" do_configure:prepend() { [ -r "${S}/lv_conf.h" ] \ || sed -e 's|#if 0 .*Set it to "1" to enable .*|#if 1 // Enabled|g' \ + -e "s|\(#define LV_COLOR_DEPTH \).*|\1 ${LVGL_CONFIG_LV_COLOR_DEPTH}|g" \ + \ -e "s|\(#define LV_MEM_CUSTOM .*\)0|\1${LVGL_CONFIG_LV_MEM_CUSTOM}|g" \ \ -e "s|\(#define LV_TICK_CUSTOM \).*|\1 1|g" \ From patchwork Sun May 7 13:23:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 23508 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5BE78C77B7C for ; Sun, 7 May 2023 13:24:22 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by mx.groups.io with SMTP id smtpd.web11.65338.1683465853070623652 for ; Sun, 07 May 2023 06:24:14 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@denx.de header.s=phobos-20191101 header.b=eOnY1Ibx; spf=pass (domain: denx.de, ip: 85.214.62.61, mailfrom: marex@denx.de) Received: from tr.lan (ip-86-49-120-218.bb.vodafone.cz [86.49.120.218]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 2895484693; Sun, 7 May 2023 15:24:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1683465851; bh=ZXFK9KB+MuxYqVnPr5RZj3AlBuWduoxPQxShyw0bdcY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eOnY1IbxVXRsvm4MBUpbCBFL/7QZryNZK3akrIsCeSlku+kTzEMQwlDwTGtNT1HFp WERs2Kmp/erYQunSQW0VI58tffWiKfpHCpHuARKGCn4aBtmnziCRnbtTsAAoxXj7QC JRAMnQ3GH/DfgpSxj9vi/11L4KWTM/wOQRQFJIFvXOuBDjUpbZhH1bxVXsyJlj1JGJ dMBm4ZJkWXjdb0bg/XtHMX1X2ScxtO8ejXTwRkErEUao+SlwmrxbKSDpxQ2j/94CeG 9BPajHf8Id7vYwov30/coLjTWrzjLWdvhoqB7P6r4QlZYtJgbsPyq5uDmxRJKYK0cf 0mlqJvAFLC5eA== From: Marek Vasut To: openembedded-devel@lists.openembedded.org Cc: Marek Vasut , Fabio Estevam , Khem Raj , Martin Jansa , Philippe Coval , Philippe Coval Subject: [meta-oe][PATCH 4/5] lvgl: Support both fbdev and wayland backends Date: Sun, 7 May 2023 15:23:48 +0200 Message-Id: <20230507132349.10674-4-marex@denx.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230507132349.10674-1-marex@denx.de> References: <20230507132349.10674-1-marex@denx.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 07 May 2023 13:24:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/102329 The LVGL can be operated on top of fbdev as well as on WL compositor. Support both, which is a matter of configuring lv-drivers package per required backend. Determine the backend from DISTRO_FEATURES, since both 'wayland' and 'fbdev' are valid DISTRO_FEATURES. Add a bit more sed hacking of the configuration, which enables either FBDEV or WL backend. One notable item here is the enablement of EVDEV support, which is required for FBDEV backend, so in case FBDEV is enabled, so is EVDEV. Signed-off-by: Marek Vasut --- Cc: Fabio Estevam Cc: Khem Raj Cc: Martin Jansa Cc: Philippe Coval Cc: Philippe Coval --- meta-oe/recipes-graphics/lvgl/lv-drivers_8.3.0.bb | 15 +++++++++++---- meta-oe/recipes-graphics/lvgl/lvgl_8.3.7.bb | 3 --- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/meta-oe/recipes-graphics/lvgl/lv-drivers_8.3.0.bb b/meta-oe/recipes-graphics/lvgl/lv-drivers_8.3.0.bb index d9cde497c..a0a2ee0aa 100644 --- a/meta-oe/recipes-graphics/lvgl/lv-drivers_8.3.0.bb +++ b/meta-oe/recipes-graphics/lvgl/lv-drivers_8.3.0.bb @@ -11,12 +11,15 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d6fc0df890c5270ef045981b516bb8f2" SRC_URI = "git://github.com/lvgl/lv_drivers;protocol=https;branch=release/v8.3" SRCREV = "71830257710f430b6d8d1c324f89f2eab52488f1" -DEPENDS = "libxkbcommon lvgl wayland" +DEPENDS = "lvgl" -REQUIRED_DISTRO_FEATURES = "wayland" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland fbdev', d)}" +PACKAGECONFIG[fbdev] = ",," +PACKAGECONFIG[wayland] = ",,libxkbcommon wayland" +LVGL_CONFIG_USE_FBDEV = "${@bb.utils.contains('PACKAGECONFIG', 'fbdev', '1', '0', d)}" +LVGL_CONFIG_USE_WAYLAND = "${@bb.utils.contains('PACKAGECONFIG', 'wayland', '1', '0', d)}" inherit cmake -inherit features_check S = "${WORKDIR}/git" @@ -34,7 +37,11 @@ TARGET_CFLAGS += "-I${STAGING_INCDIR}/lvgl" do_configure:append() { [ -r "${S}/lv_drv_conf.h" ] \ || sed -e "s|#if 0 .*Set it to \"1\" to enable the content.*|#if 1 // Enabled by ${PN}|g" \ - -e "s|# define USE_WAYLAND 0|# define USE_WAYLAND 1|g" \ + \ + -e "s|\(^# define USE_FBDEV \).*|# define USE_FBDEV ${LVGL_CONFIG_USE_FBDEV}|g" \ + -e "s|\(^# define USE_EVDEV \).*|# define USE_EVDEV ${LVGL_CONFIG_USE_FBDEV}|g" \ + \ + -e "s|\(^# define USE_WAYLAND \).*|# define USE_WAYLAND ${LVGL_CONFIG_USE_WAYLAND}|g" \ -e "s|\(^ *# *define *WAYLAND_HOR_RES *\).*|\1${LVGL_CONFIG_WAYLAND_HOR_RES}|g" \ -e "s|\(^ *# *define *WAYLAND_VER_RES *\).*|\1${LVGL_CONFIG_WAYLAND_VER_RES}|g" \ < "${S}/lv_drv_conf_template.h" > "${S}/lv_drv_conf.h" diff --git a/meta-oe/recipes-graphics/lvgl/lvgl_8.3.7.bb b/meta-oe/recipes-graphics/lvgl/lvgl_8.3.7.bb index a3fd7e04c..860ee7a33 100644 --- a/meta-oe/recipes-graphics/lvgl/lvgl_8.3.7.bb +++ b/meta-oe/recipes-graphics/lvgl/lvgl_8.3.7.bb @@ -11,10 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.txt;md5=bf1198c89ae87f043108cea62460b03a" SRC_URI = "git://github.com/lvgl/lvgl;protocol=https;branch=release/v8.3" SRCREV = "2b56e04205481daa6575bd5f7ab5df59d11676eb" -REQUIRED_DISTRO_FEATURES = "wayland" - inherit cmake -inherit features_check EXTRA_OECMAKE = "-DLIB_INSTALL_DIR=${baselib}" S = "${WORKDIR}/git" From patchwork Sun May 7 13:23:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 23507 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 726C4C7EE26 for ; Sun, 7 May 2023 13:24:22 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by mx.groups.io with SMTP id smtpd.web11.65340.1683465853432308268 for ; Sun, 07 May 2023 06:24:14 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@denx.de header.s=phobos-20191101 header.b=Af9REl++; spf=pass (domain: denx.de, ip: 85.214.62.61, mailfrom: marex@denx.de) Received: from tr.lan (ip-86-49-120-218.bb.vodafone.cz [86.49.120.218]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 890D384694; Sun, 7 May 2023 15:24:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1683465851; bh=3M01pKNSuFZwTN/Ormr71Gc0ORWV/pM7NxEDxwllYNw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Af9REl++8XCm4MkPzRiC0p6GYyhqrBsE6YrAesXW6pWNT9Sy7M1eCHZpOcl8/RY4K iYgBNPbfUUSerEs2Ib6tzK17SatbUU14bdZS3A2P1HFYYgLF1BSt0SPnT4uM9LtIto ehrwgB7blzVl+YkYrBiik1QXf12npMl25WhvwY8fQUtLoblx8Hf/yznWrhLRpk8iRS AOa1/1L4tnMhcqEX3ue8/h/5lKjSY7pcx1W8szj0gyqvZ/GHBktOBBpMDg8JH5KDF+ 38u8bI/byJtY4T5rldTYZj4iXXh5Zsr16vYQMJ6bkiU6pXSXDXQ3oDuy07cktkzrBD LfFvE+Wy2klmQ== From: Marek Vasut To: openembedded-devel@lists.openembedded.org Cc: Marek Vasut , Fabio Estevam , Khem Raj , Martin Jansa , Philippe Coval , Philippe Coval Subject: [meta-oe][PATCH 5/5] lvgl: Upgrade lvgl-demo-fb to 8.3 and decouple from submodules Date: Sun, 7 May 2023 15:23:49 +0200 Message-Id: <20230507132349.10674-5-marex@denx.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230507132349.10674-1-marex@denx.de> References: <20230507132349.10674-1-marex@denx.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 07 May 2023 13:24:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/102328 The lvgl-demo-fb really contains its own copy of lvgl and lv-drivers, for which meta-openembedded already contains its own recipes. Stop pulling those as git submodules and instead only pull the example application, and compile it against the lvgl and lv-drivers from local recipes. Upgrade the lvgl-demo-fb to 8.3.0 to match the lvgl and lv-drivers too. Signed-off-by: Marek Vasut --- Cc: Fabio Estevam Cc: Khem Raj Cc: Martin Jansa Cc: Philippe Coval Cc: Philippe Coval --- .../lvgl/{lvgl-demo-fb.bb => lvgl-demo-fb_8.3.0.bb} | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) rename meta-oe/recipes-graphics/lvgl/{lvgl-demo-fb.bb => lvgl-demo-fb_8.3.0.bb} (72%) diff --git a/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb.bb b/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_8.3.0.bb similarity index 72% rename from meta-oe/recipes-graphics/lvgl/lvgl-demo-fb.bb rename to meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_8.3.0.bb index 3430c2491..6d9ff89f5 100644 --- a/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb.bb +++ b/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_8.3.0.bb @@ -5,8 +5,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=802d3d83ae80ef5f343050bf96cce3a4 \ file://lv_drivers/LICENSE;md5=d6fc0df890c5270ef045981b516bb8f2 \ file://lvgl/LICENCE.txt;md5=bf1198c89ae87f043108cea62460b03a" -SRC_URI = "gitsm://github.com/lvgl/lv_port_linux_frame_buffer.git;branch=master;protocol=https" -SRCREV = "dd010430b959f40b8f25a51c76bc920cbc2550cc" +DEPENDS = "lvgl lv-drivers" + +SRC_URI = "git://github.com/lvgl/lv_port_linux_frame_buffer.git;branch=master;protocol=https" +SRCREV = "adf2c4490e17a1b9ec1902cc412a24b3b8235c8e" S = "${WORKDIR}/git"