On 1/24/23 5:17 PM, Randolph Sapp via lists.yoctoproject.org wrote:
Everything that previously switched using the GPU machine feature should instead switch based on the opengl distro feature to allow for software rendering.Signed-off-by: Randolph Sapp <[email protected]> --- This is the part of my previous graphics overhaul patch that's not dependent on my changes to meta-ti. Should be able to merge this without any issue while I'm working on the other stuff. Relates-to: LCPD-27817 .../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 +- 23 files changed, 37 insertions(+), 62 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/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)}"-
Looks like we forgot to add "SPLASH" to the list below, if we ever want to add this back it should depend on MACHINE_FEATURES "screen". [snip]
"-# ${@['','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)]} \ # \
note to self: we can probably now combine the "and" since they are both checking DISTRO_FEATURES now. Couple more spots below we could do similar. [snip]
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)}"
I think we need to keep this, but it can be unconditional, if you need cairo on our plats you probably want 'egl glesv2'. We can do that in arago.conf with the other PACKAGECONFIGs. It's not perfect but I see no real problem with this patch, it should be taken promptly so we can quickly begin to iterate towards a complete solution from this base. Acked-by: Andrew Davis <[email protected]> -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#14185): https://lists.yoctoproject.org/g/meta-arago/message/14185 Mute This Topic: https://lists.yoctoproject.org/mt/96510217/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
