On 1/24/2023 17:17, Randolph Sapp 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
*snip*
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..25b7fccd 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','opengl',"${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)]} \ "
This change appears to break for omapl138. I think it is because that platform did not define gpu, but moving to the DISTRO_FEATURE of opengl tries to require whatever is in MATRIX_GPU_DEMOS.
But in matrix-gui-3d-demos_2.0.bb the one path through the settings that does not provide the kmscube demo is omapl138.
How do we want to handle this? -- Ryan Eatmon [email protected] ----------------------------------------- Texas Instruments, Inc. - LCPD - MGTS -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#14195): https://lists.yoctoproject.org/g/meta-arago/message/14195 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]] -=-=-=-=-=-=-=-=-=-=-=-
