- Retain "wayland" within DISTRO_FEATURES of AM3 - Replace "fbdev" with "egl" in weston plugin list - Use the same set of 3D demos in Matrix Gui on AM3/4 - Enable kmscube on AM3
Signed-off-by: Eric Ruei <[email protected]> --- meta-arago-distro/conf/distro/arago.conf | 5 ++++- .../conf/distro/include/branding-processor-sdk.inc | 3 --- .../packagegroups/packagegroup-arago-tisdk-matrix.bb | 10 +++++++++- .../recipes-core/matrix/matrix-gui-3d-demos_2.0.bb | 6 +++++- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf index f4f499e..98efdfe 100644 --- a/meta-arago-distro/conf/distro/arago.conf +++ b/meta-arago-distro/conf/distro/arago.conf @@ -43,7 +43,10 @@ PACKAGECONFIG_pn-weston = "fbdev kms launch libinput" PACKAGECONFIG_append_pn-weston_omap-a15 = " egl" PACKAGECONFIG_remove_pn-weston_omap-a15 = "fbdev" PACKAGECONFIG_append_pn-weston_ti43x = " egl" -PACKAGECONFIG_remove_pn-weston_ti43x = "fbdev" +PACKAGECONFIG_remove_pn-weston_ti43x = "fbdev" +PACKAGECONFIG_append_pn-weston_ti33x = " egl" +PACKAGECONFIG_remove_pn-weston_ti33x = "fbdev" + # Configure Qt5 flags (GLES is still required for qtdeclarative and qtwebkit) PACKAGECONFIG_GL_pn-qtbase = "gles2 linuxfb" diff --git a/meta-arago-distro/conf/distro/include/branding-processor-sdk.inc b/meta-arago-distro/conf/distro/include/branding-processor-sdk.inc index 0c5e41c..bd51f76 100644 --- a/meta-arago-distro/conf/distro/include/branding-processor-sdk.inc +++ b/meta-arago-distro/conf/distro/include/branding-processor-sdk.inc @@ -1,8 +1,5 @@ ARAGO_TISDK_IMAGE = "processor-sdk-linux-image" -# Remove wayland from ti33x DISTRO_FEATURES. -DISTRO_FEATURES_remove_ti33x = "wayland" - # Set CMEM reserved memory region CMEM_BASE_omap-a15 ?= "a0000000" CMEM_SIZE_omap-a15 ?= "08000000" 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 75866d2..11ff899 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 @@ -1,6 +1,6 @@ DESCRIPTION = "Task to include Matrix v2" LICENSE = "MIT" -PR = "r50" +PR = "r51" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -57,6 +57,14 @@ MATRIX_SGX_DEMOS_ti43x = " \ matrix-3d-demo-kmscube \ " +MATRIX_SGX_DEMOS_ti33x = " \ + matrix-3d-demo-chameleon \ + matrix-3d-demo-coverflow \ + matrix-3d-demo-navigation \ + matrix-3d-demo-exampleui \ + matrix-3d-demo-kmscube \ +" + MATRIX_QT_APPS_keystone = "" MATRIX_APPS = "" diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-3d-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-3d-demos_2.0.bb index 710bb75..f9d3f30 100644 --- a/meta-arago-extras/recipes-core/matrix/matrix-gui-3d-demos_2.0.bb +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-3d-demos_2.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://gitorious.org/matrix-gui-v2/matrix-gui-v2-apps"; require matrix-gui-apps-git.inc -PR = "${INC_PR}.6" +PR = "${INC_PR}.7" S = "${WORKDIR}/git/3d_apps" @@ -37,6 +37,10 @@ PACKAGES_append_ti43x = " \ matrix-3d-demo-kmscube \ " +PACKAGES_append_ti33x = " \ + matrix-3d-demo-kmscube \ +" + MATRIX_3D_DEMO_SGX_QAF_PARAM = "1000" do_install_prepend() { -- 1.9.1 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
