From patchwork Thu Jan 19 20:42:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randolph Sapp X-Patchwork-Id: 18327 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 848B8C6379F for ; Thu, 19 Jan 2023 20:42:13 +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.56988.1674160929184513793 for ; Thu, 19 Jan 2023 12:42:09 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=yApxBbXn; 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 30JKg8Q8025334 for ; Thu, 19 Jan 2023 14:42:08 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1674160928; bh=OT861yxiDMTd3gC7+sZEGkeQdDL3HbpngyF1grkH0G4=; h=From:To:CC:Subject:Date; b=yApxBbXnE3zHRilg2D3N8TsmtdJ9p8ZV7+pGijV+MaX0NJt5CkhPUvk+IGMjCwXf2 /bFgiGE81TIbtLNjxTlSD7lxM36Tsx179WEdM0rwmNTh1IZO+xJUWdBE/++qTUFeiT cLx9YKnyhf4FBANOxxrMWB+K49zlwWwaZWsjbOcc= 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 30JKg8OT085358 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 19 Jan 2023 14:42:08 -0600 Received: from DLEE100.ent.ti.com (157.170.170.30) 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.16; Thu, 19 Jan 2023 14:42:07 -0600 Received: from lelv0327.itg.ti.com (10.180.67.183) by DLEE100.ent.ti.com (157.170.170.30) 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; Thu, 19 Jan 2023 14:42:07 -0600 Received: from res.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id 30JKg7Hu066853; Thu, 19 Jan 2023 14:42:07 -0600 From: Randolph Sapp To: , , CC: , , Randolph Sapp Subject: [master/kirkstone][PATCH] all: Graphics recipe overhaul Date: Thu, 19 Jan 2023 14:42:05 -0600 Message-ID: <20230119204205.1297727-1-rs@ti.com> X-Mailer: git-send-email 2.34.1 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, 19 Jan 2023 20:42:13 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/14175 Leverage the graphics changes introduced in meta-ti by the patch with the same name as this one. The following logic is applied: 1. oe-core sees the inclusion of opengl as a distro feature to be an invitation to build all graphics toolkits and libraries. We now follow suit. Remove opengl as a distro feature if you do not wish to have any graphics tools. 2. Rogue and SGX graphics libraries are out of tree modules and should be treated as such. Inclusion of them is optional through the use of powervr-rogue-graphics and powervr-sgx-graphics distro features and the appropriate packages will be selected based on the matching machine features. 3. The gpu machine feature was removed to assist with the inclusion of the two previously mentioned points. Anything wishing to build off of Arago with piecemeal graphics components should introduce their own package groups to do so. Signed-off-by: Randolph Sapp --- meta-arago-distro/conf/distro/arago.conf | 2 +- .../conf/distro/include/branding-mainline.inc | 4 ++-- .../conf/distro/include/branding-next.inc | 2 +- .../recipes-core/images/tisdk-core-bundle.inc | 4 ++-- .../recipes-core/images/tisdk-default-image.bb | 12 +++++------- .../recipes-core/images/tisdk-thinlinux-image.bb | 4 +--- .../packagegroup-arago-tisdk-addons-sdk-target.bb | 2 +- .../packagegroups/packagegroup-arago-tisdk-addons.bb | 2 +- .../packagegroup-arago-tisdk-graphics-sdk-target.bb | 4 +--- .../packagegroup-arago-tisdk-graphics.bb | 4 +--- .../packagegroup-arago-tisdk-gtk-sdk-target.bb | 4 +--- .../packagegroups/packagegroup-arago-tisdk-gtk.bb | 4 +--- .../packagegroups/packagegroup-arago-tisdk-hmi.bb | 4 +--- .../packagegroups/packagegroup-arago-tisdk-matrix.bb | 10 +++++----- ...packagegroup-arago-tisdk-multimedia-sdk-target.bb | 2 +- .../packagegroup-arago-tisdk-multimedia.bb | 4 ++-- .../packagegroups/packagegroup-arago-tisdk-qte.bb | 4 +--- .../packagegroup-arago-toolchain-tisdk-target.bb | 6 +++--- .../recipes-core/packagegroups/ti-analytics.bb | 2 +- .../recipes-core/packagegroups/ti-demos.bb | 2 +- .../recipes-core/packagegroups/ti-world.bb | 10 +++++----- .../recipes-graphics/cairo/cairo_%.bbappend | 3 --- .../gstreamer/gstreamer1.0-plugins-%.bbappend | 6 ------ .../matrix/matrix-gui-machinevision-demos_2.0.bb | 2 +- .../matrix/matrix-gui-video-analytics-demos_2.0.bb | 2 +- .../recipes-core/matrix/matrix-gui_2.0.bb | 2 +- 26 files changed, 41 insertions(+), 66 deletions(-) delete mode 100644 meta-arago-distro/recipes-graphics/cairo/cairo_%.bbappend delete mode 100644 meta-arago-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-%.bbappend diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf index d675b077..fde30cfe 100644 --- a/meta-arago-distro/conf/distro/arago.conf +++ b/meta-arago-distro/conf/distro/arago.conf @@ -82,7 +82,7 @@ DISTRO_FEATURES = "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC}" DISTRO_FEATURES:remove = "x11" # Add additional distro features -DISTRO_FEATURES:append = " pam wayland opengl" +DISTRO_FEATURES:append = " pam wayland opengl powervr-sgx-graphics powervr-rogue-graphics" #DISTRO_FEATURES:append = " opencl" DISTRO_FEATURES:append = " opencv" DISTRO_FEATURES:append = " openmp" diff --git a/meta-arago-distro/conf/distro/include/branding-mainline.inc b/meta-arago-distro/conf/distro/include/branding-mainline.inc index 2fc9dc5f..2e6198d3 100644 --- a/meta-arago-distro/conf/distro/include/branding-mainline.inc +++ b/meta-arago-distro/conf/distro/include/branding-mainline.inc @@ -3,5 +3,5 @@ PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-mainline" PREFERRED_PROVIDER_u-boot = "u-boot-ti-mainline" SRCREV_ti-upstream-tools:pn-linux-ti-mainline = "${AUTOREV}" -# GPU support requires out-of-tree SGX and RGX drivers not available in mainline -MACHINE_FEATURES:remove = "gpu" +# GPU support requires out-of-tree SGX and RGX rivers not available in mainline +DISTRO_FEATURES:remove = "powervr-sgx-graphics powervr-rogue-graphics" diff --git a/meta-arago-distro/conf/distro/include/branding-next.inc b/meta-arago-distro/conf/distro/include/branding-next.inc index a4fe66dc..e27db11a 100644 --- a/meta-arago-distro/conf/distro/include/branding-next.inc +++ b/meta-arago-distro/conf/distro/include/branding-next.inc @@ -5,4 +5,4 @@ SRCREV:pn-linux-ti-next = "${AUTOREV}" SRCREV:pn-u-boot-ti-mainline = "${AUTOREV}" # GPU support requires out-of-tree SGX and RGX drivers not available in next -MACHINE_FEATURES:remove = "gpu" +DISTRO_FEATURES:remove = "powervr-sgx-graphics powervr-rogue-graphics" diff --git a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc index 9da4b0d0..c7bd9629 100644 --- a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc +++ b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc @@ -31,8 +31,8 @@ DTB_FILTER:j721s2 = "j721s2" # List of target side images to build for the SDK TARGET_IMAGES = "tisdk-base-image tisdk-default-image tisdk-thinlinux-image tisdk-bootstrap-image" -TISDK_TOOLCHAIN = "${@bb.utils.contains('MACHINE_FEATURES','gpu','meta-toolchain-arago-tisdk','meta-toolchain-arago-tisdk-server',d)}" -TOOLCHAIN_SUFFIX = "${@bb.utils.contains('MACHINE_FEATURES','gpu','-tisdk','-tisdk-server',d)}" +TISDK_TOOLCHAIN = "${@bb.utils.contains('DISTRO_FEATURES','opengl','meta-toolchain-arago-tisdk','meta-toolchain-arago-tisdk-server',d)}" +TOOLCHAIN_SUFFIX = "${@bb.utils.contains('DISTRO_FEATURES','opengl','-tisdk','-tisdk-server',d)}" IMAGE_INSTALL = "\ packagegroup-arago-tisdk-amsdk-sdk-host \ diff --git a/meta-arago-distro/recipes-core/images/tisdk-default-image.bb b/meta-arago-distro/recipes-core/images/tisdk-default-image.bb index 8cd10429..ffe78ec9 100644 --- a/meta-arago-distro/recipes-core/images/tisdk-default-image.bb +++ b/meta-arago-distro/recipes-core/images/tisdk-default-image.bb @@ -5,16 +5,14 @@ DESCRIPTION = "Complete Arago TI SDK filesystem image containing complete\ require arago-image.inc -SPLASH = "${@bb.utils.contains('MACHINE_FEATURES','gpu','psplash','',d)}" - IMAGE_INSTALL += "\ packagegroup-arago-base \ packagegroup-arago-console \ packagegroup-arago-base-tisdk \ ti-test \ - ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-graphics','',d)} \ - ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-gtk','',d)} \ - ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-qte','',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','opengl','packagegroup-arago-tisdk-graphics','',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','opengl','packagegroup-arago-tisdk-gtk','',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','opengl','packagegroup-arago-tisdk-qte','',d)} \ ${@['','packagegroup-arago-tisdk-opencl'][oe.utils.all_distro_features(d, 'opencl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \ packagegroup-arago-tisdk-connectivity \ packagegroup-arago-tisdk-crypto \ @@ -24,7 +22,7 @@ IMAGE_INSTALL += "\ packagegroup-arago-tisdk-amsdk \ packagegroup-arago-tisdk-addons \ packagegroup-arago-tisdk-addons-extra \ - ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-hmi','packagegroup-arago-base-tisdk-server-extra',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','opengl','packagegroup-arago-tisdk-hmi','packagegroup-arago-base-tisdk-server-extra',d)} \ ti-analytics \ ti-demos \ " @@ -51,7 +49,7 @@ EXTRABROWSERS = " \ " PYTHON2APPS = " \ - ${@bb.utils.contains('MACHINE_FEATURES','gpu',"${EXTRABROWSERS}",'',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','opengl',"${EXTRABROWSERS}",'',d)} \ ${@bb.utils.contains("BBFILE_COLLECTIONS","browser-layer",bb.utils.contains('DISTRO_FEATURES','wayland',"${CHROMIUM}",'',d),'',d)} \ " diff --git a/meta-arago-distro/recipes-core/images/tisdk-thinlinux-image.bb b/meta-arago-distro/recipes-core/images/tisdk-thinlinux-image.bb index 8827ac16..1574fca3 100644 --- a/meta-arago-distro/recipes-core/images/tisdk-thinlinux-image.bb +++ b/meta-arago-distro/recipes-core/images/tisdk-thinlinux-image.bb @@ -5,8 +5,6 @@ DESCRIPTION = "Minimal bootable image with container to start the next\ require arago-image.inc -SPLASH = "${@bb.utils.contains('MACHINE_FEATURES','gpu','psplash','',d)}" - # Allow users to tack on additional packages as interesting. ARAGO_THIN_IMAGE_EXTRA_INSTALL ?= "" @@ -14,7 +12,7 @@ IMAGE_INSTALL += "\ packagegroup-arago-base \ packagegroup-arago-console \ packagegroup-arago-base-tisdk \ - ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-graphics','',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','opengl','packagegroup-arago-tisdk-graphics','',d)} \ docker \ ${ARAGO_THIN_IMAGE_EXTRA_INSTALL} \ " diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb index b6fe62ab..0cd1b540 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb @@ -32,7 +32,7 @@ EXTRA_LIBS:append:dra7xx = " libulm-dev \ " PDM_ANOMALY_PKG_DEV = "\ - ${@bb.utils.contains('MACHINE_FEATURES', 'gpu', 'pdm-anomaly-detection-dev', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'pdm-anomaly-detection-dev', '', d)} \ " diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb index 07ae8b07..cb972078 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb @@ -66,7 +66,7 @@ UTILS:append:omapl138 = " ti-ipc-rtos-fw" UTILS:append:dra7xx = " \ ${UTILS_DSP} \ - ${@bb.utils.contains('MACHINE_FEATURES','gpu','glsdk-example-apps','',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','opengl','glsdk-example-apps','',d)} \ " EXTRA_PACKAGES = " \ diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics-sdk-target.bb index 093b2d3f..acb06558 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics-sdk-target.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics-sdk-target.bb @@ -4,9 +4,7 @@ PR = "r10" PACKAGE_ARCH = "${MACHINE_ARCH}" -inherit packagegroup features_check - -REQUIRED_MACHINE_FEATURES = "gpu" +inherit packagegroup RDEPENDS:${PN} = "\ libegl-dev \ diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb index 1d450600..381fa950 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb @@ -4,9 +4,7 @@ PR = "r26" PACKAGE_ARCH = "${MACHINE_ARCH}" -inherit packagegroup features_check - -REQUIRED_MACHINE_FEATURES = "gpu" +inherit packagegroup GFX_WAYLAND = "\ weston-init \ diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-gtk-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-gtk-sdk-target.bb index 0bf3530d..030583e3 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-gtk-sdk-target.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-gtk-sdk-target.bb @@ -4,9 +4,7 @@ PR = "r2" PACKAGE_ARCH = "${MACHINE_ARCH}" -inherit packagegroup features_check - -REQUIRED_MACHINE_FEATURES = "gpu" +inherit packagegroup RDEPENDS:${PN} = "\ gtk+3-dev \ diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-gtk.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-gtk.bb index 59b0461d..c2208380 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-gtk.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-gtk.bb @@ -4,9 +4,7 @@ PR = "r2" PACKAGE_ARCH = "${MACHINE_ARCH}" -inherit packagegroup features_check - -REQUIRED_MACHINE_FEATURES = "gpu" +inherit packagegroup RDEPENDS:${PN} = "\ gtk+3 \ diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi.bb index e16727c4..a8261bf2 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi.bb @@ -4,9 +4,7 @@ PR = "r0" PACKAGE_ARCH = "${MACHINE_ARCH}" -inherit packagegroup features_check - -REQUIRED_MACHINE_FEATURES = "gpu" +inherit packagegroup HMI = " \ " diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb index 3d9ebdf3..c683c477 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb @@ -65,7 +65,7 @@ MATRIX_QT_APPS:append:ti43x = " \ " MATRIX_TOUCH_APPS = " \ - ${@bb.utils.contains('MACHINE_FEATURES','gpu','matrix-gui-touch-demos','',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','opengl','matrix-gui-touch-demos','',d)} \ " MATRIX_GPU_DEMOS = " \ @@ -151,7 +151,7 @@ MATRIX_APPS:append:omap-a15 = " \ matrix-gui-pm-demos-governor \ " -# ${@['','matrix-gui-browser-demos'][bb.utils.contains('MACHINE_FEATURES','gpu',True,False,d) and bb.utils.contains('DISTRO_FEATURES','wayland',True,False,d)]} \ +# ${@['','matrix-gui-browser-demos'][bb.utils.contains('DISTRO_FEATURES','opengl',True,False,d) and bb.utils.contains('DISTRO_FEATURES','wayland',True,False,d)]} \ # \ # @@ -184,9 +184,9 @@ RDEPENDS:${PN} = " \ ${MATRIX_APPS} \ ${MATRIX_COMMON_APPS} \ ${@bb.utils.contains('MACHINE_FEATURES','touchscreen',"${MATRIX_TOUCH_APPS}",'',d)} \ - ${@bb.utils.contains('MACHINE_FEATURES','gpu',"${MATRIX_GUI}",'',d)} \ - ${@bb.utils.contains('MACHINE_FEATURES','gpu',"${MATRIX_QT_APPS}",'',d)} \ - ${@bb.utils.contains('MACHINE_FEATURES','gpu',"${MATRIX_GPU_DEMOS}",'',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','opengl',"${MATRIX_GUI}",'',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','qt',"${MATRIX_QT_APPS}",'',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','opengl',"${MATRIX_GPU_DEMOS}",'',d)} \ ${@['',"${MATRIX_OPENCL_APPS}"][oe.utils.all_distro_features(d, 'opencl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \ " diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-target.bb index 62bcc0ea..8baab290 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-target.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-target.bb @@ -13,7 +13,7 @@ BARCODE_PKG = "" MULTIMEDIA = "" -# ${@['','qt-opencv-opencl-opengl-multithreaded-dev'][oe.utils.all_distro_features(d, 'opencv opencl opengl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'gpu dsp', True, False, d)]} +# ${@['','qt-opencv-opencl-opengl-multithreaded-dev'][oe.utils.all_distro_features(d, 'opencv opencl opengl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} MULTIMEDIA:append:dra7xx = " \ hevc-arm-decoder-dev \ hevc-arm-decoder-staticdev \ diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb index 9d6767b0..d06fbb6f 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb @@ -12,8 +12,8 @@ MULTIMEDIA = " \ MULTIMEDIA:omapl138 = "" -DUAL_CAMERA_DEMO = "${@bb.utils.contains('MACHINE_FEATURES', 'gpu', 'dual-camera-demo', '', d)}" -IMAGE_GALLERY_DEMO = "${@bb.utils.contains('MACHINE_FEATURES', 'gpu', 'image-gallery', '', d)}" +DUAL_CAMERA_DEMO = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dual-camera-demo', '', d)}" +IMAGE_GALLERY_DEMO = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'image-gallery', '', d)}" MULTIMEDIA:append:ti43x = " \ ${DUAL_CAMERA_DEMO} \ diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb index 60d6e63c..a133e7e7 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb @@ -4,9 +4,7 @@ PR = "r22" PACKAGE_ARCH = "${MACHINE_ARCH}" -inherit packagegroup features_check - -REQUIRED_MACHINE_FEATURES = "gpu" +inherit packagegroup # qtdeclarative-examples RDEPENDS:${PN} = "\ diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb index c64e1727..7fb2aba3 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb @@ -18,11 +18,11 @@ TISDK_TOOLCHAIN_EXTRA_TARGET = "\ TISDK_TOOLCHAIN_EXTRA_TARGET:omapl138 = "" RDEPENDS:${PN} = "\ - ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-qte-toolchain-target','',d)} \ - ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-gtk-sdk-target','',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','qt','packagegroup-arago-qte-toolchain-target','',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','gtk','packagegroup-arago-tisdk-gtk-sdk-target','',d)} \ ${TISDK_TOOLCHAIN_BASE_TARGET} \ ${TISDK_TOOLCHAIN_EXTRA_TARGET} \ - ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-graphics-sdk-target','',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','opengl','packagegroup-arago-tisdk-graphics-sdk-target','',d)} \ ${@['','packagegroup-arago-tisdk-opencl-sdk-target'][oe.utils.all_distro_features(d, 'opencl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \ packagegroup-arago-tisdk-addons-sdk-target \ " diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb b/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb index e16e4d51..4c686c00 100644 --- a/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb +++ b/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb @@ -16,7 +16,7 @@ TENSORFLOW_DEMO = "" ANALYTICS = "" #ANALYTICS = " \ # ${TENSORFLOW_DEMO} \ -# ${@['','qt-opencv-opencl-opengl-multithreaded'][oe.utils.all_distro_features(d, 'opencv opencl opengl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'gpu dsp', True, False, d)]} \ +# ${@['','qt-opencv-opencl-opengl-multithreaded'][oe.utils.all_distro_features(d, 'opencv opencl opengl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \ # ${@['','barcode-roi'][oe.utils.all_distro_features(d, 'opencv', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \ #" ANALYTICS:j7 = "" diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-demos.bb b/meta-arago-distro/recipes-core/packagegroups/ti-demos.bb index 3fbf4199..7bccb4de 100644 --- a/meta-arago-distro/recipes-core/packagegroups/ti-demos.bb +++ b/meta-arago-distro/recipes-core/packagegroups/ti-demos.bb @@ -5,7 +5,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup -PDM_ANOMALY_PKG = "${@bb.utils.contains('MACHINE_FEATURES', 'gpu', 'pdm-anomaly-detection', '', d)}" +PDM_ANOMALY_PKG = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'pdm-anomaly-detection', '', d)}" PDM_ANOMALY = "" PDM_ANOMALY:ti33x = "${PDM_ANOMALY_PKG}" diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-world.bb b/meta-arago-distro/recipes-core/packagegroups/ti-world.bb index 323d88ae..ec22d72e 100644 --- a/meta-arago-distro/recipes-core/packagegroups/ti-world.bb +++ b/meta-arago-distro/recipes-core/packagegroups/ti-world.bb @@ -22,7 +22,7 @@ EXTRABROWSERS = " \ " PYTHON2APPS = " \ - ${@bb.utils.contains('MACHINE_FEATURES','gpu',"${EXTRABROWSERS}",'',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','opengl',"${EXTRABROWSERS}",'',d)} \ ${@bb.utils.contains("BBFILE_COLLECTIONS","browser-layer",bb.utils.contains('DISTRO_FEATURES','wayland',"${CHROMIUM}",'',d),'',d)} \ " @@ -43,9 +43,9 @@ RDEPENDS:${PN} = "\ packagegroup-arago-console \ packagegroup-arago-base-tisdk \ ti-test \ - ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-graphics','',d)} \ - ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-gtk','',d)} \ - ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-qte qt3d-examples','',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','opengl','packagegroup-arago-tisdk-graphics','',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','opengl','packagegroup-arago-tisdk-gtk','',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','opengl','packagegroup-arago-tisdk-qte qt3d-examples','',d)} \ ${@oe.utils.all_distro_features(d, "opencl", "${OPENCL}")} \ packagegroup-arago-tisdk-connectivity \ packagegroup-arago-tisdk-crypto \ @@ -55,7 +55,7 @@ RDEPENDS:${PN} = "\ packagegroup-arago-tisdk-amsdk \ packagegroup-arago-tisdk-addons \ packagegroup-arago-tisdk-addons-extra \ - ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-hmi','packagegroup-arago-base-tisdk-server-extra',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','opengl','packagegroup-arago-tisdk-hmi','packagegroup-arago-base-tisdk-server-extra',d)} \ ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "${PYTHON2APPS}", "", d)} \ ${DEVTOOLS} \ ${@bb.utils.contains('TUNE_FEATURES', 'armv7a', 'valgrind', '', d)} \ diff --git a/meta-arago-distro/recipes-graphics/cairo/cairo_%.bbappend b/meta-arago-distro/recipes-graphics/cairo/cairo_%.bbappend deleted file mode 100644 index 1de9aebb..00000000 --- a/meta-arago-distro/recipes-graphics/cairo/cairo_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -PR:append = ".arago1" - -PACKAGECONFIG:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'gpu', 'egl glesv2', '', d)}" diff --git a/meta-arago-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-%.bbappend b/meta-arago-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-%.bbappend deleted file mode 100644 index 4a4986c3..00000000 --- a/meta-arago-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-%.bbappend +++ /dev/null @@ -1,6 +0,0 @@ -# Remove all GFX PACKAGECONFIGs for platforms w/o GPU -PACKAGECONFIG:remove = "${@bb.utils.contains('MACHINE_FEATURES','gpu','','x11 wayland gl egl gles2 qt5',d)}" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -PR:append = ".0" diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bb index 16482003..6cb9ba6d 100644 --- a/meta-arago-extras/recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bb +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bb @@ -29,7 +29,7 @@ RDEPENDS:matrix-machinevision-demo-dlp3dscanner = " \ " RDEPENDS:matrix-machinevision-demo-dlp3dscanner:append:dra7xx = " \ - ${@['','point-cloud-viewer'][oe.utils.all_distro_features(d, 'opencv', True, False) and bb.utils.contains('MACHINE_FEATURES', 'gpu', True, False, d)]} \ + ${@['','point-cloud-viewer'][oe.utils.all_distro_features(d, 'opencv', True, False) and bb.utils.contains('DISTRO_FEATURES', 'opengl', True, False, d)]} \ " RDEPENDS:matrix-machinevision-demo-barcoderoi = " \ diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-video-analytics-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-video-analytics-demos_2.0.bb index d0cf5233..73fc4661 100644 --- a/meta-arago-extras/recipes-core/matrix/matrix-gui-video-analytics-demos_2.0.bb +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-video-analytics-demos_2.0.bb @@ -17,7 +17,7 @@ VIDEO_ANALYTICS_DEMO_RDEPENDS += " \ PACKAGES = "matrix-video-analytics-opencv-opencl-opengl-demo \ " -# ${@['','qt-opencv-opencl-opengl-multithreaded'][oe.utils.all_distro_features(d, 'opencv opencl opengl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'gpu dsp', True, False, d)]} +# ${@['','qt-opencv-opencl-opengl-multithreaded'][oe.utils.all_distro_features(d, 'opencv opencl opengl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} RDEPENDS:matrix-video-analytics-opencv-opencl-opengl-demo = " \ ${VIDEO_ANALYTICS_DEMO_RDEPENDS} \ " diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb index 047e9dbd..cc446fc8 100644 --- a/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb @@ -58,7 +58,7 @@ do_install(){ install -m 0644 ${WORKDIR}/matrix-gui-2.0.service ${D}${systemd_system_unitdir} } -GUIDEPS = "${@bb.utils.contains('MACHINE_FEATURES','gpu',"matrix-gui-browser refresh-screen",'',d)}" +GUIDEPS = "${@bb.utils.contains('DISTRO_FEATURES','wayland',"matrix-gui-browser refresh-screen",'',d)}" RDEPENDS:${PN} += "matrix-lighttpd-config lighttpd lighttpd-module-cgi lighttpd-module-deflate lighttpd-module-expire php php-cgi php-cli ${GUIDEPS}"