@@ -114,6 +114,9 @@ PACKAGECONFIG:append:pn-openssl = " cryptodev-linux"
# Enable GST_TRACER logging in gstreamer
PACKAGECONFIG:append:pn-gstreamer1.0 = " tracer-hooks"
+# Enable EGL/GLESv2 support
+PACKAGECONFIG:append:pn-cairo = " egl glesv2"
+
# Disable pulseaudio routing in alsa by default
PACKAGECONFIG:remove:pn-alsa-plugins = "pulseaudio"
RDEPENDS:pulseaudio-server:remove = "alsa-plugins-pulseaudio-conf"
@@ -4,4 +4,6 @@ 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
+# fall back to software rendering
MACHINE_FEATURES:remove = "gpu"
+PREFERRED_PROVIDER_virtual/gpudriver = ""
@@ -5,4 +5,6 @@ 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
+# fall back to software rendering
MACHINE_FEATURES:remove = "gpu"
+PREFERRED_PROVIDER_virtual/gpudriver = ""
@@ -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 \
@@ -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 \
@@ -23,7 +21,7 @@ IMAGE_INSTALL += "\
packagegroup-arago-tisdk-multimedia \
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 \
"
@@ -50,7 +48,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)} \
"
@@ -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)} \
packagegroup-arago-tisdk-connectivity \
packagegroup-arago-tisdk-crypto \
docker \
@@ -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)} \
"
@@ -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 = " \
@@ -4,9 +4,7 @@ PR = "r10"
PACKAGE_ARCH = "${MACHINE_ARCH}"
-inherit packagegroup features_check
-
-REQUIRED_MACHINE_FEATURES = "gpu"
+inherit packagegroup
RDEPENDS:${PN} = "\
libegl-dev \
@@ -4,9 +4,7 @@ PR = "r26"
PACKAGE_ARCH = "${MACHINE_ARCH}"
-inherit packagegroup features_check
-
-REQUIRED_MACHINE_FEATURES = "gpu"
+inherit packagegroup
GFX_WAYLAND = "\
weston-init \
@@ -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 \
@@ -4,9 +4,7 @@ PR = "r2"
PACKAGE_ARCH = "${MACHINE_ARCH}"
-inherit packagegroup features_check
-
-REQUIRED_MACHINE_FEATURES = "gpu"
+inherit packagegroup
RDEPENDS:${PN} = "\
gtk+3 \
@@ -4,9 +4,7 @@ PR = "r0"
PACKAGE_ARCH = "${MACHINE_ARCH}"
-inherit packagegroup features_check
-
-REQUIRED_MACHINE_FEATURES = "gpu"
+inherit packagegroup
HMI = " \
"
@@ -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('MACHINE_FEATURES','touchscreen','matrix-gui-touch-demos','',d)} \
"
MATRIX_GPU_DEMOS = " \
@@ -76,6 +76,8 @@ MATRIX_GPU_DEMOS:append:omap-a15 = " \
matrix-3d-demo-kmscubevideo \
"
+MATRIX_GPU_DEMOS:omapl138 = ""
+
MATRIX_OPENCL_APPS = " \
matrix-opencl-demo-floatcompute \
matrix-opencl-demo-vecadd \
@@ -151,7 +153,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 +186,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)]} \
"
@@ -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} \
@@ -4,9 +4,7 @@ PR = "r22"
PACKAGE_ARCH = "${MACHINE_ARCH}"
-inherit packagegroup features_check
-
-REQUIRED_MACHINE_FEATURES = "gpu"
+inherit packagegroup
# qtdeclarative-examples
RDEPENDS:${PN} = "\
@@ -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','opengl','packagegroup-arago-qte-toolchain-target','',d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES','opengl','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 \
"
@@ -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}"
@@ -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 \
@@ -54,7 +54,7 @@ RDEPENDS:${PN} = "\
packagegroup-arago-tisdk-multimedia \
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)} \
deleted file mode 100644
@@ -1,3 +0,0 @@
-PR:append = ".arago1"
-
-PACKAGECONFIG:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'gpu', 'egl glesv2', '', d)}"
deleted file mode 100644
@@ -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"
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e28b998056a1a513e87be11c5045e85b"
inherit features_check
-REQUIRED_MACHINE_FEATURES = "dsp"
+REQUIRED_MACHINE_FEATURES = "dsp gpu"
REQUIRED_DISTRO_FEATURES = "opencv opencl opengl"
DEPENDS += "opencv opencl virtual/egl ti-cgt6x-native clocl-native dsplib-c66x"
@@ -17,25 +17,13 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
# we can use an RRECOMMENDS instead.
PACKAGES = " \
+ matrix-3d-demo-kmscube \
"
PACKAGES:append:omap-a15 = " \
- matrix-3d-demo-kmscube \
matrix-3d-demo-kmscubevideo \
"
-PACKAGES:append:ti43x = " \
- matrix-3d-demo-kmscube \
-"
-
-PACKAGES:append:ti33x = " \
- matrix-3d-demo-kmscube \
-"
-
-PACKAGES:append:k3 = " \
- matrix-3d-demo-kmscube \
-"
-
MATRIX_3D_DEMO_SGX_QAF_PARAM = "1000"
do_install:prepend() {
@@ -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 = " \
@@ -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} \
"
@@ -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','opengl',"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}"