From patchwork Wed Apr 26 21:32:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randolph Sapp X-Patchwork-Id: 23046 X-Patchwork-Delegate: reatmon@ti.com 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 8939BC7EE25 for ; Wed, 26 Apr 2023 21:32:28 +0000 (UTC) Received: from fllv0016.ext.ti.com (fllv0016.ext.ti.com [198.47.19.142]) by mx.groups.io with SMTP id smtpd.web10.5179.1682544740544346644 for ; Wed, 26 Apr 2023 14:32:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=YCv8MkDz; spf=pass (domain: ti.com, ip: 198.47.19.142, mailfrom: rs@ti.com) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 33QLWHUp075982; Wed, 26 Apr 2023 16:32:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1682544737; bh=Cxhz4FpLajkUl5z9ocsKqPyTTWv4Lo9nMzzv/AZzizU=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=YCv8MkDzGNyzuBiXjGotIcX8S5XUTCpzhcuj1ofLFLU57rE6df5GYspdXHuZgmiGB 8rWjyuGOTG8ZMij4okhG4B3Yzx3i4A/0gKCgmTwwPuyJVqmruhd+oLv6Ai4QCwxCwe GMHF4HUvF3kTzbJU7ezExLrMcZ6s483MYdzIM9L0= Received: from DFLE113.ent.ti.com (dfle113.ent.ti.com [10.64.6.34]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 33QLWHi6088758 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 26 Apr 2023 16:32:17 -0500 Received: from DFLE107.ent.ti.com (10.64.6.28) by DFLE113.ent.ti.com (10.64.6.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Wed, 26 Apr 2023 16:32:16 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DFLE107.ent.ti.com (10.64.6.28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Wed, 26 Apr 2023 16:32:16 -0500 Received: from rs-desk.dhcp.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 33QLWGvh067242; Wed, 26 Apr 2023 16:32:16 -0500 From: To: , , , CC: , Randolph Sapp Subject: [meta-arago][master/kirkstone][PATCH 1/6] arago.conf: drop the explicit removal of x11, add vulkan Date: Wed, 26 Apr 2023 16:32:08 -0500 Message-ID: <20230426213214.3501230-2-rs@ti.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230426213214.3501230-1-rs@ti.com> References: <20230426213214.3501230-1-rs@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 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 ; Wed, 26 Apr 2023 21:32:28 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/14353 From: Randolph Sapp Drop the explicit removal of x11 as the new PVR Vulkan libs have runtime dependencies on libx11. Add vulkan as a distro feature. Signed-off-by: Randolph Sapp --- meta-arago-distro/conf/distro/arago.conf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf index 094e67da..58841051 100644 --- a/meta-arago-distro/conf/distro/arago.conf +++ b/meta-arago-distro/conf/distro/arago.conf @@ -45,12 +45,10 @@ TMPDIR .= "${TCMODEAPPEND}" # Start with default set of distro features DISTRO_FEATURES = "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC}" -# Remove some unwanted features -DISTRO_FEATURES:remove = "x11" - # Add additional distro features DISTRO_FEATURES:append = " pam wayland opengl" #DISTRO_FEATURES:append = " opencl" +DISTRO_FEATURES:append = " vulkan" DISTRO_FEATURES:append = " opencv" DISTRO_FEATURES:append = " openmp" From patchwork Wed Apr 26 21:32:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randolph Sapp X-Patchwork-Id: 23047 X-Patchwork-Delegate: reatmon@ti.com 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 860E1C77B7C for ; Wed, 26 Apr 2023 21:32:28 +0000 (UTC) Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) by mx.groups.io with SMTP id smtpd.web10.5181.1682544740625513214 for ; Wed, 26 Apr 2023 14:32:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=SCsNICmg; spf=pass (domain: ti.com, ip: 198.47.23.248, mailfrom: rs@ti.com) Received: from fllv0034.itg.ti.com ([10.64.40.246]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 33QLWHkv024819; Wed, 26 Apr 2023 16:32:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1682544737; bh=/JYU3BNkT46ZCic7q9YpasGH+keFUhEH0en12OtZFnk=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=SCsNICmgp7UHTzoOUFHzxo/gjL7i6/RObFN8bxOAgQMt3FOQlCIdTkyvhCDgXLIHb f0hql5U6wsgr3sJwqYcsUprYeL4hy8Uho9xnPHGVirCf5h/SmnVbZ17ctgNFf2Ee2J SPdYrPh1LKO7uuWvPlui3KMY+7D+kSLgkkP9JOTg= Received: from DFLE108.ent.ti.com (dfle108.ent.ti.com [10.64.6.29]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 33QLWHx4126617 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 26 Apr 2023 16:32:17 -0500 Received: from DFLE100.ent.ti.com (10.64.6.21) by DFLE108.ent.ti.com (10.64.6.29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Wed, 26 Apr 2023 16:32:16 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DFLE100.ent.ti.com (10.64.6.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Wed, 26 Apr 2023 16:32:16 -0500 Received: from rs-desk.dhcp.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 33QLWGvi067242; Wed, 26 Apr 2023 16:32:16 -0500 From: To: , , , CC: , Randolph Sapp Subject: [meta-arago][master/kirkstone][PATCH 2/6] qtwayland: override the packageconfig to prefer wayland Date: Wed, 26 Apr 2023 16:32:09 -0500 Message-ID: <20230426213214.3501230-3-rs@ti.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230426213214.3501230-1-rs@ti.com> References: <20230426213214.3501230-1-rs@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 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 ; Wed, 26 Apr 2023 21:32:28 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/14354 From: Randolph Sapp While we're allowing X to exist now, we are by no means prefering it. Set the PACKAGECONFIG to remove the X specific components. Signed-off-by: Randolph Sapp --- meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend b/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend index 23a2f907..25b5fc42 100644 --- a/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend +++ b/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend @@ -5,3 +5,5 @@ SRC_URI += " \ file://0001-plugins-decorations-bradient-display-window-icon-onl.patch \ file://0001-examples-fix-wayland-texture-sharing-custom-composit.patch \ " + +PACKAGECONFIG:remove = "xcomposite-egl xcomposite-glx" From patchwork Wed Apr 26 21:32:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Randolph Sapp X-Patchwork-Id: 23043 X-Patchwork-Delegate: reatmon@ti.com 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 7304DC77B60 for ; Wed, 26 Apr 2023 21:32:28 +0000 (UTC) Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) by mx.groups.io with SMTP id smtpd.web10.5178.1682544740209443318 for ; Wed, 26 Apr 2023 14:32:20 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@ti.com header.s=ti-com-17q1 header.b=f61X96E0; spf=pass (domain: ti.com, ip: 198.47.23.249, mailfrom: rs@ti.com) Received: from lelv0265.itg.ti.com ([10.180.67.224]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 33QLWHiI067687; Wed, 26 Apr 2023 16:32:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1682544737; bh=OLHAVXoGiKQ3+iGi6tbX7hZ2VHcaKP8i5bsNmkvZEUs=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=f61X96E0iEGtoLEUYq8XmOK+WYAXZBorSexVJkZvo3Z8ll/iK9X+gZspLMLaBUpqL oIWv51tSK3UyFjoBbwjeQgrZ4cjUVmX5orbbkgRcQmQ/ZlKp2SpgkFuVslACwCLJts rhigQgt6oQBP63IuqgmqSLqtRfGzh4Ob/09oa7BA= Received: from DLEE108.ent.ti.com (dlee108.ent.ti.com [157.170.170.38]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 33QLWHUQ025069 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 26 Apr 2023 16:32:17 -0500 Received: from DLEE112.ent.ti.com (157.170.170.23) by DLEE108.ent.ti.com (157.170.170.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Wed, 26 Apr 2023 16:32:16 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DLEE112.ent.ti.com (157.170.170.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Wed, 26 Apr 2023 16:32:16 -0500 Received: from rs-desk.dhcp.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 33QLWGvj067242; Wed, 26 Apr 2023 16:32:16 -0500 From: To: , , , CC: , Randolph Sapp Subject: [meta-arago][master/kirkstone][PATCH 3/6] qtwayland: drop the fix-wayland-texture-sharing patch Date: Wed, 26 Apr 2023 16:32:10 -0500 Message-ID: <20230426213214.3501230-4-rs@ti.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230426213214.3501230-1-rs@ti.com> References: <20230426213214.3501230-1-rs@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-MIME-Autoconverted: from 8bit to quoted-printable by lelv0142.ext.ti.com id 33QLWHiI067687 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 ; Wed, 26 Apr 2023 21:32:28 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/14348 From: Randolph Sapp Meta-qt is now providing a version of qtwayland that already has this patch applied. Signed-off-by: Randolph Sapp --- ...land-texture-sharing-custom-composit.patch | 52 ------------------- .../recipes-qt/qt5/qtwayland_git.bbappend | 1 - 2 files changed, 53 deletions(-) delete mode 100644 meta-arago-distro/recipes-qt/qt5/qtwayland/0001-examples-fix-wayland-texture-sharing-custom-composit.patch diff --git a/meta-arago-distro/recipes-qt/qt5/qtwayland/0001-examples-fix-wayland-texture-sharing-custom-composit.patch b/meta-arago-distro/recipes-qt/qt5/qtwayland/0001-examples-fix-wayland-texture-sharing-custom-composit.patch deleted file mode 100644 index c209dfc4..00000000 --- a/meta-arago-distro/recipes-qt/qt5/qtwayland/0001-examples-fix-wayland-texture-sharing-custom-composit.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 1d18591d9e7ed9b3580e06c37be23bfde24bc30c Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Fri, 3 Apr 2020 22:40:29 +0200 -Subject: [PATCH] examples: fix wayland/texture-sharing/custom-compositor -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: - - main.cpp:83:33: error: ‘GL_RGBA8’ was not declared in this scope; did you mean ‘GL_RGBA4’? - 83 | *glInternalFormat = GL_RGBA8; - | ^~~~~~~~ - | GL_RGBA4 - main.cpp:120:33: error: ‘GL_RGBA8’ was not declared in this scope; did you mean ‘GL_RGBA4’? - 120 | *glInternalFormat = GL_RGBA8; - | ^~~~~~~~ - | GL_RGBA4 - -Task-number: QTBUG-83304 -Change-Id: I0515f3303b08c405d162986e280e9a7bd35e28f7 -Reviewed-by: Laszlo Agocs -Reviewed-by: Eskil Abrahamsen Blomfeldt - -Upstream-Status: Backport [1d18591d9e7ed9b3580e06c37be23bfde24bc30c] - -The patch is backport from upstream commit - -1d18591d9e7ed9b3580e06c37be23bfde24bc30c - -Signed-off-by: Gowtham Tammana ---- - examples/wayland/texture-sharing/custom-compositor/main.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/examples/wayland/texture-sharing/custom-compositor/main.cpp b/examples/wayland/texture-sharing/custom-compositor/main.cpp -index a39c8c38..af375024 100644 ---- a/examples/wayland/texture-sharing/custom-compositor/main.cpp -+++ b/examples/wayland/texture-sharing/custom-compositor/main.cpp -@@ -63,6 +63,10 @@ - - #include "QtWaylandCompositor/private/qwltexturesharingextension_p.h" - -+#ifndef GL_RGBA8 -+#define GL_RGBA8 0x8058 -+#endif -+ - class CustomSharingExtension : public QWaylandTextureSharingExtension - { - Q_OBJECT --- -2.17.1 - diff --git a/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend b/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend index 25b5fc42..df8b5eff 100644 --- a/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend +++ b/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend @@ -3,7 +3,6 @@ PR:append = ".arago2" SRC_URI += " \ file://0001-plugins-decorations-bradient-display-window-icon-onl.patch \ - file://0001-examples-fix-wayland-texture-sharing-custom-composit.patch \ " PACKAGECONFIG:remove = "xcomposite-egl xcomposite-glx" From patchwork Wed Apr 26 21:32:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randolph Sapp X-Patchwork-Id: 23045 X-Patchwork-Delegate: reatmon@ti.com 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 86113C7EE24 for ; Wed, 26 Apr 2023 21:32:28 +0000 (UTC) Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by mx.groups.io with SMTP id smtpd.web10.5180.1682544740619182981 for ; Wed, 26 Apr 2023 14:32:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=dv/wyncE; spf=pass (domain: ti.com, ip: 198.47.19.141, mailfrom: rs@ti.com) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 33QLWHTj111345; Wed, 26 Apr 2023 16:32:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1682544737; bh=rHPuPD3QWd1e2LUv/UoD0s2Ut2GouifpBrBrwSMZBbs=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=dv/wyncEnkQf3pKZLXdqJeSeko3+NHDpUNyYqpSnF164rdjJNYjIDFooiPybvl940 c3JLC2RtOv5ysQ3TfJYS/zzPrNaEDS8Nyg74DQVWBm1+kRbpnlNOU4TZdRJr2rtLXZ E8zBvQqugeUbUjtXMfVRDHRdqsPQ2SD67l12aUTM= Received: from DLEE115.ent.ti.com (dlee115.ent.ti.com [157.170.170.26]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 33QLWHTG088764 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 26 Apr 2023 16:32:17 -0500 Received: from DLEE106.ent.ti.com (157.170.170.36) by DLEE115.ent.ti.com (157.170.170.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Wed, 26 Apr 2023 16:32:16 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DLEE106.ent.ti.com (157.170.170.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Wed, 26 Apr 2023 16:32:16 -0500 Received: from rs-desk.dhcp.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 33QLWGvk067242; Wed, 26 Apr 2023 16:32:16 -0500 From: To: , , , CC: , Randolph Sapp Subject: [meta-arago][master/kirkstone][PATCH 4/6] qtwayland: drop the plugins-decorations patch Date: Wed, 26 Apr 2023 16:32:11 -0500 Message-ID: <20230426213214.3501230-5-rs@ti.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230426213214.3501230-1-rs@ti.com> References: <20230426213214.3501230-1-rs@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 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 ; Wed, 26 Apr 2023 21:32:28 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/14355 From: Randolph Sapp This seems like it was a needless patch to guard against garbage from being shown if the window icon request failed to return any useful icon. Not necessary. Signed-off-by: Randolph Sapp --- ...ons-bradient-display-window-icon-onl.patch | 42 ------------------- .../recipes-qt/qt5/qtwayland_git.bbappend | 4 -- 2 files changed, 46 deletions(-) delete mode 100644 meta-arago-distro/recipes-qt/qt5/qtwayland/0001-plugins-decorations-bradient-display-window-icon-onl.patch diff --git a/meta-arago-distro/recipes-qt/qt5/qtwayland/0001-plugins-decorations-bradient-display-window-icon-onl.patch b/meta-arago-distro/recipes-qt/qt5/qtwayland/0001-plugins-decorations-bradient-display-window-icon-onl.patch deleted file mode 100644 index 33f28390..00000000 --- a/meta-arago-distro/recipes-qt/qt5/qtwayland/0001-plugins-decorations-bradient-display-window-icon-onl.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 547fd678ba55025c3578f021b40c96b1e91b839e Mon Sep 17 00:00:00 2001 -From: Eric Ruei -Date: Fri, 9 Sep 2016 16:54:02 -0400 -Subject: [PATCH] plugins/decorations/bradient: display window icon only if - icon.pixmap not null - -Signed-off-by: Eric Ruei ---- - src/plugins/decorations/bradient/main.cpp | 17 ++++++++++------- - 1 file changed, 10 insertions(+), 7 deletions(-) - -diff --git a/src/plugins/decorations/bradient/main.cpp b/src/plugins/decorations/bradient/main.cpp -index ea29869..279bff1 100644 ---- a/src/plugins/decorations/bradient/main.cpp -+++ b/src/plugins/decorations/bradient/main.cpp -@@ -222,13 +222,16 @@ void QWaylandBradientDecoration::paint(QPaintDevice *device) - // Window icon - QIcon icon = waylandWindow()->windowIcon(); - if (!icon.isNull()) { -- QPixmap pixmap = icon.pixmap(QSize(128, 128)); -- QPixmap scaled = pixmap.scaled(22, 22, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); -- -- QRectF iconRect(0, 0, 22, 22); -- p.drawPixmap(iconRect.adjusted(margins().left() + BUTTON_SPACING, 4, -- margins().left() + BUTTON_SPACING, 4), -- scaled, iconRect); -+ QPixmap pixmap = icon.pixmap(QSize(128, 128)); -+ if(!pixmap.isNull()) -+ { -+ QPixmap scaled = pixmap.scaled(22, 22, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); -+ -+ QRectF iconRect(0, 0, 22, 22); -+ p.drawPixmap(iconRect.adjusted(margins().left() + BUTTON_SPACING, 4, -+ margins().left() + BUTTON_SPACING, 4), -+ scaled, iconRect); -+ } - } - - // Window title --- -1.9.1 - diff --git a/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend b/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend index df8b5eff..e7560d02 100644 --- a/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend +++ b/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend @@ -1,8 +1,4 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" PR:append = ".arago2" -SRC_URI += " \ - file://0001-plugins-decorations-bradient-display-window-icon-onl.patch \ -" - PACKAGECONFIG:remove = "xcomposite-egl xcomposite-glx" From patchwork Wed Apr 26 21:32:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randolph Sapp X-Patchwork-Id: 23048 X-Patchwork-Delegate: reatmon@ti.com 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 9BA96C7EE26 for ; Wed, 26 Apr 2023 21:32:28 +0000 (UTC) Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) by mx.groups.io with SMTP id smtpd.web10.5177.1682544740187364146 for ; Wed, 26 Apr 2023 14:32:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=AQ/U4uNz; spf=pass (domain: ti.com, ip: 198.47.23.249, mailfrom: rs@ti.com) Received: from lelv0265.itg.ti.com ([10.180.67.224]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 33QLWHOk067691; Wed, 26 Apr 2023 16:32:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1682544737; bh=FKcthL053dsVKO9KLVDbeuGoJeGR0oKrhXSmxSa3n74=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=AQ/U4uNzCRy0cNOTGkjzW4Feu7knJfby0AfezLI32xHgrv6hdhR4s2mrEFjF4P2hH SYu6F+IL2p8ka6LTI+Fv75UhDvmUFZyYSJoNfsCmFUvIGgYdmd0qfL2u2BkrOfIoz+ H9WN+6zR1UbVeDXyX+pTWmMDcaBKtIKFEn6/Le5c= Received: from DFLE110.ent.ti.com (dfle110.ent.ti.com [10.64.6.31]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 33QLWHKA025074 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 26 Apr 2023 16:32:17 -0500 Received: from DFLE109.ent.ti.com (10.64.6.30) by DFLE110.ent.ti.com (10.64.6.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Wed, 26 Apr 2023 16:32:16 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DFLE109.ent.ti.com (10.64.6.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Wed, 26 Apr 2023 16:32:16 -0500 Received: from rs-desk.dhcp.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 33QLWGvl067242; Wed, 26 Apr 2023 16:32:16 -0500 From: To: , , , CC: , Randolph Sapp Subject: [meta-arago][master/kirkstone][PATCH 5/6] qtwayland: add comment about why this append exists Date: Wed, 26 Apr 2023 16:32:12 -0500 Message-ID: <20230426213214.3501230-6-rs@ti.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230426213214.3501230-1-rs@ti.com> References: <20230426213214.3501230-1-rs@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 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 ; Wed, 26 Apr 2023 21:32:28 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/14349 From: Randolph Sapp Add some info about why this bbappend still exists. It's to prefer wayland over x11 and remove some unoptimized components. Signed-off-by: Randolph Sapp --- meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend b/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend index e7560d02..82cb657a 100644 --- a/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend +++ b/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -PR:append = ".arago2" +# This append exists to modify the PACKAGECONFIG such that the wayland backend +# is preferred over x11 and unoptimized components are removed. PACKAGECONFIG:remove = "xcomposite-egl xcomposite-glx" From patchwork Wed Apr 26 21:32:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randolph Sapp X-Patchwork-Id: 23044 X-Patchwork-Delegate: reatmon@ti.com 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 763ECC77B7F for ; Wed, 26 Apr 2023 21:32:28 +0000 (UTC) Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) by mx.groups.io with SMTP id smtpd.web11.5238.1682544740194042384 for ; Wed, 26 Apr 2023 14:32:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=kwEugQeX; spf=pass (domain: ti.com, ip: 198.47.23.249, mailfrom: rs@ti.com) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 33QLWH8B067696; Wed, 26 Apr 2023 16:32:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1682544737; bh=HLuaej4I7g56GzFwT2oJ8Gb0X449YtyfLs2py+A/WbM=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=kwEugQeXHRHC1pLHJMkf+3KBOJ84V42s579ydBDThBRo24qZu5YXtbTDNrhrH/GTT pcZQ2EuCjGRCQxTSy7N/9m0cwC4xRocnWtdlUiKKNh9pJn5u5QsaFIhjNjFJ/jAMYv RLctITsfnSe0gCTLyDTWkIF29UNlhF6/xv+bB+sI= Received: from DLEE103.ent.ti.com (dlee103.ent.ti.com [157.170.170.33]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 33QLWHil088768 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 26 Apr 2023 16:32:17 -0500 Received: from DLEE104.ent.ti.com (157.170.170.34) by DLEE103.ent.ti.com (157.170.170.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Wed, 26 Apr 2023 16:32:17 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DLEE104.ent.ti.com (157.170.170.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Wed, 26 Apr 2023 16:32:17 -0500 Received: from rs-desk.dhcp.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 33QLWGvm067242; Wed, 26 Apr 2023 16:32:16 -0500 From: To: , , , CC: , Randolph Sapp Subject: [meta-arago][master/kirkstone][PATCH 6/6] HACK: glfw: convert to append and drop patches Date: Wed, 26 Apr 2023 16:32:13 -0500 Message-ID: <20230426213214.3501230-7-rs@ti.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230426213214.3501230-1-rs@ti.com> References: <20230426213214.3501230-1-rs@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 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 ; Wed, 26 Apr 2023 21:32:28 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/14351 From: Randolph Sapp A reasonable version of glfw is now provided by meta-oe. Also the EGL version this package needs to build a against can be satisfied by Mesa EGL so this old patch isn't required anymore. Add a PACKAGECONFIG variable for wayland and use it. This append can be dropped when meta-oe accpets my PACKAGECONFIG patch [1]. [1] https://lists.openembedded.org/g/openembedded-devel/message/102202 Signed-off-by: Randolph Sapp --- ...xt-remove-check-for-Wayland-Egl-prov.patch | 27 ------------------- .../recipes-graphics/glfw/glfw_%.bbappend | 6 +++++ .../recipes-graphics/glfw/glfw_git.bb | 24 ----------------- 3 files changed, 6 insertions(+), 51 deletions(-) delete mode 100644 meta-arago-extras/recipes-graphics/glfw/glfw/0001-HACK-CMakeList.txt-remove-check-for-Wayland-Egl-prov.patch create mode 100644 meta-arago-extras/recipes-graphics/glfw/glfw_%.bbappend delete mode 100644 meta-arago-extras/recipes-graphics/glfw/glfw_git.bb diff --git a/meta-arago-extras/recipes-graphics/glfw/glfw/0001-HACK-CMakeList.txt-remove-check-for-Wayland-Egl-prov.patch b/meta-arago-extras/recipes-graphics/glfw/glfw/0001-HACK-CMakeList.txt-remove-check-for-Wayland-Egl-prov.patch deleted file mode 100644 index 6116fc12..00000000 --- a/meta-arago-extras/recipes-graphics/glfw/glfw/0001-HACK-CMakeList.txt-remove-check-for-Wayland-Egl-prov.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c6e30af80018f7a6fc7b8b0e810718f4bd646cf6 Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko -Date: Thu, 12 Apr 2018 12:29:39 -0400 -Subject: [PATCH] HACK: CMakeList.txt: remove check for Wayland-Egl, provided - by SGX libs - -Signed-off-by: Denys Dmytriyenko ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1f5d6ef..eaf780f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -266,7 +266,7 @@ if (_GLFW_WAYLAND) - find_package(ECM REQUIRED NO_MODULE) - list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}") - -- find_package(Wayland REQUIRED Client Cursor Egl) -+ find_package(Wayland REQUIRED Client Cursor) - find_package(WaylandScanner REQUIRED) - find_package(WaylandProtocols 1.12 REQUIRED) - --- -2.7.4 - diff --git a/meta-arago-extras/recipes-graphics/glfw/glfw_%.bbappend b/meta-arago-extras/recipes-graphics/glfw/glfw_%.bbappend new file mode 100644 index 00000000..8f80e55d --- /dev/null +++ b/meta-arago-extras/recipes-graphics/glfw/glfw_%.bbappend @@ -0,0 +1,6 @@ +# Add some wayland configuration options until meta-oe adds some good +# PACKAGECONFIGS + +PACKAGECONFIG[wayland] = "-DGLFW_USE_WAYLAND=ON,,wayland wayland-native wayland-protocols extra-cmake-modules libxkbcommon" + +PACKAGECONFIG += " wayland" diff --git a/meta-arago-extras/recipes-graphics/glfw/glfw_git.bb b/meta-arago-extras/recipes-graphics/glfw/glfw_git.bb deleted file mode 100644 index 0e83979f..00000000 --- a/meta-arago-extras/recipes-graphics/glfw/glfw_git.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "GLFW cross platform graphics framework" -DESCRIPTION = "A multi-platform library for OpenGL and OpenGLES, window and input" -HOMEPAGE = "http://glfw.org/" -LICENSE = "Zlib & Libpng" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=90c6dd54408744b0f8a55f2a6c7ad870" - -PV = "3.2.1+git${SRCPV}" -PR = "r0" - -BRANCH = "master" -SRC_URI = "git://github.com/glfw/glfw.git;protocol=https;branch=${BRANCH}" -SRCREV = "0a3c4f5d80b041ee1a12c8da3503653d98bd1a15" - -SRC_URI += "file://0001-HACK-CMakeList.txt-remove-check-for-Wayland-Egl-prov.patch" - -DEPENDS = "extra-cmake-modules glib-2.0 virtual/libgles2 virtual/egl weston wayland wayland-native wayland-protocols" - -S = "${WORKDIR}/git" - -inherit cmake pkgconfig - -EXTRA_OECMAKE += "-DGLFW_USE_WAYLAND=ON -DGLFW_BUILD_EXAMPLES=OFF -DGLFW_BUILD_TESTS=OFF" - -FILES:${PN}-dev += "${libdir}/cmake"