From patchwork Thu Apr 27 17:20:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randolph Sapp X-Patchwork-Id: 23095 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 2FF7FC77B73 for ; Thu, 27 Apr 2023 17:20:54 +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.27203.1682616049260620762 for ; Thu, 27 Apr 2023 10:20:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=St2g329h; spf=pass (domain: ti.com, ip: 198.47.19.142, mailfrom: rs@ti.com) Received: from fllv0034.itg.ti.com ([10.64.40.246]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 33RHKj5Z079590; Thu, 27 Apr 2023 12:20:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1682616045; bh=Cxhz4FpLajkUl5z9ocsKqPyTTWv4Lo9nMzzv/AZzizU=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=St2g329hSKhoEay2tVb4OXsR6O0uu1HQnzr84CWYgwatgSoMAy6dl3zA2lhVpnCcE CBM3SqDK1JPZEEj7hIZGVgXaUEYaWkB2ZLYY6f23JEKHfju0NlHro2vFLk2xWvT5zq VHTz4E8kWwPj8m4txpDl+JiQXpwzWSZ7Pc372JDI= Received: from DLEE115.ent.ti.com (dlee115.ent.ti.com [157.170.170.26]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 33RHKjxK000559 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 27 Apr 2023 12:20:45 -0500 Received: from DLEE102.ent.ti.com (157.170.170.32) 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; Thu, 27 Apr 2023 12:20:45 -0500 Received: from fllv0040.itg.ti.com (10.64.41.20) by DLEE102.ent.ti.com (157.170.170.32) 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; Thu, 27 Apr 2023 12:20:45 -0500 Received: from rs-desk.dhcp.ti.com (ileaxei01-snat.itg.ti.com [10.180.69.5]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id 33RHKj8g110570; Thu, 27 Apr 2023 12:20:45 -0500 From: To: , , , CC: , Randolph Sapp Subject: [meta-arago][kirkstone][PATCHv2 1/5] arago.conf: drop the explicit removal of x11, add vulkan Date: Thu, 27 Apr 2023 12:20:32 -0500 Message-ID: <20230427172036.863789-2-rs@ti.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230427172036.863789-1-rs@ti.com> References: <20230427172036.863789-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 ; Thu, 27 Apr 2023 17:20:54 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/14367 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 Thu Apr 27 17:20:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randolph Sapp X-Patchwork-Id: 23094 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 307C0C7EE22 for ; Thu, 27 Apr 2023 17:20:54 +0000 (UTC) Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) by mx.groups.io with SMTP id smtpd.web11.27079.1682616049091478428 for ; Thu, 27 Apr 2023 10:20:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=o2sc33hU; spf=pass (domain: ti.com, ip: 198.47.23.248, mailfrom: rs@ti.com) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 33RHKjpd022430; Thu, 27 Apr 2023 12:20:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1682616045; bh=/JYU3BNkT46ZCic7q9YpasGH+keFUhEH0en12OtZFnk=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=o2sc33hUIlqIvCx8L+xwxssaAZ+V9gmKEWpsEtuEVu7DwvI2PZG201Da/LbkrgeRi fVstZiTl9kBJ6Ao6I5Y10Q6hoDsW/VBY9EuGdzhZlvChWZLd/xSUYb/ugSC6soq32t foQTAqalwsyktexECC0h5lZyyEGv8QJVdiMV0p+w= Received: from DFLE106.ent.ti.com (dfle106.ent.ti.com [10.64.6.27]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 33RHKjj0053460 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 27 Apr 2023 12:20:45 -0500 Received: from DFLE111.ent.ti.com (10.64.6.32) by DFLE106.ent.ti.com (10.64.6.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Thu, 27 Apr 2023 12:20:45 -0500 Received: from fllv0040.itg.ti.com (10.64.41.20) by DFLE111.ent.ti.com (10.64.6.32) 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; Thu, 27 Apr 2023 12:20:45 -0500 Received: from rs-desk.dhcp.ti.com (ileaxei01-snat.itg.ti.com [10.180.69.5]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id 33RHKj8h110570; Thu, 27 Apr 2023 12:20:45 -0500 From: To: , , , CC: , Randolph Sapp Subject: [meta-arago][kirkstone][PATCHv2 2/5] qtwayland: override the packageconfig to prefer wayland Date: Thu, 27 Apr 2023 12:20:33 -0500 Message-ID: <20230427172036.863789-3-rs@ti.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230427172036.863789-1-rs@ti.com> References: <20230427172036.863789-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 ; Thu, 27 Apr 2023 17:20:54 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/14364 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 Thu Apr 27 17:20:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Randolph Sapp X-Patchwork-Id: 23093 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 1BD1CC77B61 for ; Thu, 27 Apr 2023 17:20:54 +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.27205.1682616049490369748 for ; Thu, 27 Apr 2023 10:20:49 -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=NLV8aeNn; 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 33RHKjNj066299; Thu, 27 Apr 2023 12:20:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1682616045; bh=OLHAVXoGiKQ3+iGi6tbX7hZ2VHcaKP8i5bsNmkvZEUs=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=NLV8aeNnxIPMflJdXcjzk4F4b0QSbpmiX//ZY+oS5QDGCw/udOSZIVL9+bbW6zRc8 obseT8VLQsPTasgR/kj3Wmiq+V5JaOvtn5mAqU2lN961YNoDC6HIlhYWENPeJHCcEz 0DYqW8lGeZCBQ1sljW7CXGMQhDWT3G2qI1iDFhDc= 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 33RHKjE0086167 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 27 Apr 2023 12:20:45 -0500 Received: from DFLE109.ent.ti.com (10.64.6.30) 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.23; Thu, 27 Apr 2023 12:20:45 -0500 Received: from fllv0040.itg.ti.com (10.64.41.20) 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; Thu, 27 Apr 2023 12:20:45 -0500 Received: from rs-desk.dhcp.ti.com (ileaxei01-snat.itg.ti.com [10.180.69.5]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id 33RHKj8i110570; Thu, 27 Apr 2023 12:20:45 -0500 From: To: , , , CC: , Randolph Sapp Subject: [meta-arago][kirkstone][PATCHv2 3/5] qtwayland: drop the fix-wayland-texture-sharing patch Date: Thu, 27 Apr 2023 12:20:34 -0500 Message-ID: <20230427172036.863789-4-rs@ti.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230427172036.863789-1-rs@ti.com> References: <20230427172036.863789-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 33RHKjNj066299 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 ; Thu, 27 Apr 2023 17:20:54 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/14368 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 Thu Apr 27 17:20:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randolph Sapp X-Patchwork-Id: 23097 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 345A6C7EE25 for ; Thu, 27 Apr 2023 17:20:54 +0000 (UTC) Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by mx.groups.io with SMTP id smtpd.web11.27080.1682616049121015249 for ; Thu, 27 Apr 2023 10:20:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=YTKjeNYF; spf=pass (domain: ti.com, ip: 198.47.19.141, mailfrom: rs@ti.com) Received: from lelv0265.itg.ti.com ([10.180.67.224]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 33RHKj5a113456; Thu, 27 Apr 2023 12:20:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1682616045; bh=7Jcq7Wr2o8YwR/3MSx4fChYrM7ZZvxusum2P2Go3g9Q=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=YTKjeNYFowp9BplHhTz1hpK6xeylsCbJZ8EKYvWnCaydLvW0y69xRGnkQc7lweXef NvNfkQ4UiPaZHQ0iAxteCsxFHHe9IMcz4KQPgAQAOMEbfPMJ9DtewBJkm2QRsbh0IJ +he6iu3tH+MCgtKv0bFCz7nsS94gTPL9DYvSkIGs= 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 33RHKjsL017492 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 27 Apr 2023 12:20:45 -0500 Received: from DFLE113.ent.ti.com (10.64.6.34) 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; Thu, 27 Apr 2023 12:20:45 -0500 Received: from fllv0040.itg.ti.com (10.64.41.20) 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.23 via Frontend Transport; Thu, 27 Apr 2023 12:20:45 -0500 Received: from rs-desk.dhcp.ti.com (ileaxei01-snat.itg.ti.com [10.180.69.5]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id 33RHKj8j110570; Thu, 27 Apr 2023 12:20:45 -0500 From: To: , , , CC: , Randolph Sapp Subject: [meta-arago][kirkstone][PATCHv2 4/5] qtwayland: drop the plugins-decorations patch Date: Thu, 27 Apr 2023 12:20:35 -0500 Message-ID: <20230427172036.863789-5-rs@ti.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230427172036.863789-1-rs@ti.com> References: <20230427172036.863789-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 ; Thu, 27 Apr 2023 17:20:54 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/14366 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. 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 --- ...ons-bradient-display-window-icon-onl.patch | 42 ------------------- .../recipes-qt/qt5/qtwayland_git.bbappend | 8 ++-- 2 files changed, 3 insertions(+), 47 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..11d8e2ce 100644 --- a/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend +++ b/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend @@ -1,8 +1,6 @@ -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. -SRC_URI += " \ - file://0001-plugins-decorations-bradient-display-window-icon-onl.patch \ -" +PR:append = ".arago3" PACKAGECONFIG:remove = "xcomposite-egl xcomposite-glx" From patchwork Thu Apr 27 17:20:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randolph Sapp X-Patchwork-Id: 23096 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 1D52FC77B7E for ; Thu, 27 Apr 2023 17:20:54 +0000 (UTC) Received: from fllv0016.ext.ti.com (fllv0016.ext.ti.com [198.47.19.142]) by mx.groups.io with SMTP id smtpd.web11.27077.1682616048938722005 for ; Thu, 27 Apr 2023 10:20:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=nKvrT3NY; spf=pass (domain: ti.com, ip: 198.47.19.142, mailfrom: rs@ti.com) Received: from fllv0034.itg.ti.com ([10.64.40.246]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 33RHKjOT079598; Thu, 27 Apr 2023 12:20:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1682616045; bh=iViSV0GGJIuQ49+lHXA6k78zfGgZaMTmpHc9n976D78=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=nKvrT3NY0jQr9BlPkH3l9UJCC0EekKtlpTRH25A9p15uoQWypW3pqU9MlD7WkwCE9 5q9MT2KhY5vasL1kd4P+PAZRwCrSOcIwKCPb8sS1AMHiOM9aA/KqSN4Ld3qRp5SpXc fF6UpQdneMHaxxycGvmKEN/T6zjVFSQ1xDhT2BTQ= Received: from DLEE111.ent.ti.com (dlee111.ent.ti.com [157.170.170.22]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 33RHKj6e000568 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 27 Apr 2023 12:20:45 -0500 Received: from DLEE109.ent.ti.com (157.170.170.41) by DLEE111.ent.ti.com (157.170.170.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Thu, 27 Apr 2023 12:20:45 -0500 Received: from fllv0040.itg.ti.com (10.64.41.20) by DLEE109.ent.ti.com (157.170.170.41) 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; Thu, 27 Apr 2023 12:20:45 -0500 Received: from rs-desk.dhcp.ti.com (ileaxei01-snat.itg.ti.com [10.180.69.5]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id 33RHKj8k110570; Thu, 27 Apr 2023 12:20:45 -0500 From: To: , , , CC: , Randolph Sapp Subject: [meta-arago][kirkstone][PATCHv2 5/5] glfw: convert to append and drop patches Date: Thu, 27 Apr 2023 12:20:36 -0500 Message-ID: <20230427172036.863789-6-rs@ti.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230427172036.863789-1-rs@ti.com> References: <20230427172036.863789-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 ; Thu, 27 Apr 2023 17:20:54 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/14365 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 will need to be adjusted again when meta-oe glfw patches settle. Signed-off-by: Randolph Sapp --- ...xt-remove-check-for-Wayland-Egl-prov.patch | 27 ------------------- .../recipes-graphics/glfw/glfw_%.bbappend | 8 ++++++ .../recipes-graphics/glfw/glfw_git.bb | 24 ----------------- 3 files changed, 8 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..8352a866 --- /dev/null +++ b/meta-arago-extras/recipes-graphics/glfw/glfw_%.bbappend @@ -0,0 +1,8 @@ +# Add some wayland configuration options until meta-oe adds some good +# PACKAGECONFIGS + +PR:append = ".arago1" + +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"