On 1/19/23 2:42 PM, Randolph Sapp via lists.yoctoproject.org wrote:
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.
I thought these (powervr-*-graphics) were MACHINE features, not DISTRO..
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 <[email protected]>
---
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
s/rivers/drivers
+DISTRO_FEATURES:remove = "powervr-sgx-graphics powervr-rogue-graphics"
This should be MACHINE_FEATURES and be moved out of meta-arago and down
into the meta-ti layer where we define the mainline kernel if we can.
If mainline kernel is selected, then we should fallback to regular mesa/swrast.
This way the distro does not have to concern itself which what kernel
supports what GPU.
All the rest of the DISTRO_FEATURES/opengl stuff in this patch looks good to me.
Andrew
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#14178):
https://lists.yoctoproject.org/g/meta-arago/message/14178
Mute This Topic: https://lists.yoctoproject.org/mt/96386333/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
