From patchwork Sat Mar 16 10:00:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Chapuis X-Patchwork-Id: 41105 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 0F184C54E5D for ; Sat, 16 Mar 2024 10:01:18 +0000 (UTC) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.groups.io with SMTP id smtpd.web11.3695.1710583260405089585 for ; Sat, 16 Mar 2024 03:01:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=cdxD8ApH; spf=pass (domain: gmail.com, ip: 209.85.128.47, mailfrom: chris.chapuis@gmail.com) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-41408d7781cso1414385e9.3 for ; Sat, 16 Mar 2024 03:01:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710583258; x=1711188058; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=sgHubziGPBSPEBCvMp3/7v8WFnBcrq6OrK0Cz+xAg5E=; b=cdxD8ApHYbVhfPXLlIT8wAG4gaBp9ATBmuOWCLpZRE48nPFnWO7FXN/UGBA6W3R5bD 0n5Bch+Ma8mw9T79TWcOA97psy7xq7qfK3GB9ejJgOZdmZbA7aaNN1AMFN2OUlLop3lS 4JexQ6Xy+L0eRTUT9UWnVnWniLC4cJxqX+oybHnXcGNNtqAtTRCylu8wErzdQ5MW73Kn x7o9AnvNk7hniMPp7/ku43V3z/gWdYcpi4+pWZxDmI6zym3G0L8i2LaigKGMWmDEhDYH uJwa0CymRjg/TEN15y02HM5eGBztw77ngyAEDSIF2dINbqFC1hjGixUIpdw0A0NaAhii HuDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710583258; x=1711188058; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=sgHubziGPBSPEBCvMp3/7v8WFnBcrq6OrK0Cz+xAg5E=; b=qHJ3HLt/7/XZCWRGbwGnvaXe4OM0EcFfbkyJDs9yPOVW2HhXJt/jalIGsMXYSDP0t1 /1AFA1Qlgg1bj0URQJQ9ZFrvDlFFz2XF7Hbb0nhxUBpFg14NUFds6U9oMAZ8xuhLBqlS WEk+3diIW+zQ9jrLk42GGuIlNJDDV8DvZE5a7K+c1mKlEY0h+8/RSBakSi4NdM2gSTCi dJlJKFswg1dF6mG7BWb8eh7yvS9kNlWFMlqWarZOtZ2q1/t5Hy25zPbnTJKPvqJfDM31 IunlxpU6Px3Zj0C8vtss/gBhnLe+YJH5QkUP7INgqHt5k75YmkmRZSlWEzGiIXZbhBZz XXaA== X-Gm-Message-State: AOJu0Yy9XCfdcFf7Jo2mHizDAYmxVH5XaX/Or/BMouPJsCixNkic8PcK QkulyMmJKiyGhW3Nd8r2KQyr7GO0EH+DyNgkqG6X155Zf03ArOyFOaRchV1EGt8= X-Google-Smtp-Source: AGHT+IElLSPeTdUe3o3EKDVq10nj5Cvamh8IlhTW/jfOkdm63uIx8oE5j3PZyWKV9BqWPXie0PZr6w== X-Received: by 2002:a05:600c:a03:b0:414:9fa:1d4c with SMTP id z3-20020a05600c0a0300b0041409fa1d4cmr14579wmp.29.1710583258024; Sat, 16 Mar 2024 03:00:58 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:5d9:6330:4d5:74f6:de66:f26e]) by smtp.gmail.com with ESMTPSA id je2-20020a05600c1f8200b004133072017csm11679806wmb.42.2024.03.16.03.00.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Mar 2024 03:00:57 -0700 (PDT) From: Christophe Chapuis To: openembedded-devel@lists.openembedded.org Cc: Marek Vasut , Khem Raj , Fabio Estevam , Christophe Chapuis Subject: [meta-oe][PATCH v4 1/7] lvgl: fix typo in lv-conf.inc Date: Sat, 16 Mar 2024 11:00:50 +0100 Message-ID: <20240316100056.409758-1-chris.chapuis@gmail.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 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 ; Sat, 16 Mar 2024 10:01:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/109356 Fix a typo in the first sed instruction, where the #if 0 is never changed to #if 1 at the beginning of lv_conf.h. Signed-off-by: Christophe Chapuis Reviewed-by: Marek Vasut --- meta-oe/recipes-graphics/lvgl/lv-conf.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-graphics/lvgl/lv-conf.inc b/meta-oe/recipes-graphics/lvgl/lv-conf.inc index cb676ac62..3dbdf769f 100644 --- a/meta-oe/recipes-graphics/lvgl/lv-conf.inc +++ b/meta-oe/recipes-graphics/lvgl/lv-conf.inc @@ -24,7 +24,7 @@ do_configure:append() { # If there is a configuration template, start from that [ -r "${S}/lv_conf_template.h" ] && cp -Lv "${S}/lv_conf_template.h" "${S}/lv_conf.h" - sed -e "s|#if 0 .*Set it to \"1\" to enable the content.*|#if 1 // Enabled by ${PN}|g" \ + sed -e "s|#if 0 .*Set it to \"1\" to enable content.*|#if 1 // Enabled by ${PN}|g" \ \ -e "s|\(^#define LV_USE_LINUX_DRM \).*|#define LV_USE_LINUX_DRM ${LVGL_CONFIG_USE_DRM}|g" \ \ From patchwork Sat Mar 16 10:00:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Chapuis X-Patchwork-Id: 41108 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 59142C54E72 for ; Sat, 16 Mar 2024 10:01:18 +0000 (UTC) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.groups.io with SMTP id smtpd.web10.3719.1710583260867406460 for ; Sat, 16 Mar 2024 03:01:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=QA/tIGm4; spf=pass (domain: gmail.com, ip: 209.85.128.49, mailfrom: chris.chapuis@gmail.com) Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-41409cabd87so413845e9.2 for ; Sat, 16 Mar 2024 03:01:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710583259; x=1711188059; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iVXmbdFysuHfKUJiMoFxba6cIippSEUFAoQy1GdEDTA=; b=QA/tIGm4/IeynT3LYDGZsUF5oaIRviZOdx3NeAi5flwb27GupvGDbQgXFCN8iZZHoP nfsmfKeF7+tOhZh+V7jJHlTuhm9uz9UxzT53pB96Bi0OXadrcFK/gDSkUy0U5aXSc3Q9 QgfaiW6wx32Lnxruk/DSq6JPzP20ECB7RshxVX/Usq0dUcXdUWJ+s2OZeMhhxO2XSITi L49XCVj2NLCOKns8LEF38WqSz2wkwD4MYAO4dUjZNyXcYHXuKe2DRvPzaFpBOxkU4Inm 79Xc7mKooUxPB6+xAWpNvJRv6+XGLi9fRJjyW7XleA6pkDYKbhmwDa+cwiS9fQRoaWNP JjQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710583259; x=1711188059; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iVXmbdFysuHfKUJiMoFxba6cIippSEUFAoQy1GdEDTA=; b=I/UruUxrKF3vw2i3lEjtVyF+EoJFqXXwiFhDAWwKitMJ4rBkl2jmyIoaM2xTOidH/E eTakdQUxFNqU+h+rldS67IeBMCQZ6xToN9RPrFqLBzQS1rsYiUtbafrOoolxw6sGDhyx JGaK3BU9tktPq9damkTjWFpmDOquoKCgcso8SB/pJvg3ATSspIBvenKge4zbR9ughTFP 3dAaY/sUZ+RcU3t54BFwMANRLJAlwAA3kPP4J/PnAmoMO0Q6ztaw+TuJbj1g/wirI1lS MlKF6wm3nmonpUn7yR3TxC/e8hhElFJVD9SFsgJCnIiix1La9z/69qtJrfBpfNkOcifW l0nQ== X-Gm-Message-State: AOJu0YxmS9ieuTNqxqy3yRaEo5+gUhpN41qMffv0DOBA4fJWsD/yD6C7 nPilJn33xmoHqvCmnYr+8BRbFUhVjGZiPTmNHUuO5dTrkoTje1pbXcEZzzZjXIA= X-Google-Smtp-Source: AGHT+IGmaZdgbeJ5AzjnDlpn1llWjxdqJNGJwuwOw2uRjw+ymnck4sT3zMEbkI6M9mx5Q1FOGXWY3g== X-Received: by 2002:a05:600c:4752:b0:414:8e7:cd60 with SMTP id w18-20020a05600c475200b0041408e7cd60mr412015wmo.8.1710583258664; Sat, 16 Mar 2024 03:00:58 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:5d9:6330:4d5:74f6:de66:f26e]) by smtp.gmail.com with ESMTPSA id je2-20020a05600c1f8200b004133072017csm11679806wmb.42.2024.03.16.03.00.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Mar 2024 03:00:58 -0700 (PDT) From: Christophe Chapuis To: openembedded-devel@lists.openembedded.org Cc: Marek Vasut , Khem Raj , Fabio Estevam , Christophe Chapuis Subject: [meta-oe][PATCH v4 2/7] lvgl: install lv_conf.h Date: Sat, 16 Mar 2024 11:00:51 +0100 Message-ID: <20240316100056.409758-2-chris.chapuis@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240316100056.409758-1-chris.chapuis@gmail.com> References: <20240316100056.409758-1-chris.chapuis@gmail.com> MIME-Version: 1.0 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 ; Sat, 16 Mar 2024 10:01:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/109357 Add an install append to copy the generated lv_conf.h as part of the lvgl package, so that it will be found and used by the recipes that want to use lvgl. Signed-off-by: Christophe Chapuis Reviewed-by: Marek Vasut --- meta-oe/recipes-graphics/lvgl/lvgl_9.0.0.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta-oe/recipes-graphics/lvgl/lvgl_9.0.0.bb b/meta-oe/recipes-graphics/lvgl/lvgl_9.0.0.bb index b84fc5a3d..58053d830 100644 --- a/meta-oe/recipes-graphics/lvgl/lvgl_9.0.0.bb +++ b/meta-oe/recipes-graphics/lvgl/lvgl_9.0.0.bb @@ -26,6 +26,11 @@ ALLOW_EMPTY:${PN} = "1" PACKAGECONFIG ??= "drm" require lv-conf.inc +do_install:append() { + install -d "${D}${includedir}/${PN}" + install -m 0644 "${S}/lv_conf.h" "${D}${includedir}/${PN}/lv_conf.h" +} + FILES:${PN}-dev += "\ ${includedir}/${PN}/ \ ${includedir}/${PN}/lvgl/ \ From patchwork Sat Mar 16 10:00:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Chapuis X-Patchwork-Id: 41109 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 1C6F8C54E60 for ; Sat, 16 Mar 2024 10:01:18 +0000 (UTC) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.groups.io with SMTP id smtpd.web10.3721.1710583261783215062 for ; Sat, 16 Mar 2024 03:01:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=atGo8ku9; spf=pass (domain: gmail.com, ip: 209.85.128.51, mailfrom: chris.chapuis@gmail.com) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-41409125108so1008495e9.2 for ; Sat, 16 Mar 2024 03:01:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710583259; x=1711188059; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=czfVRMswedzpfmuzNZn3r7UO0yDVzoLKbjLmLHrrm7M=; b=atGo8ku9ar+O7xwgr0JKKvXxQQ30TQTVnp0UgbTqpDFfzAg7P9W57sRmZKzPFDyHAK biVgf1zpKG9ly9XWDZQ8KWCDviHZ27/aKrfA3OCp4wnaOFaKLw0IJuE6LnGSqgb5EETQ qx/MmRZk/BTsd7pHJEKomqRCvj/jpPSXSG9OPlr0qbpt6iMMAqDh3yBrDoYcv1CAg9Y2 8+3r7QMFymj6Nha4YWCMfCJUJNXbQdl/5kTdDTbZd+MTI9OC8nzTwdYXBu5KtnpQ2BCq /xMCv5wX/XCkMhjz5u85NEbH7wvoqj0wtHi5Z5Z3Lw0c7gJLiDxU2kAafbdaCJKLjuuk kHCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710583259; x=1711188059; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=czfVRMswedzpfmuzNZn3r7UO0yDVzoLKbjLmLHrrm7M=; b=jtMW/ZlcjSlozFmtp3KboPYF4utNC02ejEDkE03LuROA9sDAjoPtrf9mmWVr9lI9O0 vkFPhlAo7MKSaRcOlFGFc82SzfnZYVEErv4kkdtCEZeaNyUrdzoPSEijzIOMftnfbpsU lF07VmBH8XeXR1YUKVckkyp9q+pKIjWSDIpJVXktE3I4oID2UJYBp6AorA/YrvUM+xkk xpRjxV1Svcxz2fdY4Go3yMm5bD5mcjR9GPqiUm8epZdCtiz3IkKIlt/wf1TPB4jDI24s jQKfdoCeEv1HKPXPEsfi2fvq1M2jcwfCi60u2S6ef/4/aZGNtckDAHvedYlVAJc1BxNO v79Q== X-Gm-Message-State: AOJu0YzKvMorC9Em8wv6aGHh+J2PT0qBW834PWsFvUSl7d6S+dYP2/Yo 5KHhU0sCHmbBAYhE8fRyK2GL4EvbvKauM5AH71IjY4Rbmc3rg6gA6pmV/yBO9aM= X-Google-Smtp-Source: AGHT+IHuq0BxBdi2hVAT59Aasw5OFS51LNeD9J/4JULAaBgcRrtXE/VzYtjz4U4i9eFr6zunV9IWGw== X-Received: by 2002:a05:600c:4ec6:b0:414:85f:1f72 with SMTP id g6-20020a05600c4ec600b00414085f1f72mr593112wmq.6.1710583259436; Sat, 16 Mar 2024 03:00:59 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:5d9:6330:4d5:74f6:de66:f26e]) by smtp.gmail.com with ESMTPSA id je2-20020a05600c1f8200b004133072017csm11679806wmb.42.2024.03.16.03.00.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Mar 2024 03:00:59 -0700 (PDT) From: Christophe Chapuis To: openembedded-devel@lists.openembedded.org Cc: Marek Vasut , Khem Raj , Fabio Estevam , Christophe Chapuis Subject: [meta-oe][PATCH v4 3/7] lvgl: remove useless FILES include Date: Sat, 16 Mar 2024 11:00:52 +0100 Message-ID: <20240316100056.409758-3-chris.chapuis@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240316100056.409758-1-chris.chapuis@gmail.com> References: <20240316100056.409758-1-chris.chapuis@gmail.com> MIME-Version: 1.0 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 ; Sat, 16 Mar 2024 10:01:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/109358 As ${includedir}${PN} is already listed in FILES, there is no need to add one of its subdirectories. Signed-off-by: Christophe Chapuis Reviewed-by: Marek Vasut --- meta-oe/recipes-graphics/lvgl/lvgl_9.0.0.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-oe/recipes-graphics/lvgl/lvgl_9.0.0.bb b/meta-oe/recipes-graphics/lvgl/lvgl_9.0.0.bb index 58053d830..8bd718efd 100644 --- a/meta-oe/recipes-graphics/lvgl/lvgl_9.0.0.bb +++ b/meta-oe/recipes-graphics/lvgl/lvgl_9.0.0.bb @@ -33,7 +33,6 @@ do_install:append() { FILES:${PN}-dev += "\ ${includedir}/${PN}/ \ - ${includedir}/${PN}/lvgl/ \ " SOLIBS = ".so" FILES_SOLIBSDEV = "" From patchwork Sat Mar 16 10:00:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Chapuis X-Patchwork-Id: 41110 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 34D93C54E6E for ; Sat, 16 Mar 2024 10:01:18 +0000 (UTC) Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) by mx.groups.io with SMTP id smtpd.web10.3723.1710583262477347645 for ; Sat, 16 Mar 2024 03:01:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=YG2W5Aeu; spf=pass (domain: gmail.com, ip: 209.85.167.42, mailfrom: chris.chapuis@gmail.com) Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-513d599dbabso2749918e87.1 for ; Sat, 16 Mar 2024 03:01:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710583260; x=1711188060; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bE50ZDvGyWcxiWlkEojYtVSiaD9jz1Lilwg0dL+d7hI=; b=YG2W5AeudNxoTLmbaNmD2pQk7X9ol3nmfwXqcsD4W/NY/S0h59k4J8lvuSDVtcBIPt WLjpzTz11kJW44eHR47SO8/5fmMlhw1sfIvquA+DKjlhSjE/v6G2K0/O9eUiIumhpTQS obcYNrLW7o/6mV5douobMpciUnXvS+9iMjkN0lBg99LwvNO8W+Yym/1Z7XFjVsN+SsdJ nJdXHEgNa0+oagbhe62p64hCum6JFNzU8owMfHtVDJDZe1FC1uppbZ+PCWWOdI//T91Q EIWUtw6MDNMgg3e7LQcyocmSasEW8eScZvhzLveqDmjK9XeewnK+6UYpaldgoe8qKC6P WXGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710583260; x=1711188060; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bE50ZDvGyWcxiWlkEojYtVSiaD9jz1Lilwg0dL+d7hI=; b=cljEV/e+rdQnGIjH8++yfB06H1QAmHaZxfehR6b7Ii8SZKsjSKokVfvgEP5chCerCn Am0xIvkCEEONT8SpnnoNp3nQhIbfqjBwsqxhQRlw5q9A6YXmfQb1AmTDPPDVDutm0GID TGR/RC0yUOnmTx8iCCCRaZG8qUO34YTbZtLruJlbQjhVoBPsSfk9kxHeOojgseYLw0D2 q20bXNWklAQ0wOoty+MuI9zdYm7/u2zwTS1FML39Sbn/X0LScDYwMMrrK2ZvH/Dyf8X8 3gubxpq9EUlhRhXrtVdcKAK5x6jJZ/RZ1Eol5fVfaOpTndJS2hdY8XMVA3nkowZxoM09 0HKQ== X-Gm-Message-State: AOJu0Yxc2ZxAvo/7JEwvZs0niq/zzKkud9J+Zc3W9DUBdBpstCVQRsVw DYqaeYg4DKr6k5UH+AaOVxz6qJBr1GG7csq0h/74esFf1wgSpbVkLYc+rAZTo7c= X-Google-Smtp-Source: AGHT+IEaZuZwaB6/AG4wB7t0BOBy9TfZERSF1YL8tC7nujdFs5m0E/5bVGzvppx7R00acCa35/WPpA== X-Received: by 2002:ac2:596c:0:b0:513:a944:704e with SMTP id h12-20020ac2596c000000b00513a944704emr4451519lfp.63.1710583260043; Sat, 16 Mar 2024 03:01:00 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:5d9:6330:4d5:74f6:de66:f26e]) by smtp.gmail.com with ESMTPSA id je2-20020a05600c1f8200b004133072017csm11679806wmb.42.2024.03.16.03.00.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Mar 2024 03:00:59 -0700 (PDT) From: Christophe Chapuis To: openembedded-devel@lists.openembedded.org Cc: Marek Vasut , Khem Raj , Fabio Estevam , Christophe Chapuis Subject: [meta-oe][PATCH v4 4/7] lvgl: cleanup sed instructions in lv-conf.inc Date: Sat, 16 Mar 2024 11:00:53 +0100 Message-ID: <20240316100056.409758-4-chris.chapuis@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240316100056.409758-1-chris.chapuis@gmail.com> References: <20240316100056.409758-1-chris.chapuis@gmail.com> MIME-Version: 1.0 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 ; Sat, 16 Mar 2024 10:01:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/109359 Use back reference instead of repeating the search pattern. Later on this could lead to a more generic way of replacing values in the .h file. Signed-off-by: Christophe Chapuis Reviewed-by: Marek Vasut --- meta-oe/recipes-graphics/lvgl/lv-conf.inc | 28 +++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/meta-oe/recipes-graphics/lvgl/lv-conf.inc b/meta-oe/recipes-graphics/lvgl/lv-conf.inc index 3dbdf769f..e43a4d508 100644 --- a/meta-oe/recipes-graphics/lvgl/lv-conf.inc +++ b/meta-oe/recipes-graphics/lvgl/lv-conf.inc @@ -26,29 +26,29 @@ do_configure:append() { sed -e "s|#if 0 .*Set it to \"1\" to enable content.*|#if 1 // Enabled by ${PN}|g" \ \ - -e "s|\(^#define LV_USE_LINUX_DRM \).*|#define LV_USE_LINUX_DRM ${LVGL_CONFIG_USE_DRM}|g" \ + -e "s|\(^#define LV_USE_LINUX_DRM \).*|\1${LVGL_CONFIG_USE_DRM}|g" \ \ - -e "s|\(^#define LV_USE_LINUX_FBDEV \).*|#define LV_USE_LINUX_FBDEV ${LVGL_CONFIG_USE_FBDEV}|g" \ + -e "s|\(^#define LV_USE_LINUX_FBDEV \).*|\1${LVGL_CONFIG_USE_FBDEV}|g" \ \ - -e "s|\(^#define LV_USE_SDL \).*|#define LV_USE_SDL ${LVGL_CONFIG_USE_SDL}|g" \ - -e "s|\(^#define LV_USE_DRAW_SDL \).*|#define LV_USE_DRAW_SDL ${LVGL_CONFIG_USE_SDL}|g" \ - -e "s|\(^ #define LV_SDL_BUF_COUNT \).*| #define LV_SDL_BUF_COUNT 2|g" \ - -e "s|\(^ #define LV_SDL_FULLSCREEN \).*| #define LV_SDL_FULLSCREEN ${LVGL_CONFIG_SDL_FULLSCREEN}|g" \ + -e "s|\(^#define LV_USE_SDL \).*|\1${LVGL_CONFIG_USE_SDL}|g" \ + -e "s|\(^#define LV_USE_DRAW_SDL \).*|\1${LVGL_CONFIG_USE_SDL}|g" \ + -e "s|\(^ \+#define LV_SDL_BUF_COUNT \).*|\1 2|g" \ + -e "s|\(^ \+#define LV_SDL_FULLSCREEN \).*|\1${LVGL_CONFIG_SDL_FULLSCREEN}|g" \ \ - -e "s|\(^#define LV_COLOR_DEPTH \).*|#define LV_COLOR_DEPTH ${LVGL_CONFIG_LV_COLOR_DEPTH}|g" \ - -e "s|\(#define LV_MEM_CUSTOM .*\)0|\1${LVGL_CONFIG_LV_MEM_CUSTOM}|g" \ + -e "s|\(^#define LV_COLOR_DEPTH \).*|\1${LVGL_CONFIG_LV_COLOR_DEPTH}|g" \ + -e "s|\(#define LV_MEM_CUSTOM .*\).*|\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" \ \ - -e "s|\(^#define LV_USE_EVDEV \).*|#define LV_USE_EVDEV ${LVGL_CONFIG_USE_EVDEV}|g" \ + -e "s|\(^#define LV_USE_EVDEV \).*|\1${LVGL_CONFIG_USE_EVDEV}|g" \ \ - -e "s|\(^#define LV_USE_ASSERT_NULL \).*|#define LV_USE_ASSERT_NULL ${DEBUG_BUILD}|g" \ - -e "s|\(^#define LV_USE_ASSERT_MALLOC \).*|#define LV_USE_ASSERT_MALLOC ${DEBUG_BUILD}|g" \ - -e "s|\(^#define LV_USE_ASSERT_STYLE \).*|#define LV_USE_ASSERT_STYLE ${DEBUG_BUILD}|g" \ - -e "s|\(^#define LV_USE_ASSERT_MEM_INTEGRITY \).*|#define LV_USE_ASSERT_MEM_INTEGRITY ${DEBUG_BUILD}|g" \ - -e "s|\(^#define LV_USE_ASSERT_OBJ \).*|#define LV_USE_ASSERT_OBJ ${DEBUG_BUILD}|g" \ + -e "s|\(^#define LV_USE_ASSERT_NULL \).*|\1${DEBUG_BUILD}|g" \ + -e "s|\(^#define LV_USE_ASSERT_MALLOC \).*|\1${DEBUG_BUILD}|g" \ + -e "s|\(^#define LV_USE_ASSERT_STYLE \).*|\1${DEBUG_BUILD}|g" \ + -e "s|\(^#define LV_USE_ASSERT_MEM_INTEGRITY \).*|\1${DEBUG_BUILD}|g" \ + -e "s|\(^#define LV_USE_ASSERT_OBJ \).*|\1${DEBUG_BUILD}|g" \ \ -i "${S}/lv_conf.h" } From patchwork Sat Mar 16 10:00:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Chapuis X-Patchwork-Id: 41107 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 41100C54E71 for ; Sat, 16 Mar 2024 10:01:18 +0000 (UTC) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.groups.io with SMTP id smtpd.web11.3698.1710583262664280853 for ; Sat, 16 Mar 2024 03:01:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=fEnKkNr4; spf=pass (domain: gmail.com, ip: 209.85.128.43, mailfrom: chris.chapuis@gmail.com) Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-413f4cb646dso15644695e9.1 for ; Sat, 16 Mar 2024 03:01:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710583261; x=1711188061; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wh0SpENHu/4/BbsrPCIQmlKCTbFZxwkZDJneA/W00/U=; b=fEnKkNr4OHVMe02Ub/rLuSKVrjb9Zcpbdi1wRXFjJTu7+eV40qhXarTPKCjOAVSw/l Yj0ZWVOJBz++IojJnFGn0YrgqnDY431uOXvGugzsBdQO6rZgY+dlX/Ukda00YMhajLu8 ORpSrMg6izY187g7CJHgvpgv3/6tfMaGWROU3p1211gXjU48TUcifZ6GnrQW3G6fRoVA cjsmzgbfHux0eTQScIj+gvBjERoA0+hplNnYgrrYe3UoSP7KFIgLhVr4tTaT6wjgzPGR CyWzfooGFI4icUxKmg5N25zSwF8Rxp93opbG1dFat9sF20N9E9o3N2cyOLHNiFh3whwO RGZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710583261; x=1711188061; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wh0SpENHu/4/BbsrPCIQmlKCTbFZxwkZDJneA/W00/U=; b=P1mdXuZMfrVRWeBlgGLafS2+6PicOAuQcG2HqvWKvchTHRL8h+0C36wUsAil+Z8Ldv Cowk0PMMJSI+/VpwgC9NI9Qvr2PHWFM04mFLEFvw8oyAE5LrKJaMg/NVVH2YNPO8ZJCh 5/k/Mtje8wxV9j58aaEmhheat0znpjrLn6Bm0ZAnmwx50gGT7X1CpvggzDEzF+9Jm0Wj g0yv+VR3MSS2QvuxmoFqajFeL1UvCcGhZxJAL0xQ8mCfyUhmJ++M1AwrKOxDR9SceP9O D5KflvazX/c1UTiZ9C0vKiOb1Ds8wN9FUbhPNGBqMGwJxOXgQK6PJbTupk/rIWzr/Z++ al3w== X-Gm-Message-State: AOJu0Yw6peA090Q0Tv/+eyOpWOSXhERvj/hKx+EQXlGS06NHi753+afA jeaZ1kRTttGrG7NXcIHGDpvZzUxDTuTPDKP3JS51xNvxcyRaO/6svSYPeE5WyTc= X-Google-Smtp-Source: AGHT+IEFa576ttDAGjWwWVeiyq/NiXQc0Minj7+td1rvGcasDN6l8v78QBqkLhx2T3ryCpJ3IQizGQ== X-Received: by 2002:a05:600c:458d:b0:413:1131:e21a with SMTP id r13-20020a05600c458d00b004131131e21amr5116522wmo.14.1710583260663; Sat, 16 Mar 2024 03:01:00 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:5d9:6330:4d5:74f6:de66:f26e]) by smtp.gmail.com with ESMTPSA id je2-20020a05600c1f8200b004133072017csm11679806wmb.42.2024.03.16.03.01.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Mar 2024 03:01:00 -0700 (PDT) From: Christophe Chapuis To: openembedded-devel@lists.openembedded.org Cc: Marek Vasut , Khem Raj , Fabio Estevam , Christophe Chapuis Subject: [meta-oe][PATCH v4 5/7] lvgl: add more variables to lv-conf.inc Date: Sat, 16 Mar 2024 11:00:54 +0100 Message-ID: <20240316100056.409758-5-chris.chapuis@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240316100056.409758-1-chris.chapuis@gmail.com> References: <20240316100056.409758-1-chris.chapuis@gmail.com> MIME-Version: 1.0 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 ; Sat, 16 Mar 2024 10:01:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/109360 As it can be usefull to customize these other variables, let's add them in lv-conf.inc. Signed-off-by: Christophe Chapuis Reviewed-by: Marek Vasut --- meta-oe/recipes-graphics/lvgl/lv-conf.inc | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/meta-oe/recipes-graphics/lvgl/lv-conf.inc b/meta-oe/recipes-graphics/lvgl/lv-conf.inc index e43a4d508..9ee9f283d 100644 --- a/meta-oe/recipes-graphics/lvgl/lv-conf.inc +++ b/meta-oe/recipes-graphics/lvgl/lv-conf.inc @@ -12,8 +12,17 @@ LVGL_CONFIG_USE_SDL = "${@bb.utils.contains('PACKAGECONFIG', 'sdl', '1', '0', d) LVGL_CONFIG_SDL_FULLSCREEN ?= "0" LVGL_CONFIG_LV_MEM_CUSTOM ?= "0" +LVGL_CONFIG_LV_MEM_SIZE ?= "(64 * 1024U)" LVGL_CONFIG_LV_COLOR_DEPTH ?= "32" +LVGL_CONFIG_LV_USE_LOG ?= "0" +LVGL_CONFIG_LV_LOG_LEVEL ?= "LV_LOG_LEVEL_WARN" +LVGL_CONFIG_LV_LOG_PRINTF ?= "0" + +LVGL_CONFIG_LV_USE_FONT_COMPRESSED ?= "0" + +LVGL_CONFIG_LV_THEME_DEFAULT_DARK ?= "0" + DEBUG_BUILD ??= "0" ALLOW_EMPTY:${PN} = "1" @@ -37,6 +46,7 @@ do_configure:append() { \ -e "s|\(^#define LV_COLOR_DEPTH \).*|\1${LVGL_CONFIG_LV_COLOR_DEPTH}|g" \ -e "s|\(#define LV_MEM_CUSTOM .*\).*|\1${LVGL_CONFIG_LV_MEM_CUSTOM}|g" \ + -e "s|\(^ \+#define LV_MEM_SIZE \).*|\1${LVGL_CONFIG_LV_MEM_SIZE}|g" \ \ -e "s|\(#define LV_TICK_CUSTOM \).*|\1 1|g" \ -e "s|\(#define LV_TICK_CUSTOM_INCLUDE \).*|\1 |g" \ @@ -50,5 +60,12 @@ do_configure:append() { -e "s|\(^#define LV_USE_ASSERT_MEM_INTEGRITY \).*|\1${DEBUG_BUILD}|g" \ -e "s|\(^#define LV_USE_ASSERT_OBJ \).*|\1${DEBUG_BUILD}|g" \ \ + -e "s|\(^#define LV_USE_LOG \).*|\1${LVGL_CONFIG_LV_USE_LOG}|g" \ + -e "s|\(^ \+#define LV_LOG_LEVEL \).*|\1${LVGL_CONFIG_LV_LOG_LEVEL}|g" \ + -e "s|\(^ \+#define LV_LOG_PRINTF \).*|\1${LVGL_CONFIG_LV_LOG_PRINTF}|g" \ + \ + -e "s|\(^#define LV_USE_FONT_COMPRESSED \).*|\1${LVGL_CONFIG_LV_USE_FONT_COMPRESSED}|g" \ + -e "s|\(^ \+#define LV_THEME_DEFAULT_DARK \).*|\1${LVGL_CONFIG_LV_THEME_DEFAULT_DARK}|g" \ + \ -i "${S}/lv_conf.h" } From patchwork Sat Mar 16 10:00:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Chapuis X-Patchwork-Id: 41106 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 103E1C54E68 for ; Sat, 16 Mar 2024 10:01:18 +0000 (UTC) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.groups.io with SMTP id smtpd.web10.3725.1710583263135878984 for ; Sat, 16 Mar 2024 03:01:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=KxNCd0la; spf=pass (domain: gmail.com, ip: 209.85.128.50, mailfrom: chris.chapuis@gmail.com) Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-41408d7781cso1414575e9.3 for ; Sat, 16 Mar 2024 03:01:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710583261; x=1711188061; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=keLtxQwTbGPPKCqiJbtc59qTKYClrySs+RxL1V8nMq8=; b=KxNCd0la5HvolKnLvdPabdNd4RNZApHzfJ8D2yOUeaTHRjlqbU/gKALtSjCY8r3/QO CX/siCGgUeMkjBZeSt+a7xbMoNet2fw6o07fm99w0PGdbX3BAJJ4LGoeo0ReCdNg8v9I 1JnwzfTNMHx6cKBGy06dy/YIg851GcZhqMNtbgGSIv3ze7PwORQeEGH5JNTuNjF5AwgY b2qrFrH+JJT81/rZq/9As8NkjJT85/RqMSOTgrQf//jsYapt3H0mTJVmmPR8kO2laW/7 QhLYYmd2ZGDryJj0XDDD+AGursWLzapsa6MOmq9qm/y8uWq2AW+51Zw/p/nmd+QUPF7W 6RRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710583261; x=1711188061; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=keLtxQwTbGPPKCqiJbtc59qTKYClrySs+RxL1V8nMq8=; b=os527nBwUkyXm1s+HhP25gyhrcg40/M4m+KHLWoEECPJ5YxXKn8E07Tj0cf+Jo7R1p EobqVR35xSaDVFO+Ew1WrFDc6e/4kwz1gGfzCtABzvFN5nla//Jk1R35OOih98nM/qbj xp9po8p79OD2chAs3IYWnCAOw4ZW/T7J6sQfe11gqHJHDY0UWir10SqHpj0C2UprThGi fMUyoihhd7rkYys/+tTYpAv3vY/asaAjXB8UzOW8aBE5F62EWAPWrofQuJ5Lr4p2NiCJ pkrD32g7swuayu+zS0aEPaMmoWYIW2NtfdgTtfVr1zwOOEPcpujBi+lG+HUYRUuc1gV+ jLeQ== X-Gm-Message-State: AOJu0YxVobkfqUwMkqSyBKVf2vY0bJqdna63WYTGIODoaHmUnxIiVNw2 I1oAlNDkPXv+tY2B1dyIJUWhQhqo5x5A5wH2ZDFEOy/Ab9TzQm8zZPlmkJTywKA= X-Google-Smtp-Source: AGHT+IH53/vz9s/jkRDeWMNRfFP1dvVRv2CzlgoM5vmItjLvcABvje2JhjvSWcM5SGSE2MnTK+mrEw== X-Received: by 2002:a05:600c:1c08:b0:413:fe9d:eaa5 with SMTP id j8-20020a05600c1c0800b00413fe9deaa5mr3517017wms.26.1710583261257; Sat, 16 Mar 2024 03:01:01 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:5d9:6330:4d5:74f6:de66:f26e]) by smtp.gmail.com with ESMTPSA id je2-20020a05600c1f8200b004133072017csm11679806wmb.42.2024.03.16.03.01.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Mar 2024 03:01:01 -0700 (PDT) From: Christophe Chapuis To: openembedded-devel@lists.openembedded.org Cc: Marek Vasut , Khem Raj , Fabio Estevam , Christophe Chapuis Subject: [meta-oe][PATCH v4 6/7] lvgl: fix libdrm include Date: Sat, 16 Mar 2024 11:00:55 +0100 Message-ID: <20240316100056.409758-6-chris.chapuis@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240316100056.409758-1-chris.chapuis@gmail.com> References: <20240316100056.409758-1-chris.chapuis@gmail.com> MIME-Version: 1.0 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 ; Sat, 16 Mar 2024 10:01:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/109361 When DRM is activated for LVGL, it adds a dependency on drm.h. As for lvgl-demo-fb, add an include path to fix this usecase. Signed-off-by: Christophe Chapuis Acked-by: Martin Jansa Reviewed-by: Marek Vasut --- meta-oe/recipes-graphics/lvgl/lvgl_9.0.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-graphics/lvgl/lvgl_9.0.0.bb b/meta-oe/recipes-graphics/lvgl/lvgl_9.0.0.bb index 8bd718efd..6a9a7411b 100644 --- a/meta-oe/recipes-graphics/lvgl/lvgl_9.0.0.bb +++ b/meta-oe/recipes-graphics/lvgl/lvgl_9.0.0.bb @@ -21,6 +21,8 @@ inherit cmake EXTRA_OECMAKE = "-DLIB_INSTALL_DIR=${baselib} -DBUILD_SHARED_LIBS=ON" S = "${WORKDIR}/git" +TARGET_CFLAGS += "-I${STAGING_INCDIR}/libdrm" + ALLOW_EMPTY:${PN} = "1" PACKAGECONFIG ??= "drm" From patchwork Sat Mar 16 10:00:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Chapuis X-Patchwork-Id: 41104 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 2FFD8C54E60 for ; Sat, 16 Mar 2024 10:01:08 +0000 (UTC) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mx.groups.io with SMTP id smtpd.web10.3726.1710583264139396030 for ; Sat, 16 Mar 2024 03:01:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ZwNTpQir; spf=pass (domain: gmail.com, ip: 209.85.128.41, mailfrom: chris.chapuis@gmail.com) Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-41403889b6aso8449055e9.2 for ; Sat, 16 Mar 2024 03:01:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710583262; x=1711188062; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/ToXMMtdAOvdiqzyRI+QGYY3SA9vf+4jZkPdLRprnb0=; b=ZwNTpQirvjPHOXgdD6nLe2SmmkbBN6hSdYNl1Qmgj4lrI4Ake877Yu3+PiF4c2inbg 1WmMaRqUoYVUJgXH+rAcfXAarg/csMxMGzIQ+GRFGHDxA9uHog6/Ry97mqcymR5bdTWM nrwreuaRhGGSRuN/MBqPZPmknXobVuDrF0Stkm30Lmzuci5pAH7mm5lTi2VqoUJCLboQ mLUyLiqupNVhZweaMtVIPBtdn0y+EgSv94rolZQm+kmpHx4henXHpRQHn+6RSulCfFE5 AjTJ6ErE7v9TBz+eZ6LpVlzjGn2ZmyHhxPMojhtcy5WYx4O+JVgmk1CqUmdAqPYDE7KN DOyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710583262; x=1711188062; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/ToXMMtdAOvdiqzyRI+QGYY3SA9vf+4jZkPdLRprnb0=; b=ol3xrzlKLMEdV4sBcL5e0RecB751sQJD13Na7Vv6LqQKAYnNCJ2CB/tMi0WFYdx59N BEc5VHZMD3/oxarEMQt66QGwmkcYurlzmX8HhF0dWWL8OCWb7FducW/+B5D2aBv3U19O crq6Eg9/avf80tggKeWLd9N50rG3371O0R5PU/38tLbGbRaivB8oC2SVHr+yM9n1P3zt PiUS4gFqys37jaLB7VrYRzeRoTVDjm7rfCWOOCq2U8lEH5mAtmDzXM/GleQIlDkL2c+/ 9VoY6S5Ah6fZcKuO87jr6OgIqyiafRgI6x1xNNDgMllGmon+fHa6rO+3Obu9pE1EXrjS xJtA== X-Gm-Message-State: AOJu0Yx772UfvUI8bS4tJOPZf9z+oOWOu3ncgKzX2+ZbS5dkmU3je9+K REyymSqeLht6LxU0iq9HClW098OwmZUtzdzxnsZLWBkAeDJZJ4IAcO7ENW+O8EM= X-Google-Smtp-Source: AGHT+IGxeZ3NDUQTH281c5PzdS/rKqK5VkEDLECZriZVi3f8fOzoYpcua973esPrIZ/WrKli4ORwBw== X-Received: by 2002:a05:600c:3b98:b0:412:e55e:83de with SMTP id n24-20020a05600c3b9800b00412e55e83demr6390278wms.7.1710583261835; Sat, 16 Mar 2024 03:01:01 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:5d9:6330:4d5:74f6:de66:f26e]) by smtp.gmail.com with ESMTPSA id je2-20020a05600c1f8200b004133072017csm11679806wmb.42.2024.03.16.03.01.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Mar 2024 03:01:01 -0700 (PDT) From: Christophe Chapuis To: openembedded-devel@lists.openembedded.org Cc: Marek Vasut , Khem Raj , Fabio Estevam , Christophe Chapuis Subject: [meta-oe][PATCH v4 7/7] lvgl: lv-conf.inc: generalize sed instructions Date: Sat, 16 Mar 2024 11:00:56 +0100 Message-ID: <20240316100056.409758-7-chris.chapuis@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240316100056.409758-1-chris.chapuis@gmail.com> References: <20240316100056.409758-1-chris.chapuis@gmail.com> MIME-Version: 1.0 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 ; Sat, 16 Mar 2024 10:01:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/109362 Use [ \t] to detect optionnal spaces at the beginning of each line, and after the define. Signed-off-by: Christophe Chapuis Reviewed-by: Marek Vasut --- meta-oe/recipes-graphics/lvgl/lv-conf.inc | 46 +++++++++++------------ 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/meta-oe/recipes-graphics/lvgl/lv-conf.inc b/meta-oe/recipes-graphics/lvgl/lv-conf.inc index 9ee9f283d..2b5d4a14a 100644 --- a/meta-oe/recipes-graphics/lvgl/lv-conf.inc +++ b/meta-oe/recipes-graphics/lvgl/lv-conf.inc @@ -35,37 +35,37 @@ do_configure:append() { sed -e "s|#if 0 .*Set it to \"1\" to enable content.*|#if 1 // Enabled by ${PN}|g" \ \ - -e "s|\(^#define LV_USE_LINUX_DRM \).*|\1${LVGL_CONFIG_USE_DRM}|g" \ + -e "s|\(^[ \t]*#define LV_USE_LINUX_DRM[ \t]\).*|\1${LVGL_CONFIG_USE_DRM}|g" \ \ - -e "s|\(^#define LV_USE_LINUX_FBDEV \).*|\1${LVGL_CONFIG_USE_FBDEV}|g" \ + -e "s|\(^[ \t]*#define LV_USE_LINUX_FBDEV[ \t]\).*|\1${LVGL_CONFIG_USE_FBDEV}|g" \ \ - -e "s|\(^#define LV_USE_SDL \).*|\1${LVGL_CONFIG_USE_SDL}|g" \ - -e "s|\(^#define LV_USE_DRAW_SDL \).*|\1${LVGL_CONFIG_USE_SDL}|g" \ - -e "s|\(^ \+#define LV_SDL_BUF_COUNT \).*|\1 2|g" \ - -e "s|\(^ \+#define LV_SDL_FULLSCREEN \).*|\1${LVGL_CONFIG_SDL_FULLSCREEN}|g" \ + -e "s|\(^[ \t]*#define LV_USE_SDL[ \t]\).*|\1${LVGL_CONFIG_USE_SDL}|g" \ + -e "s|\(^[ \t]*#define LV_USE_DRAW_SDL[ \t]\).*|\1${LVGL_CONFIG_USE_SDL}|g" \ + -e "s|\(^[ \t]*#define LV_SDL_BUF_COUNT[ \t]\).*|\1 2|g" \ + -e "s|\(^[ \t]*#define LV_SDL_FULLSCREEN[ \t]\).*|\1${LVGL_CONFIG_SDL_FULLSCREEN}|g" \ \ - -e "s|\(^#define LV_COLOR_DEPTH \).*|\1${LVGL_CONFIG_LV_COLOR_DEPTH}|g" \ - -e "s|\(#define LV_MEM_CUSTOM .*\).*|\1${LVGL_CONFIG_LV_MEM_CUSTOM}|g" \ - -e "s|\(^ \+#define LV_MEM_SIZE \).*|\1${LVGL_CONFIG_LV_MEM_SIZE}|g" \ + -e "s|\(^[ \t]*#define LV_COLOR_DEPTH[ \t]\).*|\1${LVGL_CONFIG_LV_COLOR_DEPTH}|g" \ + -e "s|\(^[ \t]*#define LV_MEM_CUSTOM[ \t].*\).*|\1${LVGL_CONFIG_LV_MEM_CUSTOM}|g" \ + -e "s|\(^[ \t]*#define LV_MEM_SIZE[ \t]\).*|\1${LVGL_CONFIG_LV_MEM_SIZE}|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" \ + -e "s|\(^[ \t]*#define LV_TICK_CUSTOM[ \t]\).*|\1 1|g" \ + -e "s|\(^[ \t]*#define LV_TICK_CUSTOM_INCLUDE[ \t]\).*|\1 |g" \ + -e "s|\(^[ \t]*#define LV_TICK_CUSTOM_SYS_TIME_EXPR[ \t]\).*|extern uint32_t custom_tick_get(void);\n\1 (custom_tick_get())|g" \ \ - -e "s|\(^#define LV_USE_EVDEV \).*|\1${LVGL_CONFIG_USE_EVDEV}|g" \ + -e "s|\(^[ \t]*#define LV_USE_EVDEV[ \t]\).*|\1${LVGL_CONFIG_USE_EVDEV}|g" \ \ - -e "s|\(^#define LV_USE_ASSERT_NULL \).*|\1${DEBUG_BUILD}|g" \ - -e "s|\(^#define LV_USE_ASSERT_MALLOC \).*|\1${DEBUG_BUILD}|g" \ - -e "s|\(^#define LV_USE_ASSERT_STYLE \).*|\1${DEBUG_BUILD}|g" \ - -e "s|\(^#define LV_USE_ASSERT_MEM_INTEGRITY \).*|\1${DEBUG_BUILD}|g" \ - -e "s|\(^#define LV_USE_ASSERT_OBJ \).*|\1${DEBUG_BUILD}|g" \ + -e "s|\(^[ \t]*#define LV_USE_ASSERT_NULL[ \t]\).*|\1${DEBUG_BUILD}|g" \ + -e "s|\(^[ \t]*#define LV_USE_ASSERT_MALLOC[ \t]\).*|\1${DEBUG_BUILD}|g" \ + -e "s|\(^[ \t]*#define LV_USE_ASSERT_STYLE[ \t]\).*|\1${DEBUG_BUILD}|g" \ + -e "s|\(^[ \t]*#define LV_USE_ASSERT_MEM_INTEGRITY[ \t]\).*|\1${DEBUG_BUILD}|g" \ + -e "s|\(^[ \t]*#define LV_USE_ASSERT_OBJ[ \t]\).*|\1${DEBUG_BUILD}|g" \ \ - -e "s|\(^#define LV_USE_LOG \).*|\1${LVGL_CONFIG_LV_USE_LOG}|g" \ - -e "s|\(^ \+#define LV_LOG_LEVEL \).*|\1${LVGL_CONFIG_LV_LOG_LEVEL}|g" \ - -e "s|\(^ \+#define LV_LOG_PRINTF \).*|\1${LVGL_CONFIG_LV_LOG_PRINTF}|g" \ + -e "s|\(^[ \t]*#define LV_USE_LOG[ \t]\).*|\1${LVGL_CONFIG_LV_USE_LOG}|g" \ + -e "s|\(^[ \t]*#define LV_LOG_LEVEL[ \t]\).*|\1${LVGL_CONFIG_LV_LOG_LEVEL}|g" \ + -e "s|\(^[ \t]*#define LV_LOG_PRINTF[ \t]\).*|\1${LVGL_CONFIG_LV_LOG_PRINTF}|g" \ \ - -e "s|\(^#define LV_USE_FONT_COMPRESSED \).*|\1${LVGL_CONFIG_LV_USE_FONT_COMPRESSED}|g" \ - -e "s|\(^ \+#define LV_THEME_DEFAULT_DARK \).*|\1${LVGL_CONFIG_LV_THEME_DEFAULT_DARK}|g" \ + -e "s|\(^[ \t]*#define LV_USE_FONT_COMPRESSED[ \t]\).*|\1${LVGL_CONFIG_LV_USE_FONT_COMPRESSED}|g" \ + -e "s|\(^[ \t]*#define LV_THEME_DEFAULT_DARK[ \t]\).*|\1${LVGL_CONFIG_LV_THEME_DEFAULT_DARK}|g" \ \ -i "${S}/lv_conf.h" }