From patchwork Fri Jun 3 19:17:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 8805 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 289E6C433EF for ; Fri, 3 Jun 2022 19:19:25 +0000 (UTC) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by mx.groups.io with SMTP id smtpd.web10.2395.1654283964607088615 for ; Fri, 03 Jun 2022 12:19:24 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=qdtH9Qcx; spf=pass (domain: gmail.com, ip: 209.85.216.47, mailfrom: akuster808@gmail.com) Received: by mail-pj1-f47.google.com with SMTP id e24so8073012pjt.0 for ; Fri, 03 Jun 2022 12:19:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=+28qliwWQVuyR/4ABWKAxWB17k7vZref0pNPD95/FZ0=; b=qdtH9QcxBMLKsPIfMCUnOR5tNX0JhA/gXEDTeGofwKEN8rj4oqmXtOoL7JQRGHxRGV byyiJNzRtdGnzfAmxRfCC9+UmuBd81KY+hCZRLKdr3bKpowBeadJFdMa5Tqfczdx6eEn Q1VL5jQTWbwZk5+WourcXPbzw2OnljBqkqmDUHYQa1mCcZGDl2ota3u0HX9NJHR22yoS bkAYSiZ6c/6iu5VJt0zl8yEE92MvNJ3SSo8tcurq3lNGS0JXjYF9qJ1QPVGCPTUc6Zue h93MJFJNZkH2GIncm7jzkCa2sqhuZqNJ6W7Qep0blLN69Frykqa8fWIVebzBTGCgAuPe butg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+28qliwWQVuyR/4ABWKAxWB17k7vZref0pNPD95/FZ0=; b=z5z0Mi12ernGzV/VOzBgKoofaNq4TsOYo697RdDIFlv1iNzQMMTgSUazI08dXc7Tuu uPfpXKEBsYKjUxTwnpd7WFRvOMZ1XxZ7f/1kTTSUlCUfMvQ9fu6IHewCAjaNc7J/aEj7 IRAQAB/TYUvXNphlQRjvvHkmPc/lGWayrGape97RtJaLBIJxJxMFXpVnkGXovXB9xOYq N/zFgQSiFvpeT+wRe1IipzCdiXqMYi/KOTTVrF1QDZsKWEP0KoXI8vEDnRgqpA07vccN TUQRcZUh/U6DLQLvSqjjnvwVcbN9zkYIQXsCdgNzGWhWKzu49XZXdIX3OuucXm9SF8Mq cQKQ== X-Gm-Message-State: AOAM531VM30zdI+CQpvwbEi9fKLhAh3mQCsdgOjU5DrFpN569QTTX6zC sPksTuTA8GnhQtxo3WZC70vOe7U2cdo= X-Google-Smtp-Source: ABdhPJwVXPs4FPtTKSE84LTbuOe7zw6hYAY94u9Sja/EayNXLy/B7xJPVxsipgDqWdDjMbuZzPJzcw== X-Received: by 2002:a17:90b:1646:b0:1e3:15ef:2871 with SMTP id il6-20020a17090b164600b001e315ef2871mr27207888pjb.105.1654283963700; Fri, 03 Jun 2022 12:19:23 -0700 (PDT) Received: from keaua.caveonetworks.com (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id p2-20020a170902c70200b001617541c94fsm5770620plp.60.2022.06.03.12.19.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 12:19:23 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 01/20] libcamera: fix packaging Date: Fri, 3 Jun 2022 12:17:00 -0700 Message-Id: <6104aead933382cd1d627bb6b9fe1b68195c878d.1654282423.git.akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 03 Jun 2022 19:19:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/97390 From: Julien STEPHAN libcamera.so.0 and libcamera-base.so.0 are packaged in ${PN}-dev although they should be packaged in ${PN}. See poky/meta/conf/bitbake.conf. This trigger the following error when trying to run the `cam` utility (packaged inside ${PN}): $ cam -l cam: error while loading shared libraries: libcamera.so.0: cannot open shared object file: No such file or directory $ read-elf -d /usr/bin/cam Dynamic section at offset 0x2c740 contains 37 entries: Tag Type Name/Value 0x0000000000000001 (NEEDED) Shared library: [libcamera.so.0] 0x0000000000000001 (NEEDED) Shared library: [libcamera-base.so.0] [...] So package libcamera is broken and need to be installed along with libcamera-dev to be functionnal. Fix it by packaging libcamera.so.0 and libcamera-base.so.0 into ${PN} Signed-off-by: Julien STEPHAN Signed-off-by: Khem Raj (cherry picked from commit 3de996474e0b7fdff1d265fcad747bd60851b1eb) Signed-off-by: Armin Kuster --- meta-multimedia/recipes-multimedia/libcamera/libcamera.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb b/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb index 7136260699..0b9f3f7a5d 100644 --- a/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb +++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb @@ -64,10 +64,10 @@ do_recalculate_ipa_signatures_package() { FILES:${PN}-dev = "${includedir} ${libdir}/pkgconfig" FILES:${PN}-dev += " ${libdir}/libcamera.so" -FILES:${PN}-dev += " ${libdir}/libcamera.so.0" +FILES:${PN} += " ${libdir}/libcamera.so.0" FILES:${PN} += " ${libdir}/libcamera.so.0.0.0" FILES:${PN}-dev += " ${libdir}/libcamera-base.so" -FILES:${PN}-dev += " ${libdir}/libcamera-base.so.0" +FILES:${PN} += " ${libdir}/libcamera-base.so.0" FILES:${PN} += " ${libdir}/libcamera-base.so.0.0.0" FILES:${PN} += " ${libdir}/v4l2-compat.so" FILES:${PN}-gst = "${libdir}/gstreamer-1.0/libgstlibcamera.so" From patchwork Fri Jun 3 19:17:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 8809 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 09AA2CCA47C for ; Fri, 3 Jun 2022 19:19:35 +0000 (UTC) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mx.groups.io with SMTP id smtpd.web08.2441.1654283966112252072 for ; Fri, 03 Jun 2022 12:19:26 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=YITGL9C0; spf=pass (domain: gmail.com, ip: 209.85.210.182, mailfrom: akuster808@gmail.com) Received: by mail-pf1-f182.google.com with SMTP id y196so7841675pfb.6 for ; Fri, 03 Jun 2022 12:19:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=AN/IsEL1Q36/Ja6pU9cZKonQkNZKkSG2nTNJsR4xyvM=; b=YITGL9C0p9CJl/HyUqyUik7keL1JVV53f3s9ZpTtaHB7WAdYMTHDjYD1vZZfi0R+s3 EGXkCpL6biFOW/06qlZuSP/OPC9JfB3Ks53VlP+s/O3W/VKzQtGEThX8wzI0xU+wCUk2 SJKksQi7M+fyYomhYKv1jCrw690WPYZ/GRqVNUj5TAWsd3PfXnHwdfh2Y/8S/RXeRz8b qlzmIENbTrtPG295BSmO0nviLt1nG1RwKgHnGkA99a7obd+rHctQJvsewD78z8aysXel j2zAdCXjzXGfnOikG7nuk26McMzhyUh77VY44KBWX5f4O8skj90gjGgcpTjIQWMyFF5l oVBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AN/IsEL1Q36/Ja6pU9cZKonQkNZKkSG2nTNJsR4xyvM=; b=zNYyjIg2G6QZa0r4Vg0YRodB13IbCe5cCcOSg8SAd3f4yGxROEh6S8aSECwUD+wOPZ lrxT1CDVsV5zwdfno1q3Ude4ZV1dVyUDyTeizS/mAT6UVdblU5XhXqgdPuNcSYe1uP8h RVmZkoocEmWt8hLzvpysZ+KPblU3Cl2XHVqHcoxzSuWEgZSe0df0fnGbLEabFO0G3CAV aJXvewzzNMOVqhI3voqJhY74ZAKkkbmj29Sf3TAlmGIn6Yr7DyDLBwv+npZI2pel17Yh Ij8P1qzKDSYA6iQli+X0wve09lU0cOmKOCLtDx0klJaRDhgsDB3+QeqJEJ5H203dIrW+ 1iVA== X-Gm-Message-State: AOAM5327qaX/NJ3tquCrZ9SvRnhUfKFXDq2UzgyEgSxM4CcNZ7FWP0n6 Kpc6ZSCUqsD++IT1cAR+T2YoS1r4ycc= X-Google-Smtp-Source: ABdhPJx80L4y12/zriaDvI93TWVKCthNJl9Z3vUBtBf/0e3i1E9ztUEBcKC6i8Uu0X2KO/D/6s1ogA== X-Received: by 2002:a63:84c7:0:b0:3fd:862:df17 with SMTP id k190-20020a6384c7000000b003fd0862df17mr6131114pgd.28.1654283965174; Fri, 03 Jun 2022 12:19:25 -0700 (PDT) Received: from keaua.caveonetworks.com (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id p2-20020a170902c70200b001617541c94fsm5770620plp.60.2022.06.03.12.19.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 12:19:24 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 02/20] jq: Fix typo OE_EXTRACONF -> EXTRA_OECONF Date: Fri, 3 Jun 2022 12:17:01 -0700 Message-Id: <2c051c65a4618d8f832af888ac275b9040641178.1654282423.git.akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 03 Jun 2022 19:19:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/97391 From: Joerg Vehlow Signed-off-by: Joerg Vehlow Signed-off-by: Khem Raj (cherry picked from commit 1aa9d7d53d05b01727a8fdc2079f7c00e273fc13) Signed-off-by: Armin Kuster --- meta-oe/recipes-devtools/jq/jq_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/jq/jq_git.bb b/meta-oe/recipes-devtools/jq/jq_git.bb index d0c70da76f..8b0218c83e 100644 --- a/meta-oe/recipes-devtools/jq/jq_git.bb +++ b/meta-oe/recipes-devtools/jq/jq_git.bb @@ -21,7 +21,7 @@ PACKAGECONFIG[docs] = "--enable-docs,--disable-docs,ruby-native" PACKAGECONFIG[maintainer-mode] = "--enable-maintainer-mode,--disable-maintainer-mode,flex-native bison-native" PACKAGECONFIG[oniguruma] = "--with-oniguruma,--without-oniguruma,onig" -OE_EXTRACONF += " \ +EXTRA_OECONF += " \ --disable-valgrind \ " From patchwork Fri Jun 3 19:17:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 8811 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 1D473CCA481 for ; Fri, 3 Jun 2022 19:19:35 +0000 (UTC) Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by mx.groups.io with SMTP id smtpd.web11.2356.1654283968726392720 for ; Fri, 03 Jun 2022 12:19:28 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=cThnFnVF; spf=pass (domain: gmail.com, ip: 209.85.216.42, mailfrom: akuster808@gmail.com) Received: by mail-pj1-f42.google.com with SMTP id w2-20020a17090ac98200b001e0519fe5a8so7803762pjt.4 for ; Fri, 03 Jun 2022 12:19:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=GHbGE9cqUDsmSl1fLaafaxCPuZPaMeKTHJMaVxziJaU=; b=cThnFnVFPkzTTa940B4dLucWAAl76l55uuYAJD5ycWIlPtorJXxJMl1aHmFT1GxTxK 9F8VrUzKtSf4Hq05+Z9saq0bbCCrfDkuFUmwXKM7DuWUQVEY83aWzvci8+ATQYizWHjK 7iVQtlQqe4C0JX/KKxNZ8tiSP3vD0G1Hgr4Xn5YwCPDt94PbsJFoekBBLE6VBia0acXI W3G/zB3cH7hA9/OjxZksh0D8Qroq/GoA9o2anjrJkTxXb02pnwj3Dxve8+Y6MUWIx9Ep yEcw2UtFWojbYHo5Yr6QTgEKe82MJ+r+KARi94uIXLYWG99CvAkALfjBhOoLENc+l4ar kPaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GHbGE9cqUDsmSl1fLaafaxCPuZPaMeKTHJMaVxziJaU=; b=3iN059VDTH0eJ69Kqe3IgxjwFP/QIfezO3lPabua4rulXSKIYI+hbcIf4GFs7NQvo4 Ow0FnZd/lckcBy56RnGLzhQBd/yQIzwDYWx8No8iHVx2DLOOVRUzuIoNRSqaASBRsKUX As602dWtpPDls2aIlBJtfUitA3PiLZC+7r8huba3dBv10Qy9Zihpyksl90bak+PT8Rre suCqF1RQZXEIzMADBYEXviwyQhwln3uKoqb+1lkPOtV/cbgEBFHdPssNrAaJkRyIaaJh 8Gy4jx8WVX2CsHChMkPF4MfC0ldvzuMOvbXyWv9eJtRFFshBgM8J0+Ftkbe66j5EStBg 8B3Q== X-Gm-Message-State: AOAM533phoxfaO3NOHgsuo/Qb2YJbdp/v0VBwRO3sGRr/w5imQswMpII ULPbXM0zhDP/GhxEZvLIYtNKIEcu6AM= X-Google-Smtp-Source: ABdhPJywKMK9glBzKGp5GpBRiGQu1QhFhR0Ox5T0g9aMGZPlBdIAHY5CDQ9IGRPH4S1PXpDSubaaPA== X-Received: by 2002:a17:90a:6284:b0:1df:4595:57af with SMTP id d4-20020a17090a628400b001df459557afmr12303312pjj.188.1654283967423; Fri, 03 Jun 2022 12:19:27 -0700 (PDT) Received: from keaua.caveonetworks.com (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id p2-20020a170902c70200b001617541c94fsm5770620plp.60.2022.06.03.12.19.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 12:19:26 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 03/20] python3-wxgtk4: backport patch to fix svg issue Date: Fri, 3 Jun 2022 12:17:02 -0700 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 03 Jun 2022 19:19:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/97392 From: Kai Kang Backport patch to fix import svg issue: | $ python3 -c 'from wx.svg import SVGimage' | | ImportError: /usr/lib64/python3.10/site-packages/wx/svg/_nanosvg.cpython-310-x86_64-linux-gnu.so: undefined symbol: _PyGen_Send Signed-off-by: Kai Kang Signed-off-by: Khem Raj (cherry picked from commit 8246a9cef2956c66772b23f00d3feedec43ab1f7) Signed-off-by: Armin Kuster --- ...rsion-to-fix-NanoSVG-issues-with-Pyt.patch | 861 ++++++++++++++++++ .../python3-wxgtk4/python3-wxgtk4_4.1.1.bb | 1 + 2 files changed, 862 insertions(+) create mode 100644 meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-Update-Cython-version-to-fix-NanoSVG-issues-with-Pyt.patch diff --git a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-Update-Cython-version-to-fix-NanoSVG-issues-with-Pyt.patch b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-Update-Cython-version-to-fix-NanoSVG-issues-with-Pyt.patch new file mode 100644 index 0000000000..6be56cb908 --- /dev/null +++ b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-Update-Cython-version-to-fix-NanoSVG-issues-with-Pyt.patch @@ -0,0 +1,861 @@ +Upstream-Status: Backport [https://github.com/wxWidgets/Phoenix/commit/b40ab0f8] + +Signed-off-by: Kai Kang + +From b40ab0f806bdf7aa0c0a51a8c4876ac47754515d Mon Sep 17 00:00:00 2001 +From: Scott Talbert +Date: Thu, 7 Oct 2021 17:53:05 -0400 +Subject: [PATCH] Update Cython version to fix NanoSVG issues with Python 3.10 + +--- + requirements/devel.txt | 2 +- + wx/svg/_nanosvg.c | 554 ++++++++++++++++++++++++++--------------- + 2 files changed, 359 insertions(+), 197 deletions(-) + +diff --git a/requirements/devel.txt b/requirements/devel.txt +index 1d427be0..18164bdc 100644 +--- a/requirements/devel.txt ++++ b/requirements/devel.txt +@@ -9,7 +9,7 @@ wheel + twine + requests + requests[security] +-cython==0.29.21 ++cython==0.29.24 + pytest + pytest-xdist + pytest-forked +diff --git a/wx/svg/_nanosvg.c b/wx/svg/_nanosvg.c +index d8f1e158..fd4a5a67 100644 +--- a/wx/svg/_nanosvg.c ++++ b/wx/svg/_nanosvg.c +@@ -1,4 +1,4 @@ +-/* Generated by Cython 0.29.21 */ ++/* Generated by Cython 0.29.24 */ + + /* BEGIN: Cython Metadata + { +@@ -33,15 +33,17 @@ + } + END: Cython Metadata */ + ++#ifndef PY_SSIZE_T_CLEAN + #define PY_SSIZE_T_CLEAN ++#endif /* PY_SSIZE_T_CLEAN */ + #include "Python.h" + #ifndef Py_PYTHON_H + #error Python headers needed to compile C extensions, please install development version of Python. + #elif PY_VERSION_HEX < 0x02060000 || (0x03000000 <= PY_VERSION_HEX && PY_VERSION_HEX < 0x03030000) + #error Cython requires Python 2.6+ or Python 3.3+. + #else +-#define CYTHON_ABI "0_29_21" +-#define CYTHON_HEX_VERSION 0x001D15F0 ++#define CYTHON_ABI "0_29_24" ++#define CYTHON_HEX_VERSION 0x001D18F0 + #define CYTHON_FUTURE_DIVISION 0 + #include + #ifndef offsetof +@@ -459,8 +461,12 @@ static CYTHON_INLINE void * PyThread_tss_get(Py_tss_t *key) { + #endif + #if PY_VERSION_HEX > 0x03030000 && defined(PyUnicode_KIND) + #define CYTHON_PEP393_ENABLED 1 ++ #if defined(PyUnicode_IS_READY) + #define __Pyx_PyUnicode_READY(op) (likely(PyUnicode_IS_READY(op)) ?\ + 0 : _PyUnicode_Ready((PyObject *)(op))) ++ #else ++ #define __Pyx_PyUnicode_READY(op) (0) ++ #endif + #define __Pyx_PyUnicode_GET_LENGTH(u) PyUnicode_GET_LENGTH(u) + #define __Pyx_PyUnicode_READ_CHAR(u, i) PyUnicode_READ_CHAR(u, i) + #define __Pyx_PyUnicode_MAX_CHAR_VALUE(u) PyUnicode_MAX_CHAR_VALUE(u) +@@ -469,7 +475,11 @@ static CYTHON_INLINE void * PyThread_tss_get(Py_tss_t *key) { + #define __Pyx_PyUnicode_READ(k, d, i) PyUnicode_READ(k, d, i) + #define __Pyx_PyUnicode_WRITE(k, d, i, ch) PyUnicode_WRITE(k, d, i, ch) + #if defined(PyUnicode_IS_READY) && defined(PyUnicode_GET_SIZE) ++ #if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x03090000 ++ #define __Pyx_PyUnicode_IS_TRUE(u) (0 != (likely(PyUnicode_IS_READY(u)) ? PyUnicode_GET_LENGTH(u) : ((PyCompactUnicodeObject *)(u))->wstr_length)) ++ #else + #define __Pyx_PyUnicode_IS_TRUE(u) (0 != (likely(PyUnicode_IS_READY(u)) ? PyUnicode_GET_LENGTH(u) : PyUnicode_GET_SIZE(u))) ++ #endif + #else + #define __Pyx_PyUnicode_IS_TRUE(u) (0 != PyUnicode_GET_LENGTH(u)) + #endif +@@ -1736,33 +1746,38 @@ static void __pyx_insert_code_object(int code_line, PyCodeObject* code_object); + static void __Pyx_AddTraceback(const char *funcname, int c_line, + int py_line, const char *filename); + ++/* GCCDiagnostics.proto */ ++#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) ++#define __Pyx_HAS_GCC_DIAGNOSTIC ++#endif ++ + /* CIntToPy.proto */ + static CYTHON_INLINE PyObject* __Pyx_PyInt_From_long(long value); + ++/* CIntFromPy.proto */ ++static CYTHON_INLINE int __Pyx_PyInt_As_int(PyObject *); ++ + /* CIntToPy.proto */ + static CYTHON_INLINE PyObject* __Pyx_PyInt_From_int(int value); + + /* CIntToPy.proto */ + static CYTHON_INLINE PyObject* __Pyx_PyInt_From_char(char value); + ++/* CIntFromPy.proto */ ++static CYTHON_INLINE char __Pyx_PyInt_As_char(PyObject *); ++ + /* CIntToPy.proto */ + static CYTHON_INLINE PyObject* __Pyx_PyInt_From_unsigned_char(unsigned char value); + ++/* CIntFromPy.proto */ ++static CYTHON_INLINE long __Pyx_PyInt_As_long(PyObject *); ++ + /* CIntToPy.proto */ + static CYTHON_INLINE PyObject* __Pyx_PyInt_From_enum____pyx_t_2wx_3svg_8_nanosvg_SVGpaintType(enum __pyx_t_2wx_3svg_8_nanosvg_SVGpaintType value); + + /* CIntToPy.proto */ + static CYTHON_INLINE PyObject* __Pyx_PyInt_From_unsigned_int(unsigned int value); + +-/* CIntFromPy.proto */ +-static CYTHON_INLINE int __Pyx_PyInt_As_int(PyObject *); +- +-/* CIntFromPy.proto */ +-static CYTHON_INLINE char __Pyx_PyInt_As_char(PyObject *); +- +-/* CIntFromPy.proto */ +-static CYTHON_INLINE long __Pyx_PyInt_As_long(PyObject *); +- + /* CIntToPy.proto */ + static CYTHON_INLINE PyObject* __Pyx_PyInt_From_enum____pyx_t_2wx_3svg_8_nanosvg_SVGfillRule(enum __pyx_t_2wx_3svg_8_nanosvg_SVGfillRule value); + +@@ -1844,6 +1859,7 @@ typedef struct { + PyObject *gi_qualname; + PyObject *gi_modulename; + PyObject *gi_code; ++ PyObject *gi_frame; + int resume_label; + char is_running; + } __pyx_CoroutineObject; +@@ -14641,11 +14657,9 @@ if (!__Pyx_RefNanny) { + #endif + /*--- Library function declarations ---*/ + /*--- Threads initialization code ---*/ +- #if defined(__PYX_FORCE_INIT_THREADS) && __PYX_FORCE_INIT_THREADS +- #ifdef WITH_THREAD /* Python build with threading support? */ ++ #if defined(WITH_THREAD) && PY_VERSION_HEX < 0x030700F0 && defined(__PYX_FORCE_INIT_THREADS) && __PYX_FORCE_INIT_THREADS + PyEval_InitThreads(); + #endif +- #endif + /*--- Module creation code ---*/ + #if CYTHON_PEP489_MULTI_PHASE_INIT + __pyx_m = __pyx_pyinit_module; +@@ -16766,7 +16780,7 @@ invalid_keyword: + #if CYTHON_COMPILING_IN_CPYTHON + static CYTHON_INLINE PyObject* __Pyx_PyObject_Call(PyObject *func, PyObject *arg, PyObject *kw) { + PyObject *result; +- ternaryfunc call = func->ob_type->tp_call; ++ ternaryfunc call = Py_TYPE(func)->tp_call; + if (unlikely(!call)) + return PyObject_Call(func, arg, kw); + if (unlikely(Py_EnterRecursiveCall((char*)" while calling a Python object"))) +@@ -17149,7 +17163,7 @@ static CYTHON_INLINE PyObject* __Pyx_PyObject_CallOneArg(PyObject *func, PyObjec + if (likely(PyCFunction_GET_FLAGS(func) & METH_O)) { + return __Pyx_PyObject_CallMethO(func, arg); + #if CYTHON_FAST_PYCCALL +- } else if (PyCFunction_GET_FLAGS(func) & METH_FASTCALL) { ++ } else if (__Pyx_PyFastCFunction_Check(func)) { + return __Pyx_PyCFunction_FastCall(func, &arg, 1); + #endif + } +@@ -18800,7 +18814,8 @@ static PyObject * + __Pyx_CyFunction_reduce(__pyx_CyFunctionObject *m, CYTHON_UNUSED PyObject *args) + { + #if PY_MAJOR_VERSION >= 3 +- return PyUnicode_FromString(m->func.m_ml->ml_name); ++ Py_INCREF(m->func_qualname); ++ return m->func_qualname; + #else + return PyString_FromString(m->func.m_ml->ml_name); + #endif +@@ -19443,37 +19458,6 @@ bad: + Py_XDECREF(py_frame); + } + +-/* CIntToPy */ +-static CYTHON_INLINE PyObject* __Pyx_PyInt_From_long(long value) { +- const long neg_one = (long) ((long) 0 - (long) 1), const_zero = (long) 0; +- const int is_unsigned = neg_one > const_zero; +- if (is_unsigned) { +- if (sizeof(long) < sizeof(long)) { +- return PyInt_FromLong((long) value); +- } else if (sizeof(long) <= sizeof(unsigned long)) { +- return PyLong_FromUnsignedLong((unsigned long) value); +-#ifdef HAVE_LONG_LONG +- } else if (sizeof(long) <= sizeof(unsigned PY_LONG_LONG)) { +- return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG) value); +-#endif +- } +- } else { +- if (sizeof(long) <= sizeof(long)) { +- return PyInt_FromLong((long) value); +-#ifdef HAVE_LONG_LONG +- } else if (sizeof(long) <= sizeof(PY_LONG_LONG)) { +- return PyLong_FromLongLong((PY_LONG_LONG) value); +-#endif +- } +- } +- { +- int one = 1; int little = (int)*(unsigned char *)&one; +- unsigned char *bytes = (unsigned char *)&value; +- return _PyLong_FromByteArray(bytes, sizeof(long), +- little, !is_unsigned); +- } +-} +- + /* CIntFromPyVerify */ + #define __PYX_VERIFY_RETURN_INT(target_type, func_type, func_value)\ + __PYX__VERIFY_RETURN_INT(target_type, func_type, func_value, 0) +@@ -19497,148 +19481,31 @@ static CYTHON_INLINE PyObject* __Pyx_PyInt_From_long(long value) { + } + + /* CIntToPy */ +-static CYTHON_INLINE PyObject* __Pyx_PyInt_From_int(int value) { +- const int neg_one = (int) ((int) 0 - (int) 1), const_zero = (int) 0; +- const int is_unsigned = neg_one > const_zero; +- if (is_unsigned) { +- if (sizeof(int) < sizeof(long)) { +- return PyInt_FromLong((long) value); +- } else if (sizeof(int) <= sizeof(unsigned long)) { +- return PyLong_FromUnsignedLong((unsigned long) value); +-#ifdef HAVE_LONG_LONG +- } else if (sizeof(int) <= sizeof(unsigned PY_LONG_LONG)) { +- return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG) value); +-#endif +- } +- } else { +- if (sizeof(int) <= sizeof(long)) { +- return PyInt_FromLong((long) value); +-#ifdef HAVE_LONG_LONG +- } else if (sizeof(int) <= sizeof(PY_LONG_LONG)) { +- return PyLong_FromLongLong((PY_LONG_LONG) value); +-#endif +- } +- } +- { +- int one = 1; int little = (int)*(unsigned char *)&one; +- unsigned char *bytes = (unsigned char *)&value; +- return _PyLong_FromByteArray(bytes, sizeof(int), +- little, !is_unsigned); +- } +-} +- +-/* CIntToPy */ +-static CYTHON_INLINE PyObject* __Pyx_PyInt_From_char(char value) { +- const char neg_one = (char) ((char) 0 - (char) 1), const_zero = (char) 0; +- const int is_unsigned = neg_one > const_zero; +- if (is_unsigned) { +- if (sizeof(char) < sizeof(long)) { +- return PyInt_FromLong((long) value); +- } else if (sizeof(char) <= sizeof(unsigned long)) { +- return PyLong_FromUnsignedLong((unsigned long) value); +-#ifdef HAVE_LONG_LONG +- } else if (sizeof(char) <= sizeof(unsigned PY_LONG_LONG)) { +- return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG) value); +-#endif +- } +- } else { +- if (sizeof(char) <= sizeof(long)) { +- return PyInt_FromLong((long) value); +-#ifdef HAVE_LONG_LONG +- } else if (sizeof(char) <= sizeof(PY_LONG_LONG)) { +- return PyLong_FromLongLong((PY_LONG_LONG) value); +-#endif +- } +- } +- { +- int one = 1; int little = (int)*(unsigned char *)&one; +- unsigned char *bytes = (unsigned char *)&value; +- return _PyLong_FromByteArray(bytes, sizeof(char), +- little, !is_unsigned); +- } +-} +- +-/* CIntToPy */ +-static CYTHON_INLINE PyObject* __Pyx_PyInt_From_unsigned_char(unsigned char value) { +- const unsigned char neg_one = (unsigned char) ((unsigned char) 0 - (unsigned char) 1), const_zero = (unsigned char) 0; +- const int is_unsigned = neg_one > const_zero; +- if (is_unsigned) { +- if (sizeof(unsigned char) < sizeof(long)) { +- return PyInt_FromLong((long) value); +- } else if (sizeof(unsigned char) <= sizeof(unsigned long)) { +- return PyLong_FromUnsignedLong((unsigned long) value); +-#ifdef HAVE_LONG_LONG +- } else if (sizeof(unsigned char) <= sizeof(unsigned PY_LONG_LONG)) { +- return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG) value); +-#endif +- } +- } else { +- if (sizeof(unsigned char) <= sizeof(long)) { +- return PyInt_FromLong((long) value); +-#ifdef HAVE_LONG_LONG +- } else if (sizeof(unsigned char) <= sizeof(PY_LONG_LONG)) { +- return PyLong_FromLongLong((PY_LONG_LONG) value); +-#endif +- } +- } +- { +- int one = 1; int little = (int)*(unsigned char *)&one; +- unsigned char *bytes = (unsigned char *)&value; +- return _PyLong_FromByteArray(bytes, sizeof(unsigned char), +- little, !is_unsigned); +- } +-} +- +-/* CIntToPy */ +-static CYTHON_INLINE PyObject* __Pyx_PyInt_From_enum____pyx_t_2wx_3svg_8_nanosvg_SVGpaintType(enum __pyx_t_2wx_3svg_8_nanosvg_SVGpaintType value) { +- const enum __pyx_t_2wx_3svg_8_nanosvg_SVGpaintType neg_one = (enum __pyx_t_2wx_3svg_8_nanosvg_SVGpaintType) ((enum __pyx_t_2wx_3svg_8_nanosvg_SVGpaintType) 0 - (enum __pyx_t_2wx_3svg_8_nanosvg_SVGpaintType) 1), const_zero = (enum __pyx_t_2wx_3svg_8_nanosvg_SVGpaintType) 0; +- const int is_unsigned = neg_one > const_zero; +- if (is_unsigned) { +- if (sizeof(enum __pyx_t_2wx_3svg_8_nanosvg_SVGpaintType) < sizeof(long)) { +- return PyInt_FromLong((long) value); +- } else if (sizeof(enum __pyx_t_2wx_3svg_8_nanosvg_SVGpaintType) <= sizeof(unsigned long)) { +- return PyLong_FromUnsignedLong((unsigned long) value); +-#ifdef HAVE_LONG_LONG +- } else if (sizeof(enum __pyx_t_2wx_3svg_8_nanosvg_SVGpaintType) <= sizeof(unsigned PY_LONG_LONG)) { +- return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG) value); ++static CYTHON_INLINE PyObject* __Pyx_PyInt_From_long(long value) { ++#ifdef __Pyx_HAS_GCC_DIAGNOSTIC ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wconversion" + #endif +- } +- } else { +- if (sizeof(enum __pyx_t_2wx_3svg_8_nanosvg_SVGpaintType) <= sizeof(long)) { +- return PyInt_FromLong((long) value); +-#ifdef HAVE_LONG_LONG +- } else if (sizeof(enum __pyx_t_2wx_3svg_8_nanosvg_SVGpaintType) <= sizeof(PY_LONG_LONG)) { +- return PyLong_FromLongLong((PY_LONG_LONG) value); ++ const long neg_one = (long) -1, const_zero = (long) 0; ++#ifdef __Pyx_HAS_GCC_DIAGNOSTIC ++#pragma GCC diagnostic pop + #endif +- } +- } +- { +- int one = 1; int little = (int)*(unsigned char *)&one; +- unsigned char *bytes = (unsigned char *)&value; +- return _PyLong_FromByteArray(bytes, sizeof(enum __pyx_t_2wx_3svg_8_nanosvg_SVGpaintType), +- little, !is_unsigned); +- } +-} +- +-/* CIntToPy */ +-static CYTHON_INLINE PyObject* __Pyx_PyInt_From_unsigned_int(unsigned int value) { +- const unsigned int neg_one = (unsigned int) ((unsigned int) 0 - (unsigned int) 1), const_zero = (unsigned int) 0; + const int is_unsigned = neg_one > const_zero; + if (is_unsigned) { +- if (sizeof(unsigned int) < sizeof(long)) { ++ if (sizeof(long) < sizeof(long)) { + return PyInt_FromLong((long) value); +- } else if (sizeof(unsigned int) <= sizeof(unsigned long)) { ++ } else if (sizeof(long) <= sizeof(unsigned long)) { + return PyLong_FromUnsignedLong((unsigned long) value); + #ifdef HAVE_LONG_LONG +- } else if (sizeof(unsigned int) <= sizeof(unsigned PY_LONG_LONG)) { ++ } else if (sizeof(long) <= sizeof(unsigned PY_LONG_LONG)) { + return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG) value); + #endif + } + } else { +- if (sizeof(unsigned int) <= sizeof(long)) { ++ if (sizeof(long) <= sizeof(long)) { + return PyInt_FromLong((long) value); + #ifdef HAVE_LONG_LONG +- } else if (sizeof(unsigned int) <= sizeof(PY_LONG_LONG)) { ++ } else if (sizeof(long) <= sizeof(PY_LONG_LONG)) { + return PyLong_FromLongLong((PY_LONG_LONG) value); + #endif + } +@@ -19646,14 +19513,21 @@ static CYTHON_INLINE PyObject* __Pyx_PyInt_From_unsigned_int(unsigned int value) + { + int one = 1; int little = (int)*(unsigned char *)&one; + unsigned char *bytes = (unsigned char *)&value; +- return _PyLong_FromByteArray(bytes, sizeof(unsigned int), ++ return _PyLong_FromByteArray(bytes, sizeof(long), + little, !is_unsigned); + } + } + + /* CIntFromPy */ + static CYTHON_INLINE int __Pyx_PyInt_As_int(PyObject *x) { +- const int neg_one = (int) ((int) 0 - (int) 1), const_zero = (int) 0; ++#ifdef __Pyx_HAS_GCC_DIAGNOSTIC ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wconversion" ++#endif ++ const int neg_one = (int) -1, const_zero = (int) 0; ++#ifdef __Pyx_HAS_GCC_DIAGNOSTIC ++#pragma GCC diagnostic pop ++#endif + const int is_unsigned = neg_one > const_zero; + #if PY_MAJOR_VERSION < 3 + if (likely(PyInt_Check(x))) { +@@ -19840,9 +19714,92 @@ raise_neg_overflow: + return (int) -1; + } + ++/* CIntToPy */ ++static CYTHON_INLINE PyObject* __Pyx_PyInt_From_int(int value) { ++#ifdef __Pyx_HAS_GCC_DIAGNOSTIC ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wconversion" ++#endif ++ const int neg_one = (int) -1, const_zero = (int) 0; ++#ifdef __Pyx_HAS_GCC_DIAGNOSTIC ++#pragma GCC diagnostic pop ++#endif ++ const int is_unsigned = neg_one > const_zero; ++ if (is_unsigned) { ++ if (sizeof(int) < sizeof(long)) { ++ return PyInt_FromLong((long) value); ++ } else if (sizeof(int) <= sizeof(unsigned long)) { ++ return PyLong_FromUnsignedLong((unsigned long) value); ++#ifdef HAVE_LONG_LONG ++ } else if (sizeof(int) <= sizeof(unsigned PY_LONG_LONG)) { ++ return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG) value); ++#endif ++ } ++ } else { ++ if (sizeof(int) <= sizeof(long)) { ++ return PyInt_FromLong((long) value); ++#ifdef HAVE_LONG_LONG ++ } else if (sizeof(int) <= sizeof(PY_LONG_LONG)) { ++ return PyLong_FromLongLong((PY_LONG_LONG) value); ++#endif ++ } ++ } ++ { ++ int one = 1; int little = (int)*(unsigned char *)&one; ++ unsigned char *bytes = (unsigned char *)&value; ++ return _PyLong_FromByteArray(bytes, sizeof(int), ++ little, !is_unsigned); ++ } ++} ++ ++/* CIntToPy */ ++static CYTHON_INLINE PyObject* __Pyx_PyInt_From_char(char value) { ++#ifdef __Pyx_HAS_GCC_DIAGNOSTIC ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wconversion" ++#endif ++ const char neg_one = (char) -1, const_zero = (char) 0; ++#ifdef __Pyx_HAS_GCC_DIAGNOSTIC ++#pragma GCC diagnostic pop ++#endif ++ const int is_unsigned = neg_one > const_zero; ++ if (is_unsigned) { ++ if (sizeof(char) < sizeof(long)) { ++ return PyInt_FromLong((long) value); ++ } else if (sizeof(char) <= sizeof(unsigned long)) { ++ return PyLong_FromUnsignedLong((unsigned long) value); ++#ifdef HAVE_LONG_LONG ++ } else if (sizeof(char) <= sizeof(unsigned PY_LONG_LONG)) { ++ return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG) value); ++#endif ++ } ++ } else { ++ if (sizeof(char) <= sizeof(long)) { ++ return PyInt_FromLong((long) value); ++#ifdef HAVE_LONG_LONG ++ } else if (sizeof(char) <= sizeof(PY_LONG_LONG)) { ++ return PyLong_FromLongLong((PY_LONG_LONG) value); ++#endif ++ } ++ } ++ { ++ int one = 1; int little = (int)*(unsigned char *)&one; ++ unsigned char *bytes = (unsigned char *)&value; ++ return _PyLong_FromByteArray(bytes, sizeof(char), ++ little, !is_unsigned); ++ } ++} ++ + /* CIntFromPy */ + static CYTHON_INLINE char __Pyx_PyInt_As_char(PyObject *x) { +- const char neg_one = (char) ((char) 0 - (char) 1), const_zero = (char) 0; ++#ifdef __Pyx_HAS_GCC_DIAGNOSTIC ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wconversion" ++#endif ++ const char neg_one = (char) -1, const_zero = (char) 0; ++#ifdef __Pyx_HAS_GCC_DIAGNOSTIC ++#pragma GCC diagnostic pop ++#endif + const int is_unsigned = neg_one > const_zero; + #if PY_MAJOR_VERSION < 3 + if (likely(PyInt_Check(x))) { +@@ -20029,9 +19986,54 @@ raise_neg_overflow: + return (char) -1; + } + ++/* CIntToPy */ ++static CYTHON_INLINE PyObject* __Pyx_PyInt_From_unsigned_char(unsigned char value) { ++#ifdef __Pyx_HAS_GCC_DIAGNOSTIC ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wconversion" ++#endif ++ const unsigned char neg_one = (unsigned char) -1, const_zero = (unsigned char) 0; ++#ifdef __Pyx_HAS_GCC_DIAGNOSTIC ++#pragma GCC diagnostic pop ++#endif ++ const int is_unsigned = neg_one > const_zero; ++ if (is_unsigned) { ++ if (sizeof(unsigned char) < sizeof(long)) { ++ return PyInt_FromLong((long) value); ++ } else if (sizeof(unsigned char) <= sizeof(unsigned long)) { ++ return PyLong_FromUnsignedLong((unsigned long) value); ++#ifdef HAVE_LONG_LONG ++ } else if (sizeof(unsigned char) <= sizeof(unsigned PY_LONG_LONG)) { ++ return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG) value); ++#endif ++ } ++ } else { ++ if (sizeof(unsigned char) <= sizeof(long)) { ++ return PyInt_FromLong((long) value); ++#ifdef HAVE_LONG_LONG ++ } else if (sizeof(unsigned char) <= sizeof(PY_LONG_LONG)) { ++ return PyLong_FromLongLong((PY_LONG_LONG) value); ++#endif ++ } ++ } ++ { ++ int one = 1; int little = (int)*(unsigned char *)&one; ++ unsigned char *bytes = (unsigned char *)&value; ++ return _PyLong_FromByteArray(bytes, sizeof(unsigned char), ++ little, !is_unsigned); ++ } ++} ++ + /* CIntFromPy */ + static CYTHON_INLINE long __Pyx_PyInt_As_long(PyObject *x) { +- const long neg_one = (long) ((long) 0 - (long) 1), const_zero = (long) 0; ++#ifdef __Pyx_HAS_GCC_DIAGNOSTIC ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wconversion" ++#endif ++ const long neg_one = (long) -1, const_zero = (long) 0; ++#ifdef __Pyx_HAS_GCC_DIAGNOSTIC ++#pragma GCC diagnostic pop ++#endif + const int is_unsigned = neg_one > const_zero; + #if PY_MAJOR_VERSION < 3 + if (likely(PyInt_Check(x))) { +@@ -20218,9 +20220,92 @@ raise_neg_overflow: + return (long) -1; + } + ++/* CIntToPy */ ++static CYTHON_INLINE PyObject* __Pyx_PyInt_From_enum____pyx_t_2wx_3svg_8_nanosvg_SVGpaintType(enum __pyx_t_2wx_3svg_8_nanosvg_SVGpaintType value) { ++#ifdef __Pyx_HAS_GCC_DIAGNOSTIC ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wconversion" ++#endif ++ const enum __pyx_t_2wx_3svg_8_nanosvg_SVGpaintType neg_one = (enum __pyx_t_2wx_3svg_8_nanosvg_SVGpaintType) -1, const_zero = (enum __pyx_t_2wx_3svg_8_nanosvg_SVGpaintType) 0; ++#ifdef __Pyx_HAS_GCC_DIAGNOSTIC ++#pragma GCC diagnostic pop ++#endif ++ const int is_unsigned = neg_one > const_zero; ++ if (is_unsigned) { ++ if (sizeof(enum __pyx_t_2wx_3svg_8_nanosvg_SVGpaintType) < sizeof(long)) { ++ return PyInt_FromLong((long) value); ++ } else if (sizeof(enum __pyx_t_2wx_3svg_8_nanosvg_SVGpaintType) <= sizeof(unsigned long)) { ++ return PyLong_FromUnsignedLong((unsigned long) value); ++#ifdef HAVE_LONG_LONG ++ } else if (sizeof(enum __pyx_t_2wx_3svg_8_nanosvg_SVGpaintType) <= sizeof(unsigned PY_LONG_LONG)) { ++ return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG) value); ++#endif ++ } ++ } else { ++ if (sizeof(enum __pyx_t_2wx_3svg_8_nanosvg_SVGpaintType) <= sizeof(long)) { ++ return PyInt_FromLong((long) value); ++#ifdef HAVE_LONG_LONG ++ } else if (sizeof(enum __pyx_t_2wx_3svg_8_nanosvg_SVGpaintType) <= sizeof(PY_LONG_LONG)) { ++ return PyLong_FromLongLong((PY_LONG_LONG) value); ++#endif ++ } ++ } ++ { ++ int one = 1; int little = (int)*(unsigned char *)&one; ++ unsigned char *bytes = (unsigned char *)&value; ++ return _PyLong_FromByteArray(bytes, sizeof(enum __pyx_t_2wx_3svg_8_nanosvg_SVGpaintType), ++ little, !is_unsigned); ++ } ++} ++ ++/* CIntToPy */ ++static CYTHON_INLINE PyObject* __Pyx_PyInt_From_unsigned_int(unsigned int value) { ++#ifdef __Pyx_HAS_GCC_DIAGNOSTIC ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wconversion" ++#endif ++ const unsigned int neg_one = (unsigned int) -1, const_zero = (unsigned int) 0; ++#ifdef __Pyx_HAS_GCC_DIAGNOSTIC ++#pragma GCC diagnostic pop ++#endif ++ const int is_unsigned = neg_one > const_zero; ++ if (is_unsigned) { ++ if (sizeof(unsigned int) < sizeof(long)) { ++ return PyInt_FromLong((long) value); ++ } else if (sizeof(unsigned int) <= sizeof(unsigned long)) { ++ return PyLong_FromUnsignedLong((unsigned long) value); ++#ifdef HAVE_LONG_LONG ++ } else if (sizeof(unsigned int) <= sizeof(unsigned PY_LONG_LONG)) { ++ return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG) value); ++#endif ++ } ++ } else { ++ if (sizeof(unsigned int) <= sizeof(long)) { ++ return PyInt_FromLong((long) value); ++#ifdef HAVE_LONG_LONG ++ } else if (sizeof(unsigned int) <= sizeof(PY_LONG_LONG)) { ++ return PyLong_FromLongLong((PY_LONG_LONG) value); ++#endif ++ } ++ } ++ { ++ int one = 1; int little = (int)*(unsigned char *)&one; ++ unsigned char *bytes = (unsigned char *)&value; ++ return _PyLong_FromByteArray(bytes, sizeof(unsigned int), ++ little, !is_unsigned); ++ } ++} ++ + /* CIntToPy */ + static CYTHON_INLINE PyObject* __Pyx_PyInt_From_enum____pyx_t_2wx_3svg_8_nanosvg_SVGfillRule(enum __pyx_t_2wx_3svg_8_nanosvg_SVGfillRule value) { +- const enum __pyx_t_2wx_3svg_8_nanosvg_SVGfillRule neg_one = (enum __pyx_t_2wx_3svg_8_nanosvg_SVGfillRule) ((enum __pyx_t_2wx_3svg_8_nanosvg_SVGfillRule) 0 - (enum __pyx_t_2wx_3svg_8_nanosvg_SVGfillRule) 1), const_zero = (enum __pyx_t_2wx_3svg_8_nanosvg_SVGfillRule) 0; ++#ifdef __Pyx_HAS_GCC_DIAGNOSTIC ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wconversion" ++#endif ++ const enum __pyx_t_2wx_3svg_8_nanosvg_SVGfillRule neg_one = (enum __pyx_t_2wx_3svg_8_nanosvg_SVGfillRule) -1, const_zero = (enum __pyx_t_2wx_3svg_8_nanosvg_SVGfillRule) 0; ++#ifdef __Pyx_HAS_GCC_DIAGNOSTIC ++#pragma GCC diagnostic pop ++#endif + const int is_unsigned = neg_one > const_zero; + if (is_unsigned) { + if (sizeof(enum __pyx_t_2wx_3svg_8_nanosvg_SVGfillRule) < sizeof(long)) { +@@ -20251,7 +20336,14 @@ static CYTHON_INLINE PyObject* __Pyx_PyInt_From_enum____pyx_t_2wx_3svg_8_nanosvg + + /* CIntToPy */ + static CYTHON_INLINE PyObject* __Pyx_PyInt_From_enum____pyx_t_2wx_3svg_8_nanosvg_SVGflags(enum __pyx_t_2wx_3svg_8_nanosvg_SVGflags value) { +- const enum __pyx_t_2wx_3svg_8_nanosvg_SVGflags neg_one = (enum __pyx_t_2wx_3svg_8_nanosvg_SVGflags) ((enum __pyx_t_2wx_3svg_8_nanosvg_SVGflags) 0 - (enum __pyx_t_2wx_3svg_8_nanosvg_SVGflags) 1), const_zero = (enum __pyx_t_2wx_3svg_8_nanosvg_SVGflags) 0; ++#ifdef __Pyx_HAS_GCC_DIAGNOSTIC ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wconversion" ++#endif ++ const enum __pyx_t_2wx_3svg_8_nanosvg_SVGflags neg_one = (enum __pyx_t_2wx_3svg_8_nanosvg_SVGflags) -1, const_zero = (enum __pyx_t_2wx_3svg_8_nanosvg_SVGflags) 0; ++#ifdef __Pyx_HAS_GCC_DIAGNOSTIC ++#pragma GCC diagnostic pop ++#endif + const int is_unsigned = neg_one > const_zero; + if (is_unsigned) { + if (sizeof(enum __pyx_t_2wx_3svg_8_nanosvg_SVGflags) < sizeof(long)) { +@@ -20282,7 +20374,14 @@ static CYTHON_INLINE PyObject* __Pyx_PyInt_From_enum____pyx_t_2wx_3svg_8_nanosvg + + /* CIntToPy */ + static CYTHON_INLINE PyObject* __Pyx_PyInt_From_enum____pyx_t_2wx_3svg_8_nanosvg_SVGlineCap(enum __pyx_t_2wx_3svg_8_nanosvg_SVGlineCap value) { +- const enum __pyx_t_2wx_3svg_8_nanosvg_SVGlineCap neg_one = (enum __pyx_t_2wx_3svg_8_nanosvg_SVGlineCap) ((enum __pyx_t_2wx_3svg_8_nanosvg_SVGlineCap) 0 - (enum __pyx_t_2wx_3svg_8_nanosvg_SVGlineCap) 1), const_zero = (enum __pyx_t_2wx_3svg_8_nanosvg_SVGlineCap) 0; ++#ifdef __Pyx_HAS_GCC_DIAGNOSTIC ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wconversion" ++#endif ++ const enum __pyx_t_2wx_3svg_8_nanosvg_SVGlineCap neg_one = (enum __pyx_t_2wx_3svg_8_nanosvg_SVGlineCap) -1, const_zero = (enum __pyx_t_2wx_3svg_8_nanosvg_SVGlineCap) 0; ++#ifdef __Pyx_HAS_GCC_DIAGNOSTIC ++#pragma GCC diagnostic pop ++#endif + const int is_unsigned = neg_one > const_zero; + if (is_unsigned) { + if (sizeof(enum __pyx_t_2wx_3svg_8_nanosvg_SVGlineCap) < sizeof(long)) { +@@ -20313,7 +20412,14 @@ static CYTHON_INLINE PyObject* __Pyx_PyInt_From_enum____pyx_t_2wx_3svg_8_nanosvg + + /* CIntToPy */ + static CYTHON_INLINE PyObject* __Pyx_PyInt_From_enum____pyx_t_2wx_3svg_8_nanosvg_SVGlineJoin(enum __pyx_t_2wx_3svg_8_nanosvg_SVGlineJoin value) { +- const enum __pyx_t_2wx_3svg_8_nanosvg_SVGlineJoin neg_one = (enum __pyx_t_2wx_3svg_8_nanosvg_SVGlineJoin) ((enum __pyx_t_2wx_3svg_8_nanosvg_SVGlineJoin) 0 - (enum __pyx_t_2wx_3svg_8_nanosvg_SVGlineJoin) 1), const_zero = (enum __pyx_t_2wx_3svg_8_nanosvg_SVGlineJoin) 0; ++#ifdef __Pyx_HAS_GCC_DIAGNOSTIC ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wconversion" ++#endif ++ const enum __pyx_t_2wx_3svg_8_nanosvg_SVGlineJoin neg_one = (enum __pyx_t_2wx_3svg_8_nanosvg_SVGlineJoin) -1, const_zero = (enum __pyx_t_2wx_3svg_8_nanosvg_SVGlineJoin) 0; ++#ifdef __Pyx_HAS_GCC_DIAGNOSTIC ++#pragma GCC diagnostic pop ++#endif + const int is_unsigned = neg_one > const_zero; + if (is_unsigned) { + if (sizeof(enum __pyx_t_2wx_3svg_8_nanosvg_SVGlineJoin) < sizeof(long)) { +@@ -20344,7 +20450,14 @@ static CYTHON_INLINE PyObject* __Pyx_PyInt_From_enum____pyx_t_2wx_3svg_8_nanosvg + + /* CIntToPy */ + static CYTHON_INLINE PyObject* __Pyx_PyInt_From_enum____pyx_t_2wx_3svg_8_nanosvg_SVGspreadType(enum __pyx_t_2wx_3svg_8_nanosvg_SVGspreadType value) { +- const enum __pyx_t_2wx_3svg_8_nanosvg_SVGspreadType neg_one = (enum __pyx_t_2wx_3svg_8_nanosvg_SVGspreadType) ((enum __pyx_t_2wx_3svg_8_nanosvg_SVGspreadType) 0 - (enum __pyx_t_2wx_3svg_8_nanosvg_SVGspreadType) 1), const_zero = (enum __pyx_t_2wx_3svg_8_nanosvg_SVGspreadType) 0; ++#ifdef __Pyx_HAS_GCC_DIAGNOSTIC ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wconversion" ++#endif ++ const enum __pyx_t_2wx_3svg_8_nanosvg_SVGspreadType neg_one = (enum __pyx_t_2wx_3svg_8_nanosvg_SVGspreadType) -1, const_zero = (enum __pyx_t_2wx_3svg_8_nanosvg_SVGspreadType) 0; ++#ifdef __Pyx_HAS_GCC_DIAGNOSTIC ++#pragma GCC diagnostic pop ++#endif + const int is_unsigned = neg_one > const_zero; + if (is_unsigned) { + if (sizeof(enum __pyx_t_2wx_3svg_8_nanosvg_SVGspreadType) < sizeof(long)) { +@@ -20907,6 +21020,30 @@ PyObject *__Pyx_Coroutine_MethodReturn(CYTHON_UNUSED PyObject* gen, PyObject *re + } + return retval; + } ++#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x03030000 && (defined(__linux__) || PY_VERSION_HEX >= 0x030600B3) ++static CYTHON_INLINE ++PyObject *__Pyx_PyGen_Send(PyGenObject *gen, PyObject *arg) { ++#if PY_VERSION_HEX <= 0x030A00A1 ++ return _PyGen_Send(gen, arg); ++#else ++ PyObject *result; ++ if (PyIter_Send((PyObject*)gen, arg ? arg : Py_None, &result) == PYGEN_RETURN) { ++ if (PyAsyncGen_CheckExact(gen)) { ++ assert(result == Py_None); ++ PyErr_SetNone(PyExc_StopAsyncIteration); ++ } ++ else if (result == Py_None) { ++ PyErr_SetNone(PyExc_StopIteration); ++ } ++ else { ++ _PyGen_SetStopIterationValue(result); ++ } ++ Py_CLEAR(result); ++ } ++ return result; ++#endif ++} ++#endif + static CYTHON_INLINE + PyObject *__Pyx_Coroutine_FinishDelegation(__pyx_CoroutineObject *gen) { + PyObject *ret; +@@ -20943,12 +21080,12 @@ static PyObject *__Pyx_Coroutine_Send(PyObject *self, PyObject *value) { + #endif + #if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x03030000 && (defined(__linux__) || PY_VERSION_HEX >= 0x030600B3) + if (PyGen_CheckExact(yf)) { +- ret = _PyGen_Send((PyGenObject*)yf, value == Py_None ? NULL : value); ++ ret = __Pyx_PyGen_Send((PyGenObject*)yf, value == Py_None ? NULL : value); + } else + #endif + #if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x03050000 && defined(PyCoro_CheckExact) && (defined(__linux__) || PY_VERSION_HEX >= 0x030600B3) + if (PyCoro_CheckExact(yf)) { +- ret = _PyGen_Send((PyGenObject*)yf, value == Py_None ? NULL : value); ++ ret = __Pyx_PyGen_Send((PyGenObject*)yf, value == Py_None ? NULL : value); + } else + #endif + { +@@ -21032,7 +21169,7 @@ static PyObject *__Pyx_Generator_Next(PyObject *self) { + #endif + #if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x03030000 && (defined(__linux__) || PY_VERSION_HEX >= 0x030600B3) + if (PyGen_CheckExact(yf)) { +- ret = _PyGen_Send((PyGenObject*)yf, NULL); ++ ret = __Pyx_PyGen_Send((PyGenObject*)yf, NULL); + } else + #endif + #ifdef __Pyx_Coroutine_USED +@@ -21192,6 +21329,7 @@ static int __Pyx_Coroutine_clear(PyObject *self) { + } + #endif + Py_CLEAR(gen->gi_code); ++ Py_CLEAR(gen->gi_frame); + Py_CLEAR(gen->gi_name); + Py_CLEAR(gen->gi_qualname); + Py_CLEAR(gen->gi_modulename); +@@ -21208,7 +21346,7 @@ static void __Pyx_Coroutine_dealloc(PyObject *self) { + if (PyObject_CallFinalizerFromDealloc(self)) + #else + Py_TYPE(gen)->tp_del(self); +- if (self->ob_refcnt > 0) ++ if (Py_REFCNT(self) > 0) + #endif + { + return; +@@ -21235,7 +21373,7 @@ static void __Pyx_Coroutine_del(PyObject *self) { + } + #if !CYTHON_USE_TP_FINALIZE + assert(self->ob_refcnt == 0); +- self->ob_refcnt = 1; ++ __Pyx_SET_REFCNT(self, 1); + #endif + __Pyx_PyThreadState_assign + __Pyx_ErrFetch(&error_type, &error_value, &error_traceback); +@@ -21302,17 +21440,17 @@ static void __Pyx_Coroutine_del(PyObject *self) { + } + __Pyx_ErrRestore(error_type, error_value, error_traceback); + #if !CYTHON_USE_TP_FINALIZE +- assert(self->ob_refcnt > 0); ++ assert(Py_REFCNT(self) > 0); + if (--self->ob_refcnt == 0) { + return; + } + { +- Py_ssize_t refcnt = self->ob_refcnt; ++ Py_ssize_t refcnt = Py_REFCNT(self); + _Py_NewReference(self); +- self->ob_refcnt = refcnt; ++ __Pyx_SET_REFCNT(self, refcnt); + } + #if CYTHON_COMPILING_IN_CPYTHON +- assert(PyType_IS_GC(self->ob_type) && ++ assert(PyType_IS_GC(Py_TYPE(self)) && + _Py_AS_GC(self)->gc.gc_refs != _PyGC_REFS_UNTRACKED); + _Py_DEC_REFTOTAL; + #endif +@@ -21378,6 +21516,27 @@ __Pyx_Coroutine_set_qualname(__pyx_CoroutineObject *self, PyObject *value, CYTHO + Py_XDECREF(tmp); + return 0; + } ++static PyObject * ++__Pyx_Coroutine_get_frame(__pyx_CoroutineObject *self, CYTHON_UNUSED void *context) ++{ ++ PyObject *frame = self->gi_frame; ++ if (!frame) { ++ if (unlikely(!self->gi_code)) { ++ Py_RETURN_NONE; ++ } ++ frame = (PyObject *) PyFrame_New( ++ PyThreadState_Get(), /*PyThreadState *tstate,*/ ++ (PyCodeObject*) self->gi_code, /*PyCodeObject *code,*/ ++ __pyx_d, /*PyObject *globals,*/ ++ 0 /*PyObject *locals*/ ++ ); ++ if (unlikely(!frame)) ++ return NULL; ++ self->gi_frame = frame; ++ } ++ Py_INCREF(frame); ++ return frame; ++} + static __pyx_CoroutineObject *__Pyx__Coroutine_New( + PyTypeObject* type, __pyx_coroutine_body_t body, PyObject *code, PyObject *closure, + PyObject *name, PyObject *qualname, PyObject *module_name) { +@@ -21411,6 +21570,7 @@ static __pyx_CoroutineObject *__Pyx__Coroutine_NewInit( + gen->gi_modulename = module_name; + Py_XINCREF(code); + gen->gi_code = code; ++ gen->gi_frame = NULL; + PyObject_GC_Track(gen); + return gen; + } +@@ -21534,6 +21694,8 @@ static PyGetSetDef __pyx_Generator_getsets[] = { + (char*) PyDoc_STR("name of the generator"), 0}, + {(char *) "__qualname__", (getter)__Pyx_Coroutine_get_qualname, (setter)__Pyx_Coroutine_set_qualname, + (char*) PyDoc_STR("qualified name of the generator"), 0}, ++ {(char *) "gi_frame", (getter)__Pyx_Coroutine_get_frame, NULL, ++ (char*) PyDoc_STR("Frame of the generator"), 0}, + {0, 0, 0, 0, 0} + }; + static PyTypeObject __pyx_GeneratorType_type = { +-- +2.33.0 + diff --git a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.1.1.bb b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.1.1.bb index 6ec92c2cec..4d739b86f7 100644 --- a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.1.1.bb +++ b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.1.1.bb @@ -11,6 +11,7 @@ PYPI_PACKAGE = "wxPython" SRC_URI += "file://add-back-option-build-base.patch \ file://wxgtk-fixup-build-scripts.patch \ file://sip-fix-override-functions.patch \ + file://0001-Update-Cython-version-to-fix-NanoSVG-issues-with-Pyt.patch \ " SRC_URI[sha256sum] = "00e5e3180ac7f2852f342ad341d57c44e7e4326de0b550b9a5c4a8361b6c3528" From patchwork Fri Jun 3 19:17:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 8810 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 1FC16CCA480 for ; Fri, 3 Jun 2022 19:19:35 +0000 (UTC) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by mx.groups.io with SMTP id smtpd.web10.2396.1654283969981571913 for ; Fri, 03 Jun 2022 12:19:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=VYaHudsa; spf=pass (domain: gmail.com, ip: 209.85.216.53, mailfrom: akuster808@gmail.com) Received: by mail-pj1-f53.google.com with SMTP id 3-20020a17090a174300b001e426a02ac5so9641198pjm.2 for ; Fri, 03 Jun 2022 12:19:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=3Cw22w7karlVxJCF98y5sFYc9Chpryca052GfbQ7q+E=; b=VYaHudsaG9QQBlj7/nGYk+3PCtwIOupkeD797k+Z8AXnyM4iDmsMJK/th8JuMC3MpS ypQ1si8bcnN53AOmjIb2LBHVWA73lb4sBNydvTq8D8Ku4NZ8+WAiI0pJC9icf5bXwo3H iD2a1CMnlNV2l/HqMu/foBTjxIxKIIXwWT6l3+HSkXHNk4gkCRjzAP1EXPOdz0bY9MRU P0wZr/fCyM1Pw2N77FJJF2WLY8RoIURhczFzEnBarrS2Fr+eOuR0DZrYKSsoezto717/ jBjPygBE9jWccUQLQUmGMTzFGS0yf88AeTF6Zb61fzeryRQC0lJ49saELlL9B3jAL5OG vCsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3Cw22w7karlVxJCF98y5sFYc9Chpryca052GfbQ7q+E=; b=zpNHu6cNy4XDSG9o1hIBpOt9Xnjxge5P+FXbSITlhRIP767mGhCdnIN+kxKk2VfiXH sGj5FlT8XxsCgLElZ5Gqlr1ERWCqS7dyE2zBCWQUe0n1VhCNUKNxRKO+RTh5NxPB/Kz4 6H1CNSraKNnYJVsvitXcitbAkbqJMuFEXSoqSatPP5FXvn8Ygtz8FNruecAr2ZN0l75X AU0603PAOYAcLLGcRILd5R0h7TXcTpdC3fwd/16YsRRhxK7ab1jNDtRasyJotj3uxsR2 C3Gx3pk9cdCDQYVZez0jvdv6NpO13BmpvqEfT9AwHlQWYnBK5o5OidvLqFdgPxLUXkGT xqYA== X-Gm-Message-State: AOAM530WXz6JEHfp7KxG1BXmnqQ5v/UcteOE7UOujplRGvvVkPmDMVZP t3PzNqODFo1sEgsupKTPYvDUZGPa2K0= X-Google-Smtp-Source: ABdhPJxdlVutILEyufF9OXKHyJecc3Q/MuMSOj2QNAC1kcRjWnLCgQJGGT9HeI5ls5Ti4uORAm90Qg== X-Received: by 2002:a17:902:bb83:b0:161:fdc3:3b8f with SMTP id m3-20020a170902bb8300b00161fdc33b8fmr11351666pls.45.1654283969185; Fri, 03 Jun 2022 12:19:29 -0700 (PDT) Received: from keaua.caveonetworks.com (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id p2-20020a170902c70200b001617541c94fsm5770620plp.60.2022.06.03.12.19.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 12:19:28 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 04/20] php: upgrade 8.1.4 -> 8.1.5 Date: Fri, 3 Jun 2022 12:17:03 -0700 Message-Id: <7566c789da7850a2a35d1a8aa0f3e0b721e2cb1d.1654282423.git.akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 03 Jun 2022 19:19:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/97393 From: wangmy Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj (cherry picked from commit 412638c21b09ecc6dbe4bd480fbc8a0a83d05da5) Signed-off-by: Armin Kuster --- meta-oe/recipes-devtools/php/{php_8.1.4.bb => php_8.1.5.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-oe/recipes-devtools/php/{php_8.1.4.bb => php_8.1.5.bb} (99%) diff --git a/meta-oe/recipes-devtools/php/php_8.1.4.bb b/meta-oe/recipes-devtools/php/php_8.1.5.bb similarity index 99% rename from meta-oe/recipes-devtools/php/php_8.1.4.bb rename to meta-oe/recipes-devtools/php/php_8.1.5.bb index bf6c543097..e3af9f6984 100644 --- a/meta-oe/recipes-devtools/php/php_8.1.4.bb +++ b/meta-oe/recipes-devtools/php/php_8.1.5.bb @@ -33,7 +33,7 @@ SRC_URI:append:class-target = " \ " S = "${WORKDIR}/php-${PV}" -SRC_URI[sha256sum] = "b3f688cb69758523838b8e7f509aaef0152133d9b84a84a0b7cf68eeafc1df76" +SRC_URI[sha256sum] = "827de56771c3ab8313a069812f15f6ec49989d510aebd0dce180839c6d8d6ff3" inherit autotools pkgconfig python3native gettext From patchwork Fri Jun 3 19:17:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 8807 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 1B5CBCCA47E for ; Fri, 3 Jun 2022 19:19:35 +0000 (UTC) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mx.groups.io with SMTP id smtpd.web10.2397.1654283971622849270 for ; Fri, 03 Jun 2022 12:19:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=jk2+Ld6t; spf=pass (domain: gmail.com, ip: 209.85.216.41, mailfrom: akuster808@gmail.com) Received: by mail-pj1-f41.google.com with SMTP id gd1so8047066pjb.2 for ; Fri, 03 Jun 2022 12:19:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=t85Y/hLha4kdZZZI78b8ahUOHtqqHNXYkQra7nmaCmE=; b=jk2+Ld6t0+6BsOGDZQO5adLlvHmh8D/eZT+tWEGwsXvn3fZ5KQEHGG+cOwHx+BzZVO lLQaYaQpIitfz/t3EU/mtf2A4cUYsIldIRwfJXwLscUT+fPBAjSfxqF8dvJWoZVWLu7j 9+lMRFJVpzqLgPb/PhzNMDkubybCTZUOwBTaynEDr0ZEBsCXC1LDLxpyZjDuusdCb6q4 s7Khp5TTaabG2ICd1GhOFA1yMVk/eHVSK2lFoaBMS/nlTnAFJN37ncujP7PM6z2qbz33 N9LIDIXwTLuC04FN7xo+B3j+oIuF57VPM8uE5cyr+9dSV+S8wV3ntJcwQuRU3b2kM3X6 gEag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=t85Y/hLha4kdZZZI78b8ahUOHtqqHNXYkQra7nmaCmE=; b=gG++oi4+iS9Z/fBly6bQxZ1LH5M88DtZsPADOqgUbfvJi0NgDBX8F4ho8/IrxlvJaw 3dM7n5nq7+dOqIFjNtSbsPAKCe4b6GBWBkoeozJq2ow/QHE0qQ5SFcBrhUfHVDLeYdXX tBRwuRugWde3nqIMKF2RDC5NmiyV0M+RufoIr2/+J50DuGu/Cvt/NUKA1wV9YmOvDLdU q7YEcfVuhrKqaZZqcVA9ms19XucnnoNaNRfMXxcmzuWaj6u/Sza0BP1pOIwduKeYuuVk 0r+/1yVk0dkfinq9lv+ZOiGYPe6DmwkwnGbfC/cav5HJ6212yHix63sfIsxjc5HRxCco Kuew== X-Gm-Message-State: AOAM530TOqvSGJgFUQq8mJgV5Qj9PUcA2sG/C2m29+Vhkf/YizZ5qhq1 ELztA/+GcP/3/QxneM8dI+F6qTyKg2s= X-Google-Smtp-Source: ABdhPJxeI/ald0yZNjMKWAm8ZTrOlnsSh66eDGgZOxRr5pqd3MRGzSzY9H1mtrqA4L8Q03GmXwCWGg== X-Received: by 2002:a17:90a:4a0b:b0:1df:7168:9888 with SMTP id e11-20020a17090a4a0b00b001df71689888mr47716991pjh.16.1654283970816; Fri, 03 Jun 2022 12:19:30 -0700 (PDT) Received: from keaua.caveonetworks.com (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id p2-20020a170902c70200b001617541c94fsm5770620plp.60.2022.06.03.12.19.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 12:19:30 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 05/20] php: upgrade 8.1.5 -> 8.1.6 Date: Fri, 3 Jun 2022 12:17:04 -0700 Message-Id: <71613a9fa18a689a23b22d10da8745af6239a221.1654282423.git.akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 03 Jun 2022 19:19:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/97394 From: wangmy Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj (cherry picked from commit b7bef320005a7e44f28f871d3ecd825dae9c14b8) Signed-off-by: Armin Kuster --- meta-oe/recipes-devtools/php/{php_8.1.5.bb => php_8.1.6.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-oe/recipes-devtools/php/{php_8.1.5.bb => php_8.1.6.bb} (99%) diff --git a/meta-oe/recipes-devtools/php/php_8.1.5.bb b/meta-oe/recipes-devtools/php/php_8.1.6.bb similarity index 99% rename from meta-oe/recipes-devtools/php/php_8.1.5.bb rename to meta-oe/recipes-devtools/php/php_8.1.6.bb index e3af9f6984..96af595a45 100644 --- a/meta-oe/recipes-devtools/php/php_8.1.5.bb +++ b/meta-oe/recipes-devtools/php/php_8.1.6.bb @@ -33,7 +33,7 @@ SRC_URI:append:class-target = " \ " S = "${WORKDIR}/php-${PV}" -SRC_URI[sha256sum] = "827de56771c3ab8313a069812f15f6ec49989d510aebd0dce180839c6d8d6ff3" +SRC_URI[sha256sum] = "7b353304b7407554f70d3e101a226a1fc22decae5c4c42ed270c4e389bfa1b66" inherit autotools pkgconfig python3native gettext From patchwork Fri Jun 3 19:17:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 8812 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 04CACC433EF for ; Fri, 3 Jun 2022 19:19:35 +0000 (UTC) Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by mx.groups.io with SMTP id smtpd.web11.2358.1654283972924592070 for ; Fri, 03 Jun 2022 12:19:33 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=QPLoz5he; spf=pass (domain: gmail.com, ip: 209.85.210.177, mailfrom: akuster808@gmail.com) Received: by mail-pf1-f177.google.com with SMTP id u2so7853591pfc.2 for ; Fri, 03 Jun 2022 12:19:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=W8iqiCtDncMXb1uvrI9GYCDuD2da0w6tCtiBcekYrhs=; b=QPLoz5hemhwmdYI0Mgjf72Gj9ddHtqdLdHHYIapOf/dqto9S3BfNAHFUsN5A/AwfZh Ix6PLQ2wG6JtntrZkqjNcIvxEnjGm+bueboCqhWfmAspQkqW9zUbsJRleez6qtAgjGif Uw7PUNpLojjjed6BWSOQPrYKLruAnxqxQyxy75Ag4CXC1PJbNSz6oVwDBmvybFZpBS5y mUE/2Ys4kV2C0GGkz9ky2UFx3HBwP7EM8XVttLfzpGzAdz+K74UPbCZ5oMplwgOW+1M0 4WuZrVvJ8TEY1t7S45fSFJOkvsthDHfyNgmAQToWLcGh5Z783mtiQiCC4Zugt/QSIhC4 +V1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=W8iqiCtDncMXb1uvrI9GYCDuD2da0w6tCtiBcekYrhs=; b=YuJ6lJ1xcVI+hFQ84vOsKZTIsn8T0Nvjft8WRgXJLOnIezTvLBCh+6kxUfMAs8lFLe 1sm0f2bu7AvRuWJOxuVI95JEStSD+EBTlx47nwFncUkvlhGfbmD62FMVbM2AHCDHlCaS pOm/1QBHQIWG2ONDpUraWXf9yvBBtjyByTvb8qFGa6euPIVnfkfLxpFPpWq4YCLy1KtD OYKhKEtbcEcabulpiLHPRKKQALGMHkw79/tstqAt9T7CcdH5CVDUVmgW+5YX6BAeGDPn fAw66TvT+6OVMq9DNs5IR9HnL9+b5lH3cOckplXB4fXCIsCZ5VKbyRQFu2/8K3qjDAcR QV4w== X-Gm-Message-State: AOAM532XxmIPzheG7kNoQ13iSBlGDCfCKVGEXWYSccyfk6Jva26AXgno AO3lm6PmiP0KsjrTeIcAznnL9mxXeKw= X-Google-Smtp-Source: ABdhPJzaj2NGgCvBDt14dGWAruzZVP5VJLkQwxiD5ZUSrFOeejvB6c1jRvjoprF00u4ZVFAGLmj/7A== X-Received: by 2002:a63:c00c:0:b0:3f6:103:5bc1 with SMTP id h12-20020a63c00c000000b003f601035bc1mr10223607pgg.404.1654283972159; Fri, 03 Jun 2022 12:19:32 -0700 (PDT) Received: from keaua.caveonetworks.com (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id p2-20020a170902c70200b001617541c94fsm5770620plp.60.2022.06.03.12.19.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 12:19:31 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 06/20] postgresql: upgrade 14.2 -> 14.3 Date: Fri, 3 Jun 2022 12:17:05 -0700 Message-Id: <133d2c20031dd573fbc2fcd8f3b537a358e425c1.1654282423.git.akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 03 Jun 2022 19:19:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/97395 From: wangmy 0001-configure.ac-bypass-autoconf-2.69-version-check.patch refreshed for new version. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj (cherry picked from commit b3aa90d11d0b6dbf705a0ed08d256e4980766902) Signed-off-by: Armin Kuster --- ...01-configure.ac-bypass-autoconf-2.69-version-check.patch | 6 +++--- .../postgresql/{postgresql_14.2.bb => postgresql_14.3.bb} | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename meta-oe/recipes-dbs/postgresql/{postgresql_14.2.bb => postgresql_14.3.bb} (80%) diff --git a/meta-oe/recipes-dbs/postgresql/files/0001-configure.ac-bypass-autoconf-2.69-version-check.patch b/meta-oe/recipes-dbs/postgresql/files/0001-configure.ac-bypass-autoconf-2.69-version-check.patch index 39ec7c2c8c..78f24585e8 100644 --- a/meta-oe/recipes-dbs/postgresql/files/0001-configure.ac-bypass-autoconf-2.69-version-check.patch +++ b/meta-oe/recipes-dbs/postgresql/files/0001-configure.ac-bypass-autoconf-2.69-version-check.patch @@ -1,4 +1,4 @@ -From 9c9ac8b64f940bf69ecdc92abca9b58f12b401c3 Mon Sep 17 00:00:00 2001 +From f7084ba49758a6b8db46b917b7c0f831bd65a08f Mon Sep 17 00:00:00 2001 From: Yi Fan Yu Date: Fri, 5 Feb 2021 17:15:42 -0500 Subject: [PATCH] configure.ac: bypass autoconf 2.69 version check @@ -14,12 +14,12 @@ Signed-off-by: Yi Fan Yu 1 file changed, 4 deletions(-) diff --git a/configure.ac b/configure.ac -index 3b148b6..94f39c5 100644 +index d3c55f2..9120184 100644 --- a/configure.ac +++ b/configure.ac @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros - AC_INIT([PostgreSQL], [14.2], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) + AC_INIT([PostgreSQL], [14.3], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. -Untested combinations of 'autoconf' and PostgreSQL versions are not diff --git a/meta-oe/recipes-dbs/postgresql/postgresql_14.2.bb b/meta-oe/recipes-dbs/postgresql/postgresql_14.3.bb similarity index 80% rename from meta-oe/recipes-dbs/postgresql/postgresql_14.2.bb rename to meta-oe/recipes-dbs/postgresql/postgresql_14.3.bb index 52e8867142..c686c9b358 100644 --- a/meta-oe/recipes-dbs/postgresql/postgresql_14.2.bb +++ b/meta-oe/recipes-dbs/postgresql/postgresql_14.3.bb @@ -10,4 +10,4 @@ SRC_URI += "\ file://remove_duplicate.patch \ " -SRC_URI[sha256sum] = "2cf78b2e468912f8101d695db5340cf313c2e9f68a612fb71427524e8c9a977a" +SRC_URI[sha256sum] = "279057368bf59a919c05ada8f95c5e04abb43e74b9a2a69c3d46a20e07a9af38" From patchwork Fri Jun 3 19:17:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 8808 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 0E162CCA473 for ; Fri, 3 Jun 2022 19:19:35 +0000 (UTC) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.web09.2393.1654283973984133770 for ; Fri, 03 Jun 2022 12:19:34 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=lQ9Fi3HT; spf=pass (domain: gmail.com, ip: 209.85.214.177, mailfrom: akuster808@gmail.com) Received: by mail-pl1-f177.google.com with SMTP id o17so7467154pla.6 for ; Fri, 03 Jun 2022 12:19:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=QWW9jgw/xtqQbCbtBRuO6y3kW/KYnOb+s4ErIOqXqrQ=; b=lQ9Fi3HTUXit/+8uONLRKuxFvm1OqOGyJebp7PPAWbrMWv0KhzCh4+WpVwc1Uu9aJR kd6TVOnrtNAE/T+Eo6lQyhSByQj/k/R2oaFT+4/TNP6pm0C8Z2G90SW1ZECszPcNu9ec cX7lXgAmMXKtJ1iIVtjLRjktbB4fp7xVzBZF7GtDO2HGaB8yAG+ImsC3WTsLVAZXbDJn ZCSeMQfyJDmVs7rC8r3popcxWGbph8IzPefAr/97RZFiIBQ0nf94vN33tkuBxitHZqTt ZNlGELDkbMQV1HT1L0gr45tgYXluuK2mXyYfAIbzJ5lba0pqniFz+DgGKMbGJFvrWY81 o1AQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QWW9jgw/xtqQbCbtBRuO6y3kW/KYnOb+s4ErIOqXqrQ=; b=KE7JeipF3S0IthbtPIr5AMbV/Q5P+pSE8hnGLBapTMG/gz81RsDk38sd4YLjKQqZxp kh+ANGrWUmhP+7F6OP26BHJfZy8iz2aXCzftjDMARQUFpMlr3LubQmxVdXbKZPorVvCD XomIlvsDB1YwooaZkMOKKLh1g0hZI4UQLVI6yK3EptrRcDidunV9jkcESj6KIFwDUts/ BsP/SOfkkwgnczYMxugLZPRVzXclkFxhUd1ZxtInQEs/Y5ErMWhGxXFb+k2kY0lp5y0x EXpjOYnfjCzL06saeRtronkcZqjThM0WZXgXF+agVG9CbnryvBtb62D6L/1f/jaGE6BY SyrQ== X-Gm-Message-State: AOAM530+S36zYUi3odnStfwhQZxAUGePgdPr004JmF8XH8xTgSAafaUc zOUTZNsFwmZjwLrnlAwuK4BaDnyln0w= X-Google-Smtp-Source: ABdhPJy4eK0VgSaW4nk6c13YyAWFCInwxH+iNwBFkJd0Kl1OISCVQdHAqZNoqkeeMzzAOCTwAweq7g== X-Received: by 2002:a17:902:ea0b:b0:164:81f:682f with SMTP id s11-20020a170902ea0b00b00164081f682fmr11558226plg.39.1654283973236; Fri, 03 Jun 2022 12:19:33 -0700 (PDT) Received: from keaua.caveonetworks.com (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id p2-20020a170902c70200b001617541c94fsm5770620plp.60.2022.06.03.12.19.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 12:19:32 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 07/20] sdbus-c++-libsystemd: Bump SRCREV to last commit of 250-stable branch Date: Fri, 3 Jun 2022 12:17:06 -0700 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 03 Jun 2022 19:19:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/97396 From: Gianfranco Signed-off-by: Gianfranco Costamagna Signed-off-by: Gianfranco Costamagna Signed-off-by: Khem Raj (cherry picked from commit 32581a7a4653b590118e53b5fabdec72f1d3d0c2) Signed-off-by: Armin Kuster --- meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_250.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_250.3.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_250.3.bb index 6bb5f7abb8..d5c799aac3 100644 --- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_250.3.bb +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_250.3.bb @@ -10,7 +10,7 @@ inherit meson pkgconfig DEPENDS += "gperf-native gettext-native util-linux libcap util-linux python3-jinja2-native" -SRCREV = "1b003bbc806198dbdd57b405d968f30565495e70" +SRCREV = "73be9643910c3f7f3ff84765d63060846c110016" SRCBRANCH = "v250-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \ file://static-libsystemd-pkgconfig.patch \ From patchwork Fri Jun 3 19:17:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 8816 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 F2700C43334 for ; Fri, 3 Jun 2022 19:19:44 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web10.2398.1654283975268279673 for ; Fri, 03 Jun 2022 12:19:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=J3p4GEE1; spf=pass (domain: gmail.com, ip: 209.85.216.50, mailfrom: akuster808@gmail.com) Received: by mail-pj1-f50.google.com with SMTP id n10so8013109pjh.5 for ; Fri, 03 Jun 2022 12:19:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=gaCGu6cWjhawZupHUZeGjiaY9NvjwxDanfXoVXmCdes=; b=J3p4GEE1wldj39yhM7U2A5aqsF0r9CGfpF6p3vECv43JaJzlkoV9SerKcPLTgCjfNa 19wzKLBuuaA4YUCvBpXMHeRY55wXMWFpZDQ9oDLc2VAMPzaxzB1uJXXKnwIxc2GjQLum 4YxosQ5t8oXIlvXYexx3nK+aDARxycVQA3CDj3rDTVZg4pfG75MsJnTJkoY8RHBkxbPb LiUDxvAfGM75ySyekbAo4A1C42sQX/R0eYUXB+F+pH1gWosmMtm8C9eb6852GpTaVUJ/ Jum6csI7yqAR2unwExAONfZ5WBFdcmCafoiDEp3E4jbBBaAuTSEqrhc4+bCwOvVTyGif EaWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gaCGu6cWjhawZupHUZeGjiaY9NvjwxDanfXoVXmCdes=; b=agaMku1KS28HDnm/YccCDzqhaikefPbBlnb3w7cJiqnYuLEXnDA2Sgc/0eZ23GsO2B yBJpBce9sIzvyGyFsHc7z+Oth6x+BIu3YxiaiShqUQS9mCptEYENVfujTijwRUS4RhmJ fv+/Lari/GGPiRLd0X/hg5m1huyuIEWCF+g2EzC9ULz87X2CxWldyd6WiF/4RRrbKr2f lJ4M0TviUKE945v1XSHKhFTpLTsodjn+pYvyq+Qh3fvAvNWZzsYxW9qtNTh8BBMazbei 2hAoH5oVxF4tZAV9vxLI4bwZ18Bu9u9sOMRwBqPBNbbyIeyleO+WpvJjAf/vJY4aCL3v 3okg== X-Gm-Message-State: AOAM530jSfeQh8STShjPJNR364SuCz/kdywedMvPx2m4ILdd0Z7Dmsjf 46QYR/fArjoSGVlrdn+owizquT3ms84= X-Google-Smtp-Source: ABdhPJwIvIGPZsqR9Fu9BB+env+qQLA5t1KNCo5mH9l4I6GFN2dZAtbaqX+LwvxJopJ50Zh49WDPbQ== X-Received: by 2002:a17:90b:3b4b:b0:1e8:434c:5ab1 with SMTP id ot11-20020a17090b3b4b00b001e8434c5ab1mr2622996pjb.129.1654283974429; Fri, 03 Jun 2022 12:19:34 -0700 (PDT) Received: from keaua.caveonetworks.com (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id p2-20020a170902c70200b001617541c94fsm5770620plp.60.2022.06.03.12.19.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 12:19:33 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 08/20] libmtp: Add doxygen-native dependency in case documentation build is enabled in PACKAGECONFIG. This fixes a FTBFS due to missing dependency. Date: Fri, 3 Jun 2022 12:17:07 -0700 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 03 Jun 2022 19:19:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/97397 From: Gianfranco Signed-off-by: Gianfranco Costamagna Signed-off-by: Gianfranco Costamagna Signed-off-by: Khem Raj (cherry picked from commit a9e6d16e6640d105ecf3470ab891598034c9ef33) Signed-off-by: Armin Kuster --- meta-oe/recipes-connectivity/libmtp/libmtp_1.1.19.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.19.bb b/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.19.bb index b4cbb792ce..3483db3c83 100644 --- a/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.19.bb +++ b/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.19.bb @@ -30,7 +30,7 @@ EXTRA_OECONF += " \ " PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'largefile', d)}" -PACKAGECONFIG[doxygen] = "--enable-doxygen,--disable-doxygen" +PACKAGECONFIG[doxygen] = "--enable-doxygen,--disable-doxygen,doxygen-native" PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile" PACKAGECONFIG[mtpz] = "--enable-mtpz,--disable-mtpz,libgcrypt" From patchwork Fri Jun 3 19:17:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 8818 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 1A8F1CCA481 for ; Fri, 3 Jun 2022 19:19:45 +0000 (UTC) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mx.groups.io with SMTP id smtpd.web10.2397.1654283971622849270 for ; Fri, 03 Jun 2022 12:19:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=hppgMlk/; spf=pass (domain: gmail.com, ip: 209.85.216.41, mailfrom: akuster808@gmail.com) Received: by mail-pj1-f41.google.com with SMTP id gd1so8047066pjb.2 for ; Fri, 03 Jun 2022 12:19:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=SpGlpp8MWxSTcEPwvgNOi3DniWNRMascJOCe1isLu1E=; b=hppgMlk/q37c5FCTk4/azi6cOiLG+VxidJueIgiXlCrXSs4SLlIz2pgvzVMxEC3QhW kioqE32U1gNOgtH/cVxJK0AVezAgEAXnd3L099ez8umjWwBi7G117HQEAICj6sLxH1dc VouXeHcr2djMrB6lD81aQIKjRIs2aU9cKTuCFhdWQHu5ppj4E681kklqdKYIcB7gVVuf HczaWFx8MYnSrxgnoORTrT61fSr9R9g6GQKdug30Cta3KOlUUrm+1cKoF2jR6DM2iycd hBgBrSIL8ZREDtRf/GhQ22jxowaTnpi68ngj3Nj9KOXiCFQaTf0HfWGFbZmb0ixfEY0m VReQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SpGlpp8MWxSTcEPwvgNOi3DniWNRMascJOCe1isLu1E=; b=3+LVMg/t+ojCm3vwOb3zhKX0fn96ECHz4VA4Nnc3Izt0hX9lg/bTirc3e7erz70adP RVOOhuZGRI/Iis2f2VYHD6Sj06kY3I622Aoso3B1CFeozzmQA+8VyTx23+EVRQ5wh8qd m7NIjcR1pPVULBnxNeo5xad8HQUTxMthd4G/ffo7hloHmg+QxvNiZ0o38S9bFzdvSmNl VOzGQ3xEiVpQHiiD5QqM++fB2bRhQ0dfzKFHvwDTL7ssXoul8yHS9S3R5UTNq1EcgtkA BAnX/ZibhVzEGz2sTkaS0G069vNskdIGG6/xDK3d7hLd/WwLbJ9XdDtUBJVHKaSMlSDw /S7g== X-Gm-Message-State: AOAM531mhySqqO6P0Ho/2pU0pv5549Vnd+6Cgs6Euw/s+FAdvjNbLV8n EXI0VEdnrLWVqCzynv5sgKHD1/GIlDo= X-Google-Smtp-Source: ABdhPJyohTuOLhbrX1Rfr98cqhl2NPMxwP1VqQZUlTJLnBKMG5KfxiL2CvEYwmp2qfmNJUiDM7hASw== X-Received: by 2002:a17:90b:224e:b0:1e6:8ae1:8e1a with SMTP id hk14-20020a17090b224e00b001e68ae18e1amr9886935pjb.59.1654283975817; Fri, 03 Jun 2022 12:19:35 -0700 (PDT) Received: from keaua.caveonetworks.com (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id p2-20020a170902c70200b001617541c94fsm5770620plp.60.2022.06.03.12.19.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 12:19:35 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 09/20] mariadb: update to 10.7.4 Date: Fri, 3 Jun 2022 12:17:08 -0700 Message-Id: <367e8927b9df348edfb9a761895c36f9c6454fba.1654282423.git.akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 03 Jun 2022 19:19:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/97398 LTS version, bugfix only update. Drop clang-64bit-atomics.patch as the patched code was removed in this update. https://github.com/MariaDB/server/commit/cf483a7766d0730872232fdedd727d30a493fe29 Includes these CVES: CVE-2022-27458 CVE-2022-27457 CVE-2022-27456 CVE-2022-27455 CVE-2022-27452 CVE-2022-27451 CVE-2022-27449 CVE-2022-27448 CVE-2022-27447 CVE-2022-27446 CVE-2022-27445 CVE-2022-27444 CVE-2022-27387 CVE-2022-27386 CVE-2022-27384 CVE-2022-27383 CVE-2022-27382 CVE-2022-27381 CVE-2022-27380 CVE-2022-27379 CVE-2022-27378 CVE-2022-27377 CVE-2022-27376 Signed-off-by: Armin Kuster Signed-off-by: Khem Raj (cherry picked from commit c1720935bd80fa6023f2fcec7c252c0fea183029) Signed-off-by: Armin Kuster --- ...ive_10.7.3.bb => mariadb-native_10.7.4.bb} | 0 meta-oe/recipes-dbs/mysql/mariadb.inc | 3 +- .../mysql/mariadb/clang-64bit-atomics.patch | 178 ------------------ .../{mariadb_10.7.3.bb => mariadb_10.7.4.bb} | 0 4 files changed, 1 insertion(+), 180 deletions(-) rename meta-oe/recipes-dbs/mysql/{mariadb-native_10.7.3.bb => mariadb-native_10.7.4.bb} (100%) delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb/clang-64bit-atomics.patch rename meta-oe/recipes-dbs/mysql/{mariadb_10.7.3.bb => mariadb_10.7.4.bb} (100%) diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.7.3.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.7.4.bb similarity index 100% rename from meta-oe/recipes-dbs/mysql/mariadb-native_10.7.3.bb rename to meta-oe/recipes-dbs/mysql/mariadb-native_10.7.4.bb diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 855f124834..3f246dc0a5 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -20,11 +20,10 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://mm_malloc.patch \ file://sys_futex.patch \ file://mariadb-openssl3.patch \ - file://clang-64bit-atomics.patch \ " SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch" -SRC_URI[sha256sum] = "da286919ffc9c913282202349709b6ba4ebcd342815e8dae0aa6b6bd8f515cd4" +SRC_URI[sha256sum] = "73dd9c9d325520f20ca5e0ef16f94b7be1146bed7e4a78e735c20daebf3a4173" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" diff --git a/meta-oe/recipes-dbs/mysql/mariadb/clang-64bit-atomics.patch b/meta-oe/recipes-dbs/mysql/mariadb/clang-64bit-atomics.patch deleted file mode 100644 index cdc2947b7b..0000000000 --- a/meta-oe/recipes-dbs/mysql/mariadb/clang-64bit-atomics.patch +++ /dev/null @@ -1,178 +0,0 @@ -Prevent Clang from emitting atomic libcalls - -Clang expects 8-byte alignment for some 64-bit atomic operations -in some 32-bit targets. Native instruction lock cmpxchg8b (for x86) -should only require 4-byte alignment. - -This patch tries to add 8-byte alignents to data needing atomic ops -which helps clang to not generate the libatomic calls but emit -builtins directly. - -Upstream-Status: Submitted[https://jira.mariadb.org/browse/MDEV-28162] -Signed-off-by: Khem Raj - ---- a/include/my_atomic.h -+++ b/include/my_atomic.h -@@ -115,6 +115,16 @@ - #include "atomic/gcc_builtins.h" - #endif - -+#include -+ -+# ifdef __GNUC__ -+typedef __attribute__((__aligned__(8))) int64 ATOMIC_I64; -+typedef __attribute__((__aligned__(8))) uint64 ATOMIC_U64; -+# else -+typedef int64 ATOMIC_I64; -+typedef uint64 ATOMIC_U64; -+# endif -+ - #if SIZEOF_LONG == 4 - #define my_atomic_addlong(A,B) my_atomic_add32((int32*) (A), (B)) - #define my_atomic_loadlong(A) my_atomic_load32((int32*) (A)) -@@ -123,12 +133,12 @@ - #define my_atomic_faslong(A,B) my_atomic_fas32((int32*) (A), (B)) - #define my_atomic_caslong(A,B,C) my_atomic_cas32((int32*) (A), (int32*) (B), (C)) - #else --#define my_atomic_addlong(A,B) my_atomic_add64((int64*) (A), (B)) --#define my_atomic_loadlong(A) my_atomic_load64((int64*) (A)) --#define my_atomic_loadlong_explicit(A,O) my_atomic_load64_explicit((int64*) (A), (O)) --#define my_atomic_storelong(A,B) my_atomic_store64((int64*) (A), (B)) --#define my_atomic_faslong(A,B) my_atomic_fas64((int64*) (A), (B)) --#define my_atomic_caslong(A,B,C) my_atomic_cas64((int64*) (A), (int64*) (B), (C)) -+#define my_atomic_addlong(A,B) my_atomic_add64((ATOMIC_I64*) (A), (B)) -+#define my_atomic_loadlong(A) my_atomic_load64((ATOMIC_I64*) (A)) -+#define my_atomic_loadlong_explicit(A,O) my_atomic_load64_explicit((ATOMIC_I64*) (A), (O)) -+#define my_atomic_storelong(A,B) my_atomic_store64((ATOMIC_I64*) (A), (B)) -+#define my_atomic_faslong(A,B) my_atomic_fas64((ATOMIC_I64*) (A), (B)) -+#define my_atomic_caslong(A,B,C) my_atomic_cas64((ATOMIC_I64*) (A), (ATOMIC_I64*) (B), (C)) - #endif - - #ifndef MY_MEMORY_ORDER_SEQ_CST ---- a/storage/perfschema/pfs_atomic.h -+++ b/storage/perfschema/pfs_atomic.h -@@ -41,7 +41,7 @@ public: - } - - /** Atomic load. */ -- static inline int64 load_64(int64 *ptr) -+ static inline int64 load_64(ATOMIC_I64 *ptr) - { - return my_atomic_load64(ptr); - } -@@ -53,9 +53,9 @@ public: - } - - /** Atomic load. */ -- static inline uint64 load_u64(uint64 *ptr) -+ static inline uint64 load_u64(ATOMIC_U64 *ptr) - { -- return (uint64) my_atomic_load64((int64*) ptr); -+ return (uint64) my_atomic_load64((ATOMIC_I64*) ptr); - } - - /** Atomic store. */ -@@ -65,7 +65,7 @@ public: - } - - /** Atomic store. */ -- static inline void store_64(int64 *ptr, int64 value) -+ static inline void store_64(ATOMIC_I64 *ptr, int64 value) - { - my_atomic_store64(ptr, value); - } -@@ -77,9 +77,9 @@ public: - } - - /** Atomic store. */ -- static inline void store_u64(uint64 *ptr, uint64 value) -+ static inline void store_u64(ATOMIC_U64 *ptr, uint64 value) - { -- my_atomic_store64((int64*) ptr, (int64) value); -+ my_atomic_store64((ATOMIC_I64*) ptr, (int64) value); - } - - /** Atomic add. */ -@@ -89,7 +89,7 @@ public: - } - - /** Atomic add. */ -- static inline int64 add_64(int64 *ptr, int64 value) -+ static inline int64 add_64(ATOMIC_I64 *ptr, int64 value) - { - return my_atomic_add64(ptr, value); - } -@@ -101,9 +101,9 @@ public: - } - - /** Atomic add. */ -- static inline uint64 add_u64(uint64 *ptr, uint64 value) -+ static inline uint64 add_u64(ATOMIC_U64 *ptr, uint64 value) - { -- return (uint64) my_atomic_add64((int64*) ptr, (int64) value); -+ return (uint64) my_atomic_add64((ATOMIC_I64*) ptr, (int64) value); - } - - /** Atomic compare and swap. */ -@@ -114,7 +114,7 @@ public: - } - - /** Atomic compare and swap. */ -- static inline bool cas_64(int64 *ptr, int64 *old_value, -+ static inline bool cas_64(ATOMIC_I64 *ptr, ATOMIC_I64 *old_value, - int64 new_value) - { - return my_atomic_cas64(ptr, old_value, new_value); -@@ -129,10 +129,10 @@ public: - } - - /** Atomic compare and swap. */ -- static inline bool cas_u64(uint64 *ptr, uint64 *old_value, -+ static inline bool cas_u64(ATOMIC_U64 *ptr, ATOMIC_U64 *old_value, - uint64 new_value) - { -- return my_atomic_cas64((int64*) ptr, (int64*) old_value, -+ return my_atomic_cas64((ATOMIC_I64*) ptr, (ATOMIC_I64*) old_value, - (uint64) new_value); - } - }; ---- a/sql/sql_class.h -+++ b/sql/sql_class.h -@@ -1049,7 +1049,7 @@ static inline void update_global_memory_ - (longlong) global_status_var.global_memory_used, - size)); - // workaround for gcc 4.2.4-1ubuntu4 -fPIE (from DEB_BUILD_HARDENING=1) -- int64 volatile * volatile ptr= &global_status_var.global_memory_used; -+ ATOMIC_I64 volatile * volatile ptr= &global_status_var.global_memory_used; - my_atomic_add64_explicit(ptr, size, MY_MEMORY_ORDER_RELAXED); - } - ---- a/storage/innobase/include/srv0mon.h -+++ b/storage/innobase/include/srv0mon.h -@@ -49,7 +49,7 @@ enum monitor_running_status { - typedef enum monitor_running_status monitor_running_t; - - /** Monitor counter value type */ --typedef int64_t mon_type_t; -+typedef ATOMIC_I64 mon_type_t; - - /** Two monitor structures are defined in this file. One is - "monitor_value_t" which contains dynamic counter values for each -@@ -568,7 +568,7 @@ Use MONITOR_INC if appropriate mutex pro - if (enabled) { \ - ib_uint64_t value; \ - value = my_atomic_add64_explicit( \ -- (int64*) &MONITOR_VALUE(monitor), 1, \ -+ (ATOMIC_I64*) &MONITOR_VALUE(monitor), 1, \ - MY_MEMORY_ORDER_RELAXED) + 1; \ - /* Note: This is not 100% accurate because of the \ - inherent race, we ignore it due to performance. */ \ -@@ -585,7 +585,7 @@ Use MONITOR_DEC if appropriate mutex pro - if (enabled) { \ - ib_uint64_t value; \ - value = my_atomic_add64_explicit( \ -- (int64*) &MONITOR_VALUE(monitor), -1, \ -+ (ATOMIC_I64*) &MONITOR_VALUE(monitor), -1, \ - MY_MEMORY_ORDER_RELAXED) - 1; \ - /* Note: This is not 100% accurate because of the \ - inherent race, we ignore it due to performance. */ \ diff --git a/meta-oe/recipes-dbs/mysql/mariadb_10.7.3.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.7.4.bb similarity index 100% rename from meta-oe/recipes-dbs/mysql/mariadb_10.7.3.bb rename to meta-oe/recipes-dbs/mysql/mariadb_10.7.4.bb From patchwork Fri Jun 3 19:17:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 8820 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 1BC11CCA482 for ; Fri, 3 Jun 2022 19:19:45 +0000 (UTC) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mx.groups.io with SMTP id smtpd.web08.2444.1654283977887153443 for ; Fri, 03 Jun 2022 12:19:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=BtxhkAc/; spf=pass (domain: gmail.com, ip: 209.85.214.181, mailfrom: akuster808@gmail.com) Received: by mail-pl1-f181.google.com with SMTP id h1so7441683plf.11 for ; Fri, 03 Jun 2022 12:19:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=M/mGKC7kB8d/5bnMLiSsRrULQY63aD0Cw/7keEWRqGc=; b=BtxhkAc/0YI4mnPi4fe030CV78UTVIWY7bRyXSTfAIfnAA4eKd0L494DnTG2/6PeYV s6Gpf6r1w0knlfnEE2IZKPaHxMqFlOF5lxgoeJAOaQDuovzSpCTxvlJXlgSF0u3nMN7R XfYLFnkuC7DL22LlsyKBMOAnJ8CweYambhoenJ4RIBv0u5o8YxUbKhbgmfUgN+HgbNYy 6WhJLyF5casPZqzAf3/icLqAfcBkoC87BeuuNGA2hiN7OtqUKzjavLjvLzp6oyJH6R7t 5l9Q95O8ge8HyIjRMlvivcqr1LIjB6NXMw67TTSYurT0ZM+GYOBz0wtkLQDiDLSG4lWg iLiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=M/mGKC7kB8d/5bnMLiSsRrULQY63aD0Cw/7keEWRqGc=; b=sP8hIqSl7f4hyfDBnxC4HUKmdF18onihVAhWezeyurS+CkqJljccHnXQ7/+lLJFuNW AWr0doM8tf2QpuPA0T7fkLcqGZT02nm+REi95PpKMbD11H5bkvQENZikqcXOi7rBq8vi TJ4NVX2f1pbj0/8g/PqBNr4sxvH595a5s/8vlqezkXnmz3xiijUU4nn4KmpaL9maFECO zdYTI7ckZsLUJTnFmBUebv1DtZjUMeguTiwYBB4pSJ4AO/dyLK0Gwk5VitPI/eECgD+g oMdePHbxxXahWKjdRNMNIWhE/uShnwFUqMqlLpaNRjhaGAmG9aZYtqrQPvACEWKzLbWq o+TQ== X-Gm-Message-State: AOAM533tXihgFYr+mgt0OhcETcWJymbNiHYgRntSZ1w3BNCqxACHlWJP YjOBU61OHvvwIYb40nXfQqVoVUmvsfY= X-Google-Smtp-Source: ABdhPJxvaGEMQ0QrLEiodTn2+lLgPm8e1ZKNu4hwnswab6myxGfCLZOIS0KO4XwXdbTrXR/YRx4hWg== X-Received: by 2002:a17:90a:c202:b0:1e2:e772:5f0a with SMTP id e2-20020a17090ac20200b001e2e7725f0amr12523923pjt.109.1654283977013; Fri, 03 Jun 2022 12:19:37 -0700 (PDT) Received: from keaua.caveonetworks.com (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id p2-20020a170902c70200b001617541c94fsm5770620plp.60.2022.06.03.12.19.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 12:19:36 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 10/20] mariadb: Fix i386 Clang builds Date: Fri, 3 Jun 2022 12:17:09 -0700 Message-Id: <4895c4d652b2abdef2d1b7a0407f7081e11b8f70.1654282423.git.akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 03 Jun 2022 19:19:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/97399 Signed-off-by: Armin Kuster Signed-off-by: Khem Raj (cherry picked from commit d59578a8170266d0d7e62c132495c0e06a17e0c9) Signed-off-by: Armin Kuster --- meta-oe/recipes-dbs/mysql/mariadb.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 3f246dc0a5..922373b633 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -77,6 +77,8 @@ LDFLAGS += " -pthread" BUILD_CFLAGS += "-fuse-ld=bfd" BUILD_CXXFLAGS += "-fuse-ld=bfd" +LDFLAGS:x86:toolchain-clang = "-latomic" + EXTRA_OECMAKE = "-DWITH_EMBEDDED_SERVER=ON \ -DWITH_JEMALLOC=no \ -DWITHOUT_TOKUDB=TRUE \ From patchwork Fri Jun 3 19:17:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 8817 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 0B50FCCA473 for ; Fri, 3 Jun 2022 19:19:45 +0000 (UTC) Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by mx.groups.io with SMTP id smtpd.web09.2394.1654283979414392827 for ; Fri, 03 Jun 2022 12:19:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=ptNeCLv7; spf=pass (domain: gmail.com, ip: 209.85.215.171, mailfrom: akuster808@gmail.com) Received: by mail-pg1-f171.google.com with SMTP id c14so7890256pgu.13 for ; Fri, 03 Jun 2022 12:19:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=OhTt5WW9yjS3f8+jqr/0j+HhzWq29/uKlly49zsNjpE=; b=ptNeCLv7/N+VUFmvmg/2WtomO5pCA7oUeoGaPxuwXsfP+IaOMoNUJod2PKrso905fW ZYdbxGdsGmoi34wn/X9VsfpgejUvi4PQSBjrIeh36Et0h5CjYFKS2mX/UDDZuNQijxkd E5sInAx5m9wT7QfnQDjraTyXzPTMGolrH/1jKfWONwdvfk+hTunrV6bQqT/pHl5SAo5f UTF9lGWq3GgQGiUGqP2d8sZmB+zjbooJynz2bO1jDKoHg+5Ch4toI2A9/65F7H5KcWZJ IDAsk2y5pjMJbK60tZLRF35ImfKeXuQR3ov9nuKr/HOhzTwlevNfvwT9YXeqcepWn7NK 6DHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OhTt5WW9yjS3f8+jqr/0j+HhzWq29/uKlly49zsNjpE=; b=oJG8stODFJ81GAWSHxqyqZDOMIowIUPcbiNFphoBHXOR8oqz9iXGkI4lNKkqJHDt4l hDDVKduXf/oJyi7rZW5HqsaToYOjIHKWFuJ6pBD6xmKMoqBWm0CtLgeduPXAvgvUtTUT FDjPtsrT28COIS2ZmHo7wTiHbC0Y/10afNR6scTYfH4SZZ21Ku5WQuXp1+X0SRsWRIJ0 3wwPePeAuWRTOYIHjNPEhzzWVGNdhl6SiS+utp1kbV8E56zDmN49+mOXC6lHpLyubYW2 E/Kc+mnYqPuTwO0UJSmfGVWHLDWmzUcC/vIQjchZjlkLpcgmNsojNnU1JDxw1bHPtmB4 qLGw== X-Gm-Message-State: AOAM531YduJ5tj9q9hRrlEA15WsR7TrpwpbUZ9hv2hO3OJuchNNK2Pe5 tlCoNWdDS5nbstxVU1RM11W59xH/CqY= X-Google-Smtp-Source: ABdhPJySPPpj9POa+bLG/z56gUR0YXGe/y9hiP1emm682l+O8wGi+McfqxGKlk1QnXhcPPkIeyBd5g== X-Received: by 2002:a63:2b49:0:b0:3fd:2d30:c6a6 with SMTP id r70-20020a632b49000000b003fd2d30c6a6mr3262246pgr.590.1654283978588; Fri, 03 Jun 2022 12:19:38 -0700 (PDT) Received: from keaua.caveonetworks.com (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id p2-20020a170902c70200b001617541c94fsm5770620plp.60.2022.06.03.12.19.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 12:19:37 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 11/20] unattended-upgrades: Disable auto-detecting modules Date: Fri, 3 Jun 2022 12:17:10 -0700 Message-Id: <442af705f0dc1d8211892bd0e1de5135fee6e1fa.1654282423.git.akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 03 Jun 2022 19:19:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/97400 From: Khem Raj Signed-off-by: Khem Raj (cherry picked from commit e7193af6c94436a577ebd472c6294eaef7c7cd15) Signed-off-by: Armin Kuster --- ...up.py-Disable-autodection-of-modules.patch | 28 +++++++++++++++++++ .../unattended-upgrades_2.6.bb | 1 + 2 files changed, 29 insertions(+) create mode 100644 meta-oe/recipes-devtools/unattended-upgrades/files/0001-setup.py-Disable-autodection-of-modules.patch diff --git a/meta-oe/recipes-devtools/unattended-upgrades/files/0001-setup.py-Disable-autodection-of-modules.patch b/meta-oe/recipes-devtools/unattended-upgrades/files/0001-setup.py-Disable-autodection-of-modules.patch new file mode 100644 index 0000000000..ec70dd6570 --- /dev/null +++ b/meta-oe/recipes-devtools/unattended-upgrades/files/0001-setup.py-Disable-autodection-of-modules.patch @@ -0,0 +1,28 @@ +From 8fd80ead718ffc53d7182b9df6f49974113ff8fc Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 23 May 2022 11:23:58 -0700 +Subject: [PATCH] setup.py: Disable autodection of modules + +This helps to fix build with latest setuptools + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + setup.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/setup.py b/setup.py +index 932bf01..fd5a092 100755 +--- a/setup.py ++++ b/setup.py +@@ -12,6 +12,7 @@ if __name__ == "__main__": + name='unattended-upgrades', + version='0.1', + scripts=['unattended-upgrade'], ++ py_modules=[], + data_files=[ + ('../etc/logrotate.d/', + ["data/logrotate.d/unattended-upgrades"]), +-- +2.36.1 + diff --git a/meta-oe/recipes-devtools/unattended-upgrades/unattended-upgrades_2.6.bb b/meta-oe/recipes-devtools/unattended-upgrades/unattended-upgrades_2.6.bb index 1ec205f8b8..d4f5b8d0cb 100644 --- a/meta-oe/recipes-devtools/unattended-upgrades/unattended-upgrades_2.6.bb +++ b/meta-oe/recipes-devtools/unattended-upgrades/unattended-upgrades_2.6.bb @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ SRC_URI = "git://github.com/mvo5/unattended-upgrades.git;protocol=https;branch=master \ file://0001-unattended-upgrade-Remove-distro_info-usage-to-check.patch \ + file://0001-setup.py-Disable-autodection-of-modules.patch \ " SRCREV = "c6db6fad26a2b83ba301b52ff5dee98cef7558ca" From patchwork Fri Jun 3 19:17:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 8819 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 0DBFFC3F2D4 for ; Fri, 3 Jun 2022 19:19:45 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web09.2395.1654283980548393807 for ; Fri, 03 Jun 2022 12:19:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=lBRtR51w; spf=pass (domain: gmail.com, ip: 209.85.210.169, mailfrom: akuster808@gmail.com) Received: by mail-pf1-f169.google.com with SMTP id 187so7839929pfu.9 for ; Fri, 03 Jun 2022 12:19:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=+ezPlIzuclRUlH1mbBS7e6ZqOJm+RYkYd3AqAM8GiEw=; b=lBRtR51wIheRz6LhDT4Hgp3jlPU/l9U0p4gCMIITivj3RxPZq/Wo0m9tS809phneM/ mR/nQ1/YPYfg/rRrc13T6znpSTJc0vtOAWUzSLRuU1l2SW/oXCSfRvB1tU6++HpQUP+1 fUBAU6FSOdrgYB3wNJmgUfUKM3c/R8+bugdcRuNKvUR0IyKx4iClhoniOlrAM8OPI3Cd A0E3IPmgsxhox6JvpbabH/t3Tg4TkTEH4l+BfzX3ohq2J9wFX9BfXfYM690yVYWKIeCG E6ZxAkDmdIy+g+8J8OHsPCL9lF/QeUu5dONDKtJAkAIrLQDMl/Uflf6hc5sRLy2oH/UC Gorw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+ezPlIzuclRUlH1mbBS7e6ZqOJm+RYkYd3AqAM8GiEw=; b=X1LrmogBjyB5BRSppCZ/QiwwnNDSqQ/J7Mk5DKtNJuyLx//wnp+KFTsAFix9SVBnMv 1Pp2fSGMB8qT53ibyC8U7uSxWccSuOu+WFKMnBMqVde1GAzFjVtMEidkbWpOSXCX0lyF PXYtKQVcIEC2WDy9C7BMotC9E3uFsIFqDUnOgxyz1+Oq/LuTmGORqfpCxq5gv+yC5WaE qddYG8jtYXhMZ/d/yhmiMvD96yRpJ1to7DfgI5dlc9rCeLtP8s2PiRE3Bic8WSe33SKA 5YEHPwTHI61xuxpdjhfuhkUw3n/SKYSLZgQdKGrFdiYNA5KnyQkeScstp9INTwgBG+WT Mpkw== X-Gm-Message-State: AOAM533QU72vCZXtEGQ13oBu0Dr3/+0KwkPG1X/MXC+i8aO4F/ZoYD6b qozjCf/OwewZ1kAKETK6bGAT4tRa7m4= X-Google-Smtp-Source: ABdhPJwoWoLlylW/aaAEd3KMTKJiTpGa+Yy43fO4UqRJFeFVLHQmtvZ1eFiyRwo90FpkGfRP2TJEuw== X-Received: by 2002:a63:8443:0:b0:3fc:a29a:49ae with SMTP id k64-20020a638443000000b003fca29a49aemr10255053pgd.592.1654283979792; Fri, 03 Jun 2022 12:19:39 -0700 (PDT) Received: from keaua.caveonetworks.com (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id p2-20020a170902c70200b001617541c94fsm5770620plp.60.2022.06.03.12.19.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 12:19:39 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 12/20] libportal: add distro features check Date: Fri, 3 Jun 2022 12:17:11 -0700 Message-Id: <79e28d1c8748e6ac1044d01fcf0e17daedf137e0.1654282423.git.akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 03 Jun 2022 19:19:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/97401 From: Kai Kang Add distro features check for libportal because it depends on gtk+3 which requires one of ${GTK3DISTROFEATURES}. Signed-off-by: Kai Kang Signed-off-by: Khem Raj (cherry picked from commit 0baa7793e0df81a21a130e6f0513f27b322cd4ad) Signed-off-by: Armin Kuster --- meta-gnome/recipes-gnome/libportal/libportal_0.6.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-gnome/recipes-gnome/libportal/libportal_0.6.bb b/meta-gnome/recipes-gnome/libportal/libportal_0.6.bb index ec728d78b9..9784f04818 100644 --- a/meta-gnome/recipes-gnome/libportal/libportal_0.6.bb +++ b/meta-gnome/recipes-gnome/libportal/libportal_0.6.bb @@ -10,7 +10,9 @@ SRC_URI = "git://github.com/flatpak/${BPN}.git;protocol=https;branch=main" SRCREV = "13df0b887a7eb7b0f9b14069561a41f62e813155" S = "${WORKDIR}/git" -inherit meson gtk-doc gobject-introspection +inherit meson gtk-doc gobject-introspection features_check + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" DEPENDS += "glib-2.0 glib-2.0-native gtk+3" From patchwork Fri Jun 3 19:17:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 8815 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 0C1CDCCA480 for ; Fri, 3 Jun 2022 19:19:45 +0000 (UTC) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mx.groups.io with SMTP id smtpd.web10.2397.1654283971622849270 for ; Fri, 03 Jun 2022 12:19:41 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=oMxWub5r; spf=pass (domain: gmail.com, ip: 209.85.216.41, mailfrom: akuster808@gmail.com) Received: by mail-pj1-f41.google.com with SMTP id gd1so8047066pjb.2 for ; Fri, 03 Jun 2022 12:19:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=cxsup3dQO3hJ5AQpuleqim5bDu7/fffR9QWGt8CMFcU=; b=oMxWub5r/CLSZoBgd5Xth7Z/Y3VdaKn42fHwi77wBd++abaUttb8sH0u+3bGE4hsYq huWpk1/pJ21YmummtbYH2sdEywa0wwPUQIk4qIBo8LaxBDK4Efd0K6DxL82BAi/bfvH/ utXre84liblAIskBsrJyCeV/9GAYNvIBnQfrpC+1+oy8XWeHey/SdrDfrgne2iVMG4r6 hqA0vWeG69EZAfXnu4THFvA36B/ZniuvKlzBkDZExY5evD+Ndk2KVenCocFG4Ty0vsnG sbGeQQ6Xj8VaNNCdPoVVUEC/0fIj6LdujzxBJeKfn/GCF4u0vcKm7af2kZnTNV3BU3W9 kmoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cxsup3dQO3hJ5AQpuleqim5bDu7/fffR9QWGt8CMFcU=; b=6d0YMCQ+OWYuzUsVxuD3Z+QIGQDnOTbGGOYLiuDQQezQOIJN2HT4BR4Y4BEUTahNsD /vubc8LHJVxRZQ4l3UQFstY8si+e20a3gji2NMam6LH2RC+zeMNfb/xc+HixXxe/ohch 7E5pBVG7Mo96ns/aecJzQEaG4FZIsYImSoLs30a1jHJJcOKxTWBftqPI4h5BznJFl4zM cpEgrRrsVT/bfC00Qmbxl7Hk0St5fYJ9IV0XiULZAHMpRC63VT3XoMIV/kcUgLjIZLKy Xqgs3uvTB5nJXLt+NK5tgGTuxHeAyqfORejhotdcGgUh4S0kDMhryXyVABIidIUJAY2P O99A== X-Gm-Message-State: AOAM5335jA4EEzl5HEL1dGXDkxFPFV5TZBCFa2rU6XjreNSGB0J16Zgf eg79ytdwtW51SZD0PmYaG7h9w7zEnfg= X-Google-Smtp-Source: ABdhPJw+slUve1r32L0GWQnv3tjGNhaSaQG/JiURh8AfMF6fEnU6+th9spP7+InOePL1XkNgK36ztQ== X-Received: by 2002:a17:90b:4c44:b0:1e0:2400:1c8a with SMTP id np4-20020a17090b4c4400b001e024001c8amr47276038pjb.232.1654283981013; Fri, 03 Jun 2022 12:19:41 -0700 (PDT) Received: from keaua.caveonetworks.com (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id p2-20020a170902c70200b001617541c94fsm5770620plp.60.2022.06.03.12.19.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 12:19:40 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 13/20] graphviz: rrecommends on liberation-fonts Date: Fri, 3 Jun 2022 12:17:12 -0700 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 03 Jun 2022 19:19:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/97402 From: Kai Kang There will be tofos in output pictures without any font, so make graphviz rrecommends on liberation-fonts. Signed-off-by: Kai Kang Signed-off-by: Khem Raj (cherry picked from commit 0e036cb1bc0c272b27cbd7e42eacbae48edc685e) Signed-off-by: Armin Kuster --- meta-oe/recipes-graphics/graphviz/graphviz_2.50.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-graphics/graphviz/graphviz_2.50.0.bb b/meta-oe/recipes-graphics/graphviz/graphviz_2.50.0.bb index a9258e979a..aa597cd8e4 100644 --- a/meta-oe/recipes-graphics/graphviz/graphviz_2.50.0.bb +++ b/meta-oe/recipes-graphics/graphviz/graphviz_2.50.0.bb @@ -114,4 +114,6 @@ INSANE_SKIP:${PN}-python = "dev-so" FILES_SOLIBSDEV:append = " ${libdir}/graphviz/lib*${SOLIBSDEV}" +RRECOMMENDS:${PN} = "liberation-fonts" + BBCLASSEXTEND = "native nativesdk" From patchwork Fri Jun 3 19:17:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 8814 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 F2F05CCA47C for ; Fri, 3 Jun 2022 19:19:44 +0000 (UTC) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mx.groups.io with SMTP id smtpd.web08.2441.1654283966112252072 for ; Fri, 03 Jun 2022 12:19:43 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=VXxqdfHL; spf=pass (domain: gmail.com, ip: 209.85.210.182, mailfrom: akuster808@gmail.com) Received: by mail-pf1-f182.google.com with SMTP id y196so7841675pfb.6 for ; Fri, 03 Jun 2022 12:19:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=425SiNCK5WjF39f61/vd7ybE54LQojrq7R2eKYw04Cw=; b=VXxqdfHLXedg6wa+ftTm8NMv8ZHWILw5/MEWJcMhJ+7nPVjHhHooSYmkhh3FIaVWOT cqjrS5S25n2ilWoA6dDnn07gyh+csR4kL36+JozfULW+mXoaEv6V9xgyGnANFxkMOLFS um41QADEr2CY6lHDDLSzbD4fXlhwZclfnIBUPVXruxs491qmjzNPEMGAA2cM8r2iILSE yWLC4cebxJeqy4znQZ72lturcqgqVSdXYJvXsPoMv0+y3p4Lvhs3Ps0t4II7aderjjca eRnRa46TQjDyf/JlYsQCmQpNqPwFt6lItNqtIa+xx3f07+Fqc69uzDOckbWB7bJ9kI6w 5hsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=425SiNCK5WjF39f61/vd7ybE54LQojrq7R2eKYw04Cw=; b=KMY5msoYuIJCf8tfz1WtqiSIRdkQ/rLaYiLjUidYhc0bqjYmmRxgjIRfxPBWsunpQE CuMZgEEZvImTsHdUxE+bqfDlYhBSG57mUzkrsyzrAZN59s3iniu4eTkBLfcEi3KU2qrZ +yZYL+cgEcObjM7HSuA8vWzDhJRvandkdbf6u5hj4ok5B+i5vPQsjtYliYjsWl4A364k Q4hf383mXCd0f/oCRqKtVqmY6W+lPsv2hwK3P4VSLKXYNiEW+u1kZVpG8gy/I+H6Ostl oW0YDlc3NrT7bD79wIq+wIGyDakiPUXKNVasgBa4ZXOrAXD7BmJv7TkGsM08F9THbTj/ /UnA== X-Gm-Message-State: AOAM532HN71mQgviuAW2D17uo8IW0QThvuIi/vT44wrzgALKBWc6BZWz d9E9Pub7G+U7DwOE7Yw8uhoEq3GupY4= X-Google-Smtp-Source: ABdhPJxLegx6H3fvg4DSRVE3pyqovBi/l7aUKkeYB0O77oy6m7EzCgllfqiHDdoot4w3mVcVaG+SvQ== X-Received: by 2002:a63:ce58:0:b0:3fc:6966:b614 with SMTP id r24-20020a63ce58000000b003fc6966b614mr10353852pgi.234.1654283982211; Fri, 03 Jun 2022 12:19:42 -0700 (PDT) Received: from keaua.caveonetworks.com (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id p2-20020a170902c70200b001617541c94fsm5770620plp.60.2022.06.03.12.19.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 12:19:41 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 14/20] conntrack-tools: fix postinst script Date: Fri, 3 Jun 2022 12:17:13 -0700 Message-Id: <16f08eb5aafc2851ab6a78fa72f2c2890a2d85d1.1654282423.git.akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 03 Jun 2022 19:19:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/97403 From: Adrian Freihofer Fix error caused by postinst script of conntrack-tools: do_rootfs: Postinstall scriptlets of ['conntrack-tools'] have failed... Configuring ... rootfs//var/lib/opkg/info/conntrack-tools.postinst: line 2: setcap: command not found conntrack-tools.postinst returned 127, marking as unpacked only... Signed-off-by: Adrian Freihofer Signed-off-by: Khem Raj (cherry picked from commit 55fd9844830bc835c2bf8def9406edc9e2df0e16) Signed-off-by: Armin Kuster --- .../recipes-filter/conntrack-tools/conntrack-tools_1.4.6.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.6.bb b/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.6.bb index 50f7ced88d..8f57e823b8 100644 --- a/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.6.bb +++ b/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.6.bb @@ -37,3 +37,4 @@ do_install:append() { pkg_postinst:${PN} () { setcap cap_net_admin+ep "$D/${sbindir}/conntrack" } +PACKAGE_WRITE_DEPS += "libcap-native" From patchwork Fri Jun 3 19:17:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 8813 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 F21B1C433EF for ; Fri, 3 Jun 2022 19:19:44 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web11.2361.1654283984540518298 for ; Fri, 03 Jun 2022 12:19:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=JnPt9NgI; spf=pass (domain: gmail.com, ip: 209.85.214.175, mailfrom: akuster808@gmail.com) Received: by mail-pl1-f175.google.com with SMTP id n18so7471496plg.5 for ; Fri, 03 Jun 2022 12:19:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Xl5hdlhv6YZ4/G5BekzzzhExDxd5EGwgy58Z7aoA4pQ=; b=JnPt9NgIlXYLTO9uub3b04VVvanUdHT7TzyYvoxZjtqcKSytwDveJ8dcTqwS1grBdN wNGDlkDJ2E0wS6SiMN5nHCDT0yAsbMosvL2e4r26Vl+ekrH70qiFmCfCaCfRumRH7Qnf t5PR6cKL4vLjGR2om9Z8+WyEXXoHRY2uNktfhoI9UceWdcKDnts6ZD8duP9CjOdfSnkt IoWQcQf+VQY01TLDZuVexG0a9cn4aoEyQHma40rBkvNyN9P4Rqu/H6R1HTfldj+NCEQJ UVWdnC7IP7AqUqSZnhEzeHKuWPwRI+uSIQo9UbQmnffawir2Eb469725/mfMDBukZblt 4rmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Xl5hdlhv6YZ4/G5BekzzzhExDxd5EGwgy58Z7aoA4pQ=; b=HIo3uF8ED6jGHKn8jEyr88sCB/C45q92nIlCQIyPuJhcIjzs9KXWX/Lfo4k6HJVHJi GoxBIAnSsDzePj5e8ax7HzpNVoB4XbKm48obFSTikHdQHmEVzUsD9jgTcpKUhJgHU0c6 VeszK54rSWXuH/6yDYcl5RKFV/hf7Y7pFaOQzcnmrMCF3eMM927RriSOd6IQS/c9YauP 492lsLnP4shEH3SJmtMDq/H+9bhyI1V9/Oxd0AECvlABm3S8L4QzzP5zLO87WWx4dLqM p1pcDjf+MFIJg9LVNFtsi/a5odinPBbypMdQFZWwlBerbFqaCENwsM4f9stSi2ANqVTf gZTA== X-Gm-Message-State: AOAM532RXOeVKUINobbA/OOLLDAM3ZRUPtSaAWzRuAs/EXzYke88qieV tPxcT4Zy8bEoxkJk9g+iVh9vdmBqJ/I= X-Google-Smtp-Source: ABdhPJzytUjeKLvRAb5qz2/ighOlWt70KjbLwNwVlUYtXmAJP0UXZbEzmq8MtFkioaswXN3FA0LElA== X-Received: by 2002:a17:90a:5a48:b0:1e3:4180:a218 with SMTP id m8-20020a17090a5a4800b001e34180a218mr21179254pji.182.1654283983779; Fri, 03 Jun 2022 12:19:43 -0700 (PDT) Received: from keaua.caveonetworks.com (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id p2-20020a170902c70200b001617541c94fsm5770620plp.60.2022.06.03.12.19.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 12:19:42 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 15/20] sdbus-c++: Link with libatomic on mips/ppc32 Date: Fri, 3 Jun 2022 12:17:14 -0700 Message-Id: <9a2029553030f3da607c209b50581274e9e7335e.1654282423.git.akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 03 Jun 2022 19:19:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/97404 From: Khem Raj Signed-off-by: Khem Raj Cc: Gianfranco Costamagna (cherry picked from commit 366663527aa5efd4e43a62919edcdf9caf14e77c) Signed-off-by: Armin Kuster --- meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.0.0.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.0.0.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.0.0.bb index 39f0b4c560..e1a7033a20 100644 --- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.0.0.bb +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.0.0.bb @@ -27,6 +27,11 @@ EXTRA_OECMAKE = "-DBUILD_CODE_GEN=OFF \ S = "${WORKDIR}/git" +# Link libatomic on architectures without 64bit atomics fixes +# libsdbus-c++.so.1.1.0: undefined reference to `__atomic_load_8' +LDFLAGS:append:mips = " -Wl,--no-as-needed -latomic -Wl,--as-needed" +LDFLAGS:append:powerpc = " -Wl,--no-as-needed -latomic -Wl,--as-needed" + do_install:append() { if ! ${@bb.utils.contains('PTEST_ENABLED', '1', 'true', 'false', d)}; then rm -rf ${D}${sysconfdir}/dbus-1 From patchwork Fri Jun 3 19:17:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 8821 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 10883C433EF for ; Fri, 3 Jun 2022 19:19:55 +0000 (UTC) Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by mx.groups.io with SMTP id smtpd.web11.2362.1654283985679368602 for ; Fri, 03 Jun 2022 12:19:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=L/9SDXQl; spf=pass (domain: gmail.com, ip: 209.85.215.173, mailfrom: akuster808@gmail.com) Received: by mail-pg1-f173.google.com with SMTP id u4so4959149pgk.11 for ; Fri, 03 Jun 2022 12:19:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=FY6GLg7RZlSXF57jlHOE1iXuCAi2iRz+ceX2YnmuU8s=; b=L/9SDXQl31vV2nwACFSenx9dCHngAQ3ZRaAQRdMblLHAbdwkib6/OMl5WRrFq3ZSDO 9/9QFFW+m1cISHx/w7mffOgQtJTYyUdwmlNNBSSnKMXQ2jOGoq3m2Et9Axyzdc0JDn5k 6pM3H/qCnap36afrCDW+HqpglXOWvYTNhp9HTn0iSmAKHshTvL8IShEOJB/7IVKdLqA9 JkLisCWj0Uy+Bp/hr9t1xGqrPIaBm14izI4EJY8IkWO/HJpHekdUXwdyoAm2fu6WZH7U JdbE1OmdXo2sUTcdJJaAqQjiRbageZHX20iETn3WaPCDI0c3rSxMdk6YVbgsubU7RqnC qGag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FY6GLg7RZlSXF57jlHOE1iXuCAi2iRz+ceX2YnmuU8s=; b=jTymmvylHdRomoAUl4Rie/mvrop/uRba+jUnbepIbtbqjgVXRdZKukuyL22UGnI6ac VGWPbxVd34BxFkevlYEuP8o1RkQ5lmltkXmK/2H+H3GwLmHJ2DbUW8jLlmyTyMtRqOig utANahFoc0Ff8TJKV3xefUy5Yx/VyM2RGYdhrv21OhKlZbOzuEUFhpL9z0ia8ftGFwnm 3RR29osqHIVmcY+fDCB+zEPyd1hFpsjxxIXt+m2lYrW56b6EDkTYvIQdubQ+/NjnSTmx lL21bpIXg55e7Fcdnd3ZLNsS+UDPBa+SjVjAVyXW1Jw7828Q/GJngmCNssOzWL6dCyA8 v+nA== X-Gm-Message-State: AOAM531wVY3vNdV4/YvXoAsPF3E2T3Ju5VeAqRGH9AmjBWbaMAgeO4nB 82g8m7O2I8+Ko4rebTSPyhAV+D9Qx00= X-Google-Smtp-Source: ABdhPJxv2D0feL9yb+7+Wr980RsOljEpAygaw9bbs6ixmyice7KLjHvsSUNtlaNYL8qbqEUyt64V6g== X-Received: by 2002:a65:4506:0:b0:3db:48b1:9ff5 with SMTP id n6-20020a654506000000b003db48b19ff5mr10421990pgq.89.1654283984865; Fri, 03 Jun 2022 12:19:44 -0700 (PDT) Received: from keaua.caveonetworks.com (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id p2-20020a170902c70200b001617541c94fsm5770620plp.60.2022.06.03.12.19.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 12:19:44 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 16/20] sdbus-c++: Link with libatomic for rv32 Date: Fri, 3 Jun 2022 12:17:15 -0700 Message-Id: <99496d2b3cbe44d86cc7c899a0c486f9ea4c3b3a.1654282423.git.akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 03 Jun 2022 19:19:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/97405 From: Khem Raj Fixes libsdbus-c++.so.1.1.0: undefined reference to `__atomic_load_8' Signed-off-by: Khem Raj (cherry picked from commit 5029571d689f80bfa5c3a391f088d1484c61d583) Signed-off-by: Armin Kuster --- meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.0.0.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.0.0.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.0.0.bb index e1a7033a20..76fd6b65b1 100644 --- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.0.0.bb +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.0.0.bb @@ -31,6 +31,7 @@ S = "${WORKDIR}/git" # libsdbus-c++.so.1.1.0: undefined reference to `__atomic_load_8' LDFLAGS:append:mips = " -Wl,--no-as-needed -latomic -Wl,--as-needed" LDFLAGS:append:powerpc = " -Wl,--no-as-needed -latomic -Wl,--as-needed" +LDFLAGS:append:riscv32 = " -Wl,--no-as-needed -latomic -Wl,--as-needed" do_install:append() { if ! ${@bb.utils.contains('PTEST_ENABLED', '1', 'true', 'false', d)}; then From patchwork Fri Jun 3 19:17:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 8824 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 1BC2ECCA47E for ; Fri, 3 Jun 2022 19:19:55 +0000 (UTC) Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by mx.groups.io with SMTP id smtpd.web11.2362.1654283985679368602 for ; Fri, 03 Jun 2022 12:19:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=QbMiwJgJ; spf=pass (domain: gmail.com, ip: 209.85.215.173, mailfrom: akuster808@gmail.com) Received: by mail-pg1-f173.google.com with SMTP id u4so4959149pgk.11 for ; Fri, 03 Jun 2022 12:19:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=jfu9L/PzvIN2tCX0sZ9ZyBlLe+1PrR2fRoTJjSsdUxA=; b=QbMiwJgJZ5AMffre5QuohltYcVw3RxR1pC4sAwD9ewuIOnf6IY7Pg7P5xaMg0RHGqJ 3iMFliUqQr9fqMEvmkTHvVBSrspaAhJAhWdhZVPC7NaihJ+eaQBGuv4JC+miRnQiBDwb cXTOILjHt1HgTkNe6hqcOPK5YnjPi2uHYUnZ9G9zbv5sx5Fz38Nvd/egmDgX3X/PXzFy 1OISl4Y0+T9wpjEmcIHcHQHvIm3lCI6J2oP+6SU0HmNFB+BnL+d1sP4DQ4DpaLWj9Z9G S7MFegqs0Mi+riUdoAXrD82DUBtoQqOemYkscjEBRyM+kjDjAy4CEjC+/jvjZun+Rw3i 8x4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jfu9L/PzvIN2tCX0sZ9ZyBlLe+1PrR2fRoTJjSsdUxA=; b=BjPN6gPK7Wp9Cjv/Q2G7UOgX3NAsys6XBP+UaWJWwD4Yf17teZSmFVfwy2kr5MIz28 9SrrEgj4tlPyCPtlihllQWlwOtc0uQa0brFUF5nV7sxb3gl7rPrqY/WrbWpCIrLjnCmD 2TCc3VkAEp7B+AFDn4Tj9AHLOQ+djNsA46HvMvcAm+GCkjbNprDKJuL5+uyh7ehnDPOI n02XqHJ988z0hhuYjAE6HPvPpSKVmsf2Y4S6uBY5Xf66JyJjJjlmSXLVdrVtY/Y6ZN8R KDKeKxe3Ykmcmc+v8uHzk2Xsea/lOiYpnQrGVFsj2TLNZDAuac08PYcWmP5uHtqp9P6M Y/rA== X-Gm-Message-State: AOAM531jw+gYP0kI06HNnnnmDX5kBRTSnakjZ8Ise5296H3gqvSFZwOj qsZeQOFBr0rb6KzI8DG3hIo5EdGkNbc= X-Google-Smtp-Source: ABdhPJz/b+jPk/qgh0WMcNi7jNssOI2NXPENIK1ho8FHzUlTqtERZgQjFxMgeNYswSARzEtXPkmWjA== X-Received: by 2002:a63:d314:0:b0:3fc:7054:bf54 with SMTP id b20-20020a63d314000000b003fc7054bf54mr10040170pgg.615.1654283986017; Fri, 03 Jun 2022 12:19:46 -0700 (PDT) Received: from keaua.caveonetworks.com (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id p2-20020a170902c70200b001617541c94fsm5770620plp.60.2022.06.03.12.19.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 12:19:45 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 17/20] sdbus-c++-libsystemd: Fix patch fuzz Date: Fri, 3 Jun 2022 12:17:16 -0700 Message-Id: <18a923d20b1885f508dfed83daaf5a8fe0d45de9.1654282423.git.akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 03 Jun 2022 19:19:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/97406 From: Khem Raj Signed-off-by: Khem Raj (cherry picked from commit 397f4f054fd3600f7305055c724607973f5f5511) Signed-off-by: Armin Kuster --- .../0005-src-basic-missing.h-check-for-missing-strndupa.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch index 36545c2f60..005ef022fd 100644 --- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch @@ -322,8 +322,8 @@ Signed-off-by: Luca Boccassi --- a/src/libsystemd/sd-bus/bus-objects.c +++ b/src/libsystemd/sd-bus/bus-objects.c -@@ -12,6 +12,7 @@ - #include "set.h" +@@ -11,6 +11,7 @@ + #include "missing_capability.h" #include "string-util.h" #include "strv.h" +#include "missing_stdlib.h" From patchwork Fri Jun 3 19:17:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 8823 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 1BC90CCA480 for ; Fri, 3 Jun 2022 19:19:55 +0000 (UTC) Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by mx.groups.io with SMTP id smtpd.web09.2394.1654283979414392827 for ; Fri, 03 Jun 2022 12:19:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=kVsQ2oTH; spf=pass (domain: gmail.com, ip: 209.85.215.171, mailfrom: akuster808@gmail.com) Received: by mail-pg1-f171.google.com with SMTP id c14so7890256pgu.13 for ; Fri, 03 Jun 2022 12:19:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=YITjDE4FRC/K+rIWtzkdxnu3NvdXuXhCzL2fuo+Iuc8=; b=kVsQ2oTHKsJWCIcGJ3pkpzbjpT77s69iRn6vgLXb+dqJ24n2IKur8cYRM5dpCPlFaz rsgBd8ZWxDSixhvPMP4lBkhP4d5t481Epq+0+bEuk+ze+TqNOz/ih49IZc2E5J3CYngx UjwMKGkIYrk66tGR3XUwKsEmPYj8y+vHRM9gkZLAu52QdPhHC1Op91qSH7VAtIgN9Vnl cDS4UwXnCu6cAOc9/xObuAyAEJ1DvDkRIrP/O1/XA5d/+JFp0lohX6ffBGdhrlGd5eCW /PkMJwFzIXWPLKK34UNEjushEOXiRGWeJfAGnnVCt1wSPONI90mgSfP8exh8VnbcDGFR fE8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YITjDE4FRC/K+rIWtzkdxnu3NvdXuXhCzL2fuo+Iuc8=; b=ZUV2KUYmwlY9hAXpqeXVGT7vSMe+EaXnCPGzvFGtbsyMXwWO4tKLO54Fabbv/MyANn ysW1pea8fW2uteX7HIyZT/LzdKNyHO0oHCieAjrQZwsKEwhIKl/oHcwBOvhAKXWVY+/c e7u8zz6ThqvyE95z6KNrJxZb84ebMPdewIDL+6m+b3HywhLXr6abFbOE46JtJATeqCU8 aJVFY+QI1Cdos5tdGF6OC+Yz3FciNtkZWbb1/2//+2a/edt2YQpg4H8+KFqr8KrrrbPW vsX12TL3HuW7dTyI4/wUeduubpMkMUX8XfPKZyfdnCfp9We3Vb2yOdo7Skl3WZ28g+hp Gugw== X-Gm-Message-State: AOAM531f7V7vKNKgSiCFXuVyIw501WSy4OmEyVvpLV5Z1al50pV5TfzF ZyzDkBUJPqk1+fMQ8lW8D1wzXBwE8Y4= X-Google-Smtp-Source: ABdhPJy1y4n/R6Hl91VVT06yhf5S92fCeysGv2cYLH05/QlSS+f6UepBNm3hTHBZPCZ5KM3XIaNSnQ== X-Received: by 2002:a65:6d89:0:b0:3fa:5523:440e with SMTP id bc9-20020a656d89000000b003fa5523440emr10290299pgb.318.1654283987388; Fri, 03 Jun 2022 12:19:47 -0700 (PDT) Received: from keaua.caveonetworks.com (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id p2-20020a170902c70200b001617541c94fsm5770620plp.60.2022.06.03.12.19.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 12:19:46 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 18/20] python3-speedtest-cli: fix RDEPENDS Date: Fri, 3 Jun 2022 12:17:17 -0700 Message-Id: <17da928a8de487a8c7f7c41eb8db7f8f00aa1564.1654282423.git.akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 03 Jun 2022 19:19:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/97407 From: Bartosz Golaszewski There are packages missing in RDEPENDS needed to run speedtest-cli. Add them and use += for the assignment as we don't know what inherited classes may have added. Signed-off-by: Bartosz Golaszewski Signed-off-by: Khem Raj (cherry picked from commit 3413265185dd199da0f54ef6d83abca2c8ec9b50) Signed-off-by: Armin Kuster --- .../recipes-devtools/python/python3-speedtest-cli_2.1.3.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta-python/recipes-devtools/python/python3-speedtest-cli_2.1.3.bb b/meta-python/recipes-devtools/python/python3-speedtest-cli_2.1.3.bb index 06d98cbe1e..472113b059 100644 --- a/meta-python/recipes-devtools/python/python3-speedtest-cli_2.1.3.bb +++ b/meta-python/recipes-devtools/python/python3-speedtest-cli_2.1.3.bb @@ -7,4 +7,8 @@ SRC_URI[sha256sum] = "5e2773233cedb5fa3d8120eb7f97bcc4974b5221b254d33ff16e2f1d41 inherit pypi setuptools3 -RDEPENDS:${PN} = "${PYTHON_PN}-misc" +RDEPENDS:${PN} += " \ + python3-misc \ + python3-threading \ + python3-xml \ +" From patchwork Fri Jun 3 19:17:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 8825 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 104FDC43334 for ; Fri, 3 Jun 2022 19:19:55 +0000 (UTC) Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by mx.groups.io with SMTP id smtpd.web12.2413.1654283989749368446 for ; Fri, 03 Jun 2022 12:19:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=WRqci4Oz; spf=pass (domain: gmail.com, ip: 209.85.215.169, mailfrom: akuster808@gmail.com) Received: by mail-pg1-f169.google.com with SMTP id g184so7945808pgc.1 for ; Fri, 03 Jun 2022 12:19:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=SdR19qocfp0tYoWxdAqvGqdPRIK9CqfVWzNBQJxkJr8=; b=WRqci4OzI7sraNeT5mA/vbFc1dssQodzlhZFbT6MCrsU25IRuTVHqnJnFp15CXkhl7 zpHqDRvtS0Jwe6taTT47pPPEnG+50P4KWvZBkyq3aBzPLU3jYg2nyj4AW5tQd1v7AJLb RegmEQxYYZWQXF92j4K+UeV5CzBzLH1lWcfcvyXjvpoP/eViP7QykOdiDPdF52ZLifAd 6R/s2fDKlSJ5G3D07eLLQ5LMg5QenWjHnUa6MqEWGpphZz6VwNZag0C9XR8YyTWkAzLz Ge3LsAQforMzpWzDMzV+KnzgLXxqkAYh2ZBkkm5qso2yReoG3pSj5l56Pk0jyRrsQLm0 Feww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SdR19qocfp0tYoWxdAqvGqdPRIK9CqfVWzNBQJxkJr8=; b=NtlkH0ck4pxHR+rTfeefmiJMjj7ijSNdD8RqWQIeGD5oqfbYskWknHxZvAwby/EBgC mhyfVa8LZpcRSBQ8wZVZNPV+rnBoHA6OBacT/RbcHUt37eqZdKO+PW3Y3WNBfEJpGLIT 2ZucUBUj83qpX3e7URZHAdFp0ZE5m2fPU99zkBsQD3RmEMX1dRk4UPemWruL4/5RqRXZ K8Nb7F1cDQN8pQT10mSR9OFGA4pvpFE1P5St4BGI1iU/LmngWEcTMcWYeC0SH4CAynOO vxvCMl9HcENIXqNwxkpn4f+N3R880M55KAuVakhAcuMTZ4GodGcI7KnOCuQG9weqpJ6p pcgQ== X-Gm-Message-State: AOAM533d/gFLC7rnIkzdCEAhNVGR1G7jyEH8kMQkp8IwaH37GJLLXdkS EJfJB3nzm9R50SDqxdS2QRspVZinFGM= X-Google-Smtp-Source: ABdhPJwHUDUXszC2wBzSb6miwqkPimotbGbfWinnXcffNAeGjITi36HyRVFa92kx+WAla2ltlZynAw== X-Received: by 2002:a63:797:0:b0:3fc:da19:45a7 with SMTP id 145-20020a630797000000b003fcda1945a7mr9157910pgh.326.1654283988781; Fri, 03 Jun 2022 12:19:48 -0700 (PDT) Received: from keaua.caveonetworks.com (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id p2-20020a170902c70200b001617541c94fsm5770620plp.60.2022.06.03.12.19.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 12:19:48 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 19/20] devmem2: the source and patches moved to github repo Date: Fri, 3 Jun 2022 12:17:18 -0700 Message-Id: <4e66373fe9653317400098cf4ce8d29ec1a99026.1654282423.git.akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 03 Jun 2022 19:19:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/97408 From: Denys Dmytriyenko To cleanup metadata and improve source code management, github repo was created here with all patches integrated: https://github.com/denix0/devmem2 Update recipe accordingly, bump the version while at it to distinguish from the original. Signed-off-by: Denys Dmytriyenko Signed-off-by: Khem Raj (cherry picked from commit 356b488fb06bcacb0aa553518442b2d9574f16af) Signed-off-by: Armin Kuster --- ...word-is-32-bit-and-add-support-for-6.patch | 70 -------------- ...ort-different-page-sizes-at-run-time.patch | 35 ------- .../devmem2/devmem2/devmem2-fixups-2.patch | 91 ------------------- .../devmem2/{devmem2.bb => devmem2_2.0.bb} | 17 +--- 4 files changed, 3 insertions(+), 210 deletions(-) delete mode 100644 meta-oe/recipes-support/devmem2/devmem2/0001-devmem.c-ensure-word-is-32-bit-and-add-support-for-6.patch delete mode 100644 meta-oe/recipes-support/devmem2/devmem2/0001-devmem2-support-different-page-sizes-at-run-time.patch delete mode 100644 meta-oe/recipes-support/devmem2/devmem2/devmem2-fixups-2.patch rename meta-oe/recipes-support/devmem2/{devmem2.bb => devmem2_2.0.bb} (40%) diff --git a/meta-oe/recipes-support/devmem2/devmem2/0001-devmem.c-ensure-word-is-32-bit-and-add-support-for-6.patch b/meta-oe/recipes-support/devmem2/devmem2/0001-devmem.c-ensure-word-is-32-bit-and-add-support-for-6.patch deleted file mode 100644 index 2a57f29891..0000000000 --- a/meta-oe/recipes-support/devmem2/devmem2/0001-devmem.c-ensure-word-is-32-bit-and-add-support-for-6.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 1360a907879dd24041797a3b709d49aeac2ab444 Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko -Date: Tue, 29 May 2018 16:55:42 -0400 -Subject: [PATCH] devmem.c: ensure word is 32-bit and add support for 64-bit - long - -Signed-off-by: Denys Dmytriyenko ---- - devmem2.c | 23 +++++++++++++++++------ - 1 file changed, 17 insertions(+), 6 deletions(-) - -diff --git a/devmem2.c b/devmem2.c -index 5845381..68131b2 100644 ---- a/devmem2.c -+++ b/devmem2.c -@@ -39,6 +39,7 @@ - - #include - #include -+#include - #include - #include - #include -@@ -69,7 +70,7 @@ int main(int argc, char **argv) { - if(argc < 2) { - fprintf(stderr, "\nUsage:\t%s { address } [ type [ data ] ]\n" - "\taddress : memory address to act upon\n" -- "\ttype : access operation type : [b]yte, [h]alfword, [w]ord\n" -+ "\ttype : access operation type : [b]yte, [h]alfword, [w]ord, [l]ong\n" - "\tdata : data to be written\n\n", - argv[0]); - exit(1); -@@ -103,9 +104,14 @@ int main(int argc, char **argv) { - read_result = *((unsigned short *) virt_addr); - break; - case 'w': -- data_size = sizeof(unsigned long); -+ data_size = sizeof(uint32_t); - virt_addr = fixup_addr(virt_addr, data_size); -- read_result = *((unsigned long *) virt_addr); -+ read_result = *((uint32_t *) virt_addr); -+ break; -+ case 'l': -+ data_size = sizeof(uint64_t); -+ virt_addr = fixup_addr(virt_addr, data_size); -+ read_result = *((uint64_t *) virt_addr); - break; - default: - fprintf(stderr, "Illegal data type '%c'.\n", access_type); -@@ -129,9 +135,14 @@ int main(int argc, char **argv) { - read_result = *((unsigned short *) virt_addr); - break; - case 'w': -- virt_addr = fixup_addr(virt_addr, sizeof(unsigned long)); -- *((unsigned long *) virt_addr) = write_val; -- read_result = *((unsigned long *) virt_addr); -+ virt_addr = fixup_addr(virt_addr, sizeof(uint32_t)); -+ *((uint32_t *) virt_addr) = write_val; -+ read_result = *((uint32_t *) virt_addr); -+ break; -+ case 'l': -+ virt_addr = fixup_addr(virt_addr, sizeof(uint64_t)); -+ *((uint64_t *) virt_addr) = write_val; -+ read_result = *((uint64_t *) virt_addr); - break; - } - sprintf(fmt_str, "Write at address 0x%%08lX (%%p): 0x%%0%dlX, " --- -2.7.4 - diff --git a/meta-oe/recipes-support/devmem2/devmem2/0001-devmem2-support-different-page-sizes-at-run-time.patch b/meta-oe/recipes-support/devmem2/devmem2/0001-devmem2-support-different-page-sizes-at-run-time.patch deleted file mode 100644 index 0da0732c57..0000000000 --- a/meta-oe/recipes-support/devmem2/devmem2/0001-devmem2-support-different-page-sizes-at-run-time.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0f6af48b2fbc71ec8abe862d3e9eb6da7b03538b Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko -Date: Wed, 8 Aug 2018 14:38:00 -0400 -Subject: [PATCH] devmem2: support different page sizes at run-time - -Signed-off-by: Denys Dmytriyenko ---- - devmem2.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/devmem2.c b/devmem2.c -index 68131b2..76af2d6 100644 ---- a/devmem2.c -+++ b/devmem2.c -@@ -53,8 +53,6 @@ - #define FATAL do { fprintf(stderr, "Error at line %d, file %s (%d) [%s]\n", \ - __LINE__, __FILE__, errno, strerror(errno)); exit(1); } while(0) - --#define MAP_SIZE 4096UL --#define MAP_MASK (MAP_SIZE - 1) - - static inline void *fixup_addr(void *addr, size_t size); - -@@ -66,6 +64,8 @@ int main(int argc, char **argv) { - int access_type = 'w'; - char fmt_str[128]; - size_t data_size; -+ unsigned long MAP_SIZE = sysconf(_SC_PAGE_SIZE); -+ unsigned long MAP_MASK = (MAP_SIZE - 1); - - if(argc < 2) { - fprintf(stderr, "\nUsage:\t%s { address } [ type [ data ] ]\n" --- -2.7.4 - diff --git a/meta-oe/recipes-support/devmem2/devmem2/devmem2-fixups-2.patch b/meta-oe/recipes-support/devmem2/devmem2/devmem2-fixups-2.patch deleted file mode 100644 index 4517797fc7..0000000000 --- a/meta-oe/recipes-support/devmem2/devmem2/devmem2-fixups-2.patch +++ /dev/null @@ -1,91 +0,0 @@ ---- devmem2.c 2004-08-05 01:55:25.000000000 +0200 -+++ devmem2_modif.c 2011-01-13 15:48:37.798799784 +0100 -@@ -45,12 +45,16 @@ - #define MAP_SIZE 4096UL - #define MAP_MASK (MAP_SIZE - 1) - -+static inline void *fixup_addr(void *addr, size_t size); -+ - int main(int argc, char **argv) { - int fd; - void *map_base, *virt_addr; -- unsigned long read_result, writeval; -+ unsigned long read_result, write_val; - off_t target; - int access_type = 'w'; -+ char fmt_str[128]; -+ size_t data_size; - - if(argc < 2) { - fprintf(stderr, "\nUsage:\t%s { address } [ type [ data ] ]\n" -@@ -79,38 +83,51 @@ - virt_addr = map_base + (target & MAP_MASK); - switch(access_type) { - case 'b': -+ data_size = sizeof(unsigned char); -+ virt_addr = fixup_addr(virt_addr, data_size); - read_result = *((unsigned char *) virt_addr); - break; - case 'h': -+ data_size = sizeof(unsigned short); -+ virt_addr = fixup_addr(virt_addr, data_size); - read_result = *((unsigned short *) virt_addr); - break; - case 'w': -+ data_size = sizeof(unsigned long); -+ virt_addr = fixup_addr(virt_addr, data_size); - read_result = *((unsigned long *) virt_addr); - break; - default: - fprintf(stderr, "Illegal data type '%c'.\n", access_type); - exit(2); - } -- printf("Value at address 0x%X (%p): 0x%X\n", target, virt_addr, read_result); -+ sprintf(fmt_str, "Read at address 0x%%08lX (%%p): 0x%%0%dlX\n", 2*data_size); -+ printf(fmt_str, (unsigned long)target, virt_addr, read_result); - fflush(stdout); - - if(argc > 3) { -- writeval = strtoul(argv[3], 0, 0); -+ write_val = strtoul(argv[3], 0, 0); - switch(access_type) { - case 'b': -- *((unsigned char *) virt_addr) = writeval; -+ virt_addr = fixup_addr(virt_addr, sizeof(unsigned char)); -+ *((unsigned char *) virt_addr) = write_val; - read_result = *((unsigned char *) virt_addr); - break; - case 'h': -- *((unsigned short *) virt_addr) = writeval; -+ virt_addr = fixup_addr(virt_addr, sizeof(unsigned short)); -+ *((unsigned short *) virt_addr) = write_val; - read_result = *((unsigned short *) virt_addr); - break; - case 'w': -- *((unsigned long *) virt_addr) = writeval; -+ virt_addr = fixup_addr(virt_addr, sizeof(unsigned long)); -+ *((unsigned long *) virt_addr) = write_val; - read_result = *((unsigned long *) virt_addr); - break; - } -- printf("Written 0x%X; readback 0x%X\n", writeval, read_result); -+ sprintf(fmt_str, "Write at address 0x%%08lX (%%p): 0x%%0%dlX, " -+ "readback 0x%%0%dlX\n", 2*data_size, 2*data_size); -+ printf(fmt_str, (unsigned long)target, virt_addr, -+ write_val, read_result); - fflush(stdout); - } - -@@ -119,3 +136,12 @@ - return 0; - } - -+static inline void *fixup_addr(void *addr, size_t size) -+{ -+#ifdef FORCE_STRICT_ALIGNMENT -+ unsigned long aligned_addr = (unsigned long)addr; -+ aligned_addr &= ~(size - 1); -+ addr = (void *)aligned_addr; -+#endif -+ return addr; -+} diff --git a/meta-oe/recipes-support/devmem2/devmem2.bb b/meta-oe/recipes-support/devmem2/devmem2_2.0.bb similarity index 40% rename from meta-oe/recipes-support/devmem2/devmem2.bb rename to meta-oe/recipes-support/devmem2/devmem2_2.0.bb index 70d4135216..aee6bfe3da 100644 --- a/meta-oe/recipes-support/devmem2/devmem2.bb +++ b/meta-oe/recipes-support/devmem2/devmem2_2.0.bb @@ -1,22 +1,14 @@ SUMMARY = "Simple program to read/write from/to any location in memory" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://devmem2.c;endline=38;md5=a9eb9f3890384519f435aedf986297cf" -PR = "r7" -SRC_URI = "https://bootlin.com/pub/mirror/devmem2.c;downloadfilename=devmem2-new.c \ - file://devmem2-fixups-2.patch;apply=yes;striplevel=0 \ - file://0001-devmem.c-ensure-word-is-32-bit-and-add-support-for-6.patch \ - file://0001-devmem2-support-different-page-sizes-at-run-time.patch \ -" +SRC_URI = "git://github.com/denix0/devmem2.git;protocol=https;branch=main" +SRCREV = "5b395a946894eb4f4ef5d07c80a50a88573a541e" -S = "${WORKDIR}" +S = "${WORKDIR}/git" CFLAGS += "-DFORCE_STRICT_ALIGNMENT" -python do_unpack:append() { - os.rename("devmem2-new.c", "devmem2.c") -} - do_compile() { ${CC} -o devmem2 devmem2.c ${CFLAGS} ${LDFLAGS} } @@ -25,6 +17,3 @@ do_install() { install -d ${D}${bindir} install devmem2 ${D}${bindir} } - -SRC_URI[md5sum] = "e23f236e94be4c429aa1ceac0f01544b" -SRC_URI[sha256sum] = "3b15515693bae1ebd14d914e46d388edfec2175829ea1576a7a0c8606ebbe639" From patchwork Fri Jun 3 19:17:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 8822 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 14F2FCCA47C for ; Fri, 3 Jun 2022 19:19:55 +0000 (UTC) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.web08.2448.1654283991344726754 for ; Fri, 03 Jun 2022 12:19:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=G9QZ/97s; spf=pass (domain: gmail.com, ip: 209.85.214.177, mailfrom: akuster808@gmail.com) Received: by mail-pl1-f177.google.com with SMTP id n8so7483041plh.1 for ; Fri, 03 Jun 2022 12:19:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=4GtX6ZpTPvcOJym5gWVi/+H/SXpAReXkLdMdoMZmMwg=; b=G9QZ/97sZLE9CsLK787lGkBKvE5TVpbrvZ2n3/Eg3PZwyMxJH3mjX92Y3NS+x7mvsG K9vvuS/dToeA8Jq+IJAz6JVdO6BFMrU3kj2V2/vRitzaR7e1ldjGYDEJh4006paT/XIp aYC9WPAyFe74WzruvJTc1xTO2G0ZIKi8D+rNfaTBPG5dL19tWb88TaiuJeEqcbFlJuSL eWEv8Lpf+oD2KyQ7WSLBzOqVnYh6PoIQeqjXU7FWS3ZzalZOdTl4J6hXAABWMZItqhrO 232tq12bYUtTCIiMWbEe4945hQANTROPNwpn+X9NjVb7V8K99lX9+LIrahcZlftHfYjb p6aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4GtX6ZpTPvcOJym5gWVi/+H/SXpAReXkLdMdoMZmMwg=; b=bc+Ns9tMwOUZKu++PnmJE7ctkek6AzNuNAiee/fRDTo3Rp9az+HkBmOVynlSCRsjC3 IClZeZ0saxICgYb/1uaUv9+8M5HVT1Kpp6TAqruslC/CMl8j3RnmmhcVq3TLDrRv+WK2 9C+XsBirODxPyYiu2lYPjwpThH28aHMl98VwPbLyOkCRHZKycqjf7Hz6VeasRhJ+fFfy +J/ceqVC5Tr4ojtSYs0HG+U077fatBINF778l/eXmG8Ww9P+QL2mz6erJFlbTlCVblM9 RESc8kdVugRs2FPK4ktw0wtCTKs89ct8FLxpzBv4hNe3X0hgjscCoEHVOhvr/yd1MqR8 GNmw== X-Gm-Message-State: AOAM530WqEUXTD8Yf5dXV7OvIFKF04f6ilf0qChKncuY3gF6C5w46khY nUF5E1Yb4PCa96xUrxCDri2MqcCnPEQ= X-Google-Smtp-Source: ABdhPJxq7QSRS9GmVh0boCtXpUXRTuXEnv+9nT5MOaG5RCWOHaOTjDYp+jsBat5sny4KgJt757uMjw== X-Received: by 2002:a17:90a:6441:b0:1e0:b413:c290 with SMTP id y1-20020a17090a644100b001e0b413c290mr47235229pjm.179.1654283990461; Fri, 03 Jun 2022 12:19:50 -0700 (PDT) Received: from keaua.caveonetworks.com (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id p2-20020a170902c70200b001617541c94fsm5770620plp.60.2022.06.03.12.19.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 12:19:49 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 20/20] python3-matplotlib: add missing dependency Date: Fri, 3 Jun 2022 12:17:19 -0700 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 03 Jun 2022 19:19:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/97409 From: Adrian Fiergolski In order to fix the dependency issue on PIL module, python3-pillow is required. Signed-off-by: Adrian Fiergolski Signed-off-by: Khem Raj (cherry picked from commit d4e70a19600bee178d81b467dd9e118cbf057f65) Signed-off-by: Armin Kuster --- meta-python/recipes-devtools/python/python3-matplotlib_3.5.1.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-python/recipes-devtools/python/python3-matplotlib_3.5.1.bb b/meta-python/recipes-devtools/python/python3-matplotlib_3.5.1.bb index b9eab3c931..cd05b455d4 100644 --- a/meta-python/recipes-devtools/python/python3-matplotlib_3.5.1.bb +++ b/meta-python/recipes-devtools/python/python3-matplotlib_3.5.1.bb @@ -50,6 +50,7 @@ RDEPENDS:${PN} = "\ ${PYTHON_PN}-dateutil \ ${PYTHON_PN}-kiwisolver \ ${PYTHON_PN}-pytz \ + ${PYTHON_PN}-pillow \ " ENABLELTO:toolchain-clang:riscv64 = "echo enable_lto = False >> ${S}/mplsetup.cfg"